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

Update content repo and RobustToolbox

Browse Source
This commit is contained in:
Jackson Lewis
2020-04-20 10:36:02 +01:00
parent bb9ee66db4
commit 6a22f2629b
27 changed files with 187 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/GameObjects/Components/Actor/CharacterInterface.cs
View File

@@ -78,10 +78,9 @@ namespace Content.Client.GameObjects.Components.Actor
inputMgr.SetInputCommand(ContentKeyFunctions.OpenCharacterMenu, null);
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{

5
Content.Client/GameObjects/Components/Construction/ConstructorComponent.cs
View File

@@ -12,6 +12,7 @@ using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Maths;
using Robust.Shared.Players;
namespace Content.Client.GameObjects.Components.Construction
{
@@ -33,9 +34,9 @@ namespace Content.Client.GameObjects.Components.Construction
Owner.GetComponent<ITransformComponent>();
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleMessage(message, netChannel, component);
base.HandleNetworkMessage(message, channel, session);
switch (message)
{

5
Content.Client/GameObjects/Components/HUD/Inventory/ClientInventoryComponent.cs
View File

@@ -181,10 +181,9 @@ namespace Content.Client.GameObjects
SendNetworkMessage(new OpenSlotStorageUIMessage(slot));
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{

6
Content.Client/GameObjects/Components/Instruments/InstrumentComponent.cs
View File

@@ -9,6 +9,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Timing;
using Robust.Shared.IoC;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using Timer = Robust.Shared.Timers.Timer;
@@ -109,10 +110,9 @@ namespace Content.Client.GameObjects.Components.Instruments
serializer.DataField(ref _instrumentProgram, "program", 1);
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleMessage(message, netChannel, component);
base.HandleNetworkMessage(message, channel, session);
if (_renderer == null)
{

32
Content.Client/GameObjects/Components/Items/ClientHandsComponent.cs
View File

@@ -12,6 +12,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -144,10 +145,35 @@ namespace Content.Client.GameObjects
}
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{
case PlayerAttachedMsg _:
if (_gui == null)
{
_gui = new HandsGui();
}
else
{
_gui.Parent?.RemoveChild(_gui);
}
_gameHud.HandsContainer.AddChild(_gui);
_gui.UpdateHandIcons();
break;
case PlayerDetachedMsg _:
_gui.Parent?.RemoveChild(_gui);
break;
}
}
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleNetworkMessage(message, channel, session);
switch (message)
{

17
Content.Client/GameObjects/Components/Mobs/CameraRecoilComponent.cs
View File

@@ -6,6 +6,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Log;
using Robust.Shared.Maths;
using Robust.Shared.Players;
namespace Content.Client.GameObjects.Components.Mobs
{
@@ -62,9 +63,21 @@ namespace Content.Client.GameObjects.Components.Mobs
_updateEye();
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{
case RecoilKickMessage msg:
Kick(msg.Recoil);
break;
}
}
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleNetworkMessage(message, channel, session);
switch (message)
{

16
Content.Client/GameObjects/Components/Mobs/ClientOverlayEffectsComponent.cs
View File

@@ -10,6 +10,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Players;
namespace Content.Client.GameObjects
{
@@ -53,7 +54,20 @@ namespace Content.Client.GameObjects
};
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
switch (message)
{
case PlayerAttachedMsg _:
SetOverlay(_currentEffect);
break;
case PlayerDetachedMsg _:
RemoveOverlay();
break;
}
}
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
switch (message)
{

6
Content.Client/GameObjects/Components/Mobs/ClientStatusEffectsComponent.cs
View File

@@ -13,6 +13,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Players;
namespace Content.Client.GameObjects.Components.Mobs
{
@@ -40,10 +41,9 @@ namespace Content.Client.GameObjects.Components.Mobs
PlayerDetached();
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{
case PlayerAttachedMsg _:

5
Content.Client/GameObjects/Components/Mobs/CombatModeComponent.cs
View File

@@ -7,6 +7,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Players;
namespace Content.Client.GameObjects.Components.Mobs
{
@@ -39,9 +40,9 @@ namespace Content.Client.GameObjects.Components.Mobs
}
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{

5
Content.Client/GameObjects/Components/Observer/GhostComponent.cs
View File

@@ -57,10 +57,9 @@ namespace Content.Client.GameObjects.Components.Observer
component.Visible = _playerManager.LocalPlayer.ControlledEntity?.HasComponent<GhostComponent>() ?? false;
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleMessage(ComponentMessage message, IComponent component)
{
base.HandleMessage(message, netChannel, component);
base.HandleMessage(message, component);
switch (message)
{

5
Content.Client/GameObjects/Components/Power/PowerDebugTool.cs
View File

@@ -4,6 +4,7 @@ using Robust.Client.UserInterface.CustomControls;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Players;
namespace Content.Client.GameObjects.Components.Power
{
@@ -11,9 +12,9 @@ namespace Content.Client.GameObjects.Components.Power
public class PowerDebugTool : SharedPowerDebugTool
{
SS14Window LastWindow;
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleMessage(message, netChannel, component);
base.HandleNetworkMessage(message, channel, session);
switch (message)
{

5
Content.Client/GameObjects/Components/Sound/SoundComponent.cs
View File

@@ -6,6 +6,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Interfaces.Random;
using Robust.Shared.IoC;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.Timers;
@@ -68,9 +69,9 @@ namespace Content.Client.GameObjects.Components.Sound
});
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null, IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleMessage(message, netChannel, component);
base.HandleNetworkMessage(message, channel, session);
switch (message)
{
case ScheduledSoundMessage msg:

6
Content.Client/GameObjects/Components/Storage/ClientStorageComponent.cs
View File

@@ -12,6 +12,7 @@ using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Players;
namespace Content.Client.GameObjects.Components.Storage
{
@@ -40,9 +41,10 @@ namespace Content.Client.GameObjects.Components.Storage
base.OnRemove();
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleNetworkMessage(message, channel, session);
switch (message)
{
//Updates what we are storing for the UI

8
Content.Client/GameObjects/Components/Weapons/Ranged/BallisticMagazineWeaponComponent.cs
View File

@@ -14,6 +14,7 @@ using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network;
using Robust.Shared.Maths;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
using static Content.Client.StaticIoC;
@@ -108,17 +109,16 @@ namespace Content.Client.GameObjects.Components.Weapons.Ranged
_statusControl?.Update();
}
public override void HandleMessage(ComponentMessage message, INetChannel netChannel = null,
IComponent component = null)
public override void HandleNetworkMessage(ComponentMessage message, INetChannel channel, ICommonSession session = null)
{
base.HandleNetworkMessage(message, channel, session);
switch (message)
{
case BmwComponentAutoEjectedMessage _:
_statusControl?.PlayAlarmAnimation();
return;
}
base.HandleMessage(message, netChannel, component);
}
public Control MakeControl()