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

Remove instruments compref (#19560)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-12 14:43:06 +10:00
committed by GitHub
parent f05f94fdc0
commit fd60d39bc7
7 changed files with 94 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Content.Shared/Instruments/SharedInstrumentComponent.cs
View File

@@ -6,35 +6,54 @@ using Robust.Shared.Serialization;
namespace Content.Shared.Instruments;
[NetworkedComponent]
[AutoGenerateComponentState(true)]
[Access(typeof(SharedInstrumentSystem))]
public abstract partial class SharedInstrumentComponent : Component
{
[ViewVariables, AutoNetworkedField]
[ViewVariables]
public bool Playing { get; set; }
[DataField("program"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
[DataField("program"), ViewVariables(VVAccess.ReadWrite)]
public byte InstrumentProgram { get; set; }
[DataField("bank"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
[DataField("bank"), ViewVariables(VVAccess.ReadWrite)]
public byte InstrumentBank { get; set; }
[DataField("allowPercussion"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
[DataField("allowPercussion"), ViewVariables(VVAccess.ReadWrite)]
public bool AllowPercussion { get; set; }
[DataField("allowProgramChange"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
[DataField("allowProgramChange"), ViewVariables(VVAccess.ReadWrite)]
public bool AllowProgramChange { get ; set; }
[DataField("respectMidiLimits"), ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
[DataField("respectMidiLimits"), ViewVariables(VVAccess.ReadWrite)]
public bool RespectMidiLimits { get; set; } = true;
[ViewVariables(VVAccess.ReadWrite), AutoNetworkedField]
[ViewVariables(VVAccess.ReadWrite)]
public EntityUid? Master { get; set; } = null;
[ViewVariables, AutoNetworkedField]
[ViewVariables]
public BitArray FilteredChannels { get; set; } = new(RobustMidiEvent.MaxChannels, true);
}
[Serializable, NetSerializable]
public sealed class InstrumentComponentState : ComponentState
{
public bool Playing;
public byte InstrumentProgram;
public byte InstrumentBank;
public bool AllowPercussion;
public bool AllowProgramChange;
public bool RespectMidiLimits;
public NetEntity? Master;
public BitArray FilteredChannels = default!;
}
/// <summary>
/// This message is sent to the client to completely stop midi input and midi playback.

13
Content.Shared/Instruments/SharedInstrumentSystem.cs
View File

@@ -2,10 +2,7 @@ namespace Content.Shared.Instruments;
public abstract class SharedInstrumentSystem : EntitySystem
{
public override void Initialize()
{
SubscribeLocalEvent<SharedInstrumentComponent, AfterAutoHandleStateEvent>(AfterHandleInstrumentState);
}
public abstract bool ResolveInstrument(EntityUid uid, ref SharedInstrumentComponent? component);
public virtual void SetupRenderer(EntityUid uid, bool fromStateChange, SharedInstrumentComponent? instrument = null)
{
@@ -21,12 +18,4 @@ public abstract class SharedInstrumentSystem : EntitySystem
component.InstrumentProgram = program;
Dirty(component);
}
private void AfterHandleInstrumentState(EntityUid uid, SharedInstrumentComponent instrument, ref AfterAutoHandleStateEvent args)
{
if(instrument.Playing)
SetupRenderer(uid, true, instrument);
else
EndRenderer(uid, true, instrument);
}
}