From f73d7d37a29c3c873914905dbaaade6a53a199df Mon Sep 17 00:00:00 2001 From: AeonLucid Date: Mon, 2 Nov 2020 19:39:53 +0100 Subject: [PATCH] Add CustomNetworkTransform and PlayerPhysics interfaces --- .../Components/IInnerCustomNetworkTransform.cs | 6 ++++++ .../Inner/Objects/Components/IInnerPlayerPhysics.cs | 6 ++++++ .../Net/Inner/Objects/IInnerGameData.cs | 3 +-- .../Net/Inner/Objects/IInnerLobbyBehaviour.cs | 3 +-- .../Net/Inner/Objects/IInnerMeetingHud.cs | 3 +-- .../Net/Inner/Objects/IInnerPlayerControl.cs | 13 +++++++++++++ .../Components/InnerCustomNetworkTransform.Api.cs | 8 ++++++++ .../Components/InnerCustomNetworkTransform.cs | 4 ++-- .../Objects/Components/InnerPlayerPhysics.Api.cs | 8 ++++++++ .../Inner/Objects/Components/InnerPlayerPhysics.cs | 4 ++-- .../Net/Inner/Objects/InnerPlayerControl.Api.cs | 5 +++++ 11 files changed, 53 insertions(+), 10 deletions(-) create mode 100644 src/Impostor.Api/Net/Inner/Objects/Components/IInnerCustomNetworkTransform.cs create mode 100644 src/Impostor.Api/Net/Inner/Objects/Components/IInnerPlayerPhysics.cs create mode 100644 src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.Api.cs create mode 100644 src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.Api.cs diff --git a/src/Impostor.Api/Net/Inner/Objects/Components/IInnerCustomNetworkTransform.cs b/src/Impostor.Api/Net/Inner/Objects/Components/IInnerCustomNetworkTransform.cs new file mode 100644 index 0000000..856e077 --- /dev/null +++ b/src/Impostor.Api/Net/Inner/Objects/Components/IInnerCustomNetworkTransform.cs @@ -0,0 +1,6 @@ +namespace Impostor.Api.Net.Inner.Objects.Components +{ + public interface IInnerCustomNetworkTransform : IInnerNetObject + { + } +} diff --git a/src/Impostor.Api/Net/Inner/Objects/Components/IInnerPlayerPhysics.cs b/src/Impostor.Api/Net/Inner/Objects/Components/IInnerPlayerPhysics.cs new file mode 100644 index 0000000..9378c5b --- /dev/null +++ b/src/Impostor.Api/Net/Inner/Objects/Components/IInnerPlayerPhysics.cs @@ -0,0 +1,6 @@ +namespace Impostor.Api.Net.Inner.Objects.Components +{ + public interface IInnerPlayerPhysics : IInnerNetObject + { + } +} diff --git a/src/Impostor.Api/Net/Inner/Objects/IInnerGameData.cs b/src/Impostor.Api/Net/Inner/Objects/IInnerGameData.cs index f908289..6e41020 100644 --- a/src/Impostor.Api/Net/Inner/Objects/IInnerGameData.cs +++ b/src/Impostor.Api/Net/Inner/Objects/IInnerGameData.cs @@ -2,6 +2,5 @@ { public interface IInnerGameData : IInnerNetObject { - } -} \ No newline at end of file +} diff --git a/src/Impostor.Api/Net/Inner/Objects/IInnerLobbyBehaviour.cs b/src/Impostor.Api/Net/Inner/Objects/IInnerLobbyBehaviour.cs index 98f0f40..f05f4cf 100644 --- a/src/Impostor.Api/Net/Inner/Objects/IInnerLobbyBehaviour.cs +++ b/src/Impostor.Api/Net/Inner/Objects/IInnerLobbyBehaviour.cs @@ -2,6 +2,5 @@ { public interface IInnerLobbyBehaviour : IInnerNetObject { - } -} \ No newline at end of file +} diff --git a/src/Impostor.Api/Net/Inner/Objects/IInnerMeetingHud.cs b/src/Impostor.Api/Net/Inner/Objects/IInnerMeetingHud.cs index 2976486..9c89d05 100644 --- a/src/Impostor.Api/Net/Inner/Objects/IInnerMeetingHud.cs +++ b/src/Impostor.Api/Net/Inner/Objects/IInnerMeetingHud.cs @@ -2,6 +2,5 @@ { public interface IInnerMeetingHud { - } -} \ No newline at end of file +} diff --git a/src/Impostor.Api/Net/Inner/Objects/IInnerPlayerControl.cs b/src/Impostor.Api/Net/Inner/Objects/IInnerPlayerControl.cs index 14c793b..f79fbf6 100644 --- a/src/Impostor.Api/Net/Inner/Objects/IInnerPlayerControl.cs +++ b/src/Impostor.Api/Net/Inner/Objects/IInnerPlayerControl.cs @@ -1,10 +1,23 @@ using System.Threading.Tasks; using Impostor.Api.Innersloth.Customization; +using Impostor.Api.Net.Inner.Objects.Components; namespace Impostor.Api.Net.Inner.Objects { public interface IInnerPlayerControl : IInnerNetObject { + /// + /// Gets the of the . + /// Contains vent logic. + /// + IInnerPlayerPhysics Physics { get; } + + /// + /// Gets the of the . + /// Contains position data about the player. + /// + IInnerCustomNetworkTransform NetworkTransform { get; } + /// /// Gets the of the . /// Contains metadata about the player. diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.Api.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.Api.cs new file mode 100644 index 0000000..302bb73 --- /dev/null +++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.Api.cs @@ -0,0 +1,8 @@ +using Impostor.Api.Net.Inner.Objects.Components; + +namespace Impostor.Server.Net.Inner.Objects.Components +{ + internal partial class InnerCustomNetworkTransform : IInnerCustomNetworkTransform + { + } +} diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs index d8e345f..fe45479 100644 --- a/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerCustomNetworkTransform.cs @@ -9,7 +9,7 @@ using Microsoft.Extensions.Logging; namespace Impostor.Server.Net.Inner.Objects.Components { - internal class InnerCustomNetworkTransform : InnerNetObject + internal partial class InnerCustomNetworkTransform : InnerNetObject { private static readonly FloatRange XRange = new FloatRange(-40f, 40f); private static readonly FloatRange YRange = new FloatRange(-40f, 40f); @@ -145,4 +145,4 @@ namespace Impostor.Server.Net.Inner.Objects.Components _targetSyncVelocity = Vector2.Zero; } } -} \ No newline at end of file +} diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.Api.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.Api.cs new file mode 100644 index 0000000..6af54a0 --- /dev/null +++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.Api.cs @@ -0,0 +1,8 @@ +using Impostor.Api.Net.Inner.Objects.Components; + +namespace Impostor.Server.Net.Inner.Objects.Components +{ + internal partial class InnerPlayerPhysics : IInnerPlayerPhysics + { + } +} diff --git a/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs b/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs index 50c3a06..ece39a4 100644 --- a/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs +++ b/src/Impostor.Server/Net/Inner/Objects/Components/InnerPlayerPhysics.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Logging; namespace Impostor.Server.Net.Inner.Objects.Components { - internal class InnerPlayerPhysics : InnerNetObject + internal partial class InnerPlayerPhysics : InnerNetObject { private readonly ILogger _logger; private readonly InnerPlayerControl _playerControl; @@ -60,4 +60,4 @@ namespace Impostor.Server.Net.Inner.Objects.Components throw new NotImplementedException(); } } -} \ No newline at end of file +} diff --git a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.Api.cs b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.Api.cs index 06fb84c..d73d324 100644 --- a/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.Api.cs +++ b/src/Impostor.Server/Net/Inner/Objects/InnerPlayerControl.Api.cs @@ -2,11 +2,16 @@ using System.Threading.Tasks; using Impostor.Api.Innersloth.Customization; using Impostor.Api.Net; using Impostor.Api.Net.Inner.Objects; +using Impostor.Api.Net.Inner.Objects.Components; namespace Impostor.Server.Net.Inner.Objects { internal partial class InnerPlayerControl : IInnerPlayerControl { + IInnerPlayerPhysics IInnerPlayerControl.Physics => Physics; + + IInnerCustomNetworkTransform IInnerPlayerControl.NetworkTransform => NetworkTransform; + IInnerPlayerInfo IInnerPlayerControl.PlayerInfo => PlayerInfo; public async ValueTask SetNameAsync(string name) -- 2.39.5