mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-04 03:39:55 +00:00
Code Issues Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Mister_Nebula 2020-11-03 21:42:14 +00:00
parent a64a5fcf79
commit 45d459d389
45 changed files with 57 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QSB/Animation/AnimationSync.cs
View File

@ -1,5 +1,5 @@
using OWML.ModHelper.Events;
using QSB.Events;
using QSB.EventsCore;
using QSB.Player;
using System;
using System.Linq;

2
QSB/Animation/Events/AnimTriggerEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;

2
QSB/Animation/Events/PlayerSuitEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;

2
QSB/ConversationSync/ConversationManager.cs
View File

@ -1,6 +1,6 @@
using OWML.Common;
using OWML.ModHelper.Events;
using QSB.Events;
using QSB.EventsCore;
using QSB.Player;
using QSB.Utility;
using QSB.WorldSync;

2
QSB/ConversationSync/Events/ConversationEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;
using QSB.WorldSync;

2
QSB/ConversationSync/Events/ConversationStartEndEvent.cs
View File

@ -1,6 +1,6 @@
using OWML.Common;
using OWML.ModHelper.Events;
using QSB.Events;
using QSB.EventsCore;
using QSB.Player;
using QSB.Utility;
using QSB.WorldSync;

2
QSB/DeathSync/DeathPatches.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using System.Linq;
namespace QSB.DeathSync

2
QSB/DeathSync/Events/PlayerDeathEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;
using QSB.Utility;

2
QSB/DeathSync/RespawnOnDeath.cs
View File

@ -1,6 +1,6 @@
using OWML.Common;
using OWML.ModHelper.Events;
using QSB.Events;
using QSB.EventsCore;
using QSB.Utility;
using System.Linq;
using UnityEngine;

2
QSB/ElevatorSync/ElevatorPatches.cs
View File

@ -1,5 +1,5 @@
using OWML.ModHelper.Events;
using QSB.Events;
using QSB.EventsCore;
namespace QSB.ElevatorSync
{

2
QSB/ElevatorSync/Events/ElevatorEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.WorldSync;

2
QSB/Events/EventNames.cs → QSB/EventsCore/EventNames.cs
View File

@ -1,4 +1,4 @@
namespace QSB.Events
namespace QSB.EventsCore
{
public static class EventNames
{

2
QSB/Events/IQSBEvent.cs → QSB/EventsCore/IQSBEvent.cs
View File

@ -1,4 +1,4 @@
namespace QSB.Events
namespace QSB.EventsCore
{
public interface IQSBEvent
{

6
QSB/Events/QSBEvent.cs → QSB/EventsCore/QSBEvent.cs
View File

@ -3,7 +3,7 @@ using QSB.Player;
using QSB.TransformSync;
using UnityEngine.Networking;
namespace QSB.Events
namespace QSB.EventsCore
{
/// <summary>
/// Abstract class that handles all event code.
@ -13,11 +13,11 @@ namespace QSB.Events
{
public abstract EventType Type { get; }
public uint LocalPlayerId => QSBPlayerManager.LocalPlayerId;
private readonly MessageHandler<T> _eventHandler;
private readonly QSBMessageHandler<T> _eventHandler;
protected QSBEvent()
{
_eventHandler = new MessageHandler<T>(Type);
_eventHandler = new QSBMessageHandler<T>(Type);
_eventHandler.OnClientReceiveMessage += OnClientReceive;
_eventHandler.OnServerReceiveMessage += OnServerReceive;
}

2
QSB/Events/QSBEventManager.cs → QSB/EventsCore/QSBEventManager.cs
View File

@ -14,7 +14,7 @@ using QSB.TransformSync;
using QSB.Utility;
using System.Collections.Generic;
namespace QSB.Events
namespace QSB.EventsCore
{
public static class QSBEventManager
{

2
QSB/GeyserSync/Events/GeyserEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.WorldSync;

2
QSB/GeyserSync/QSBGeyser.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.WorldSync;
using UnityEngine.Networking;

2
QSB/Instruments/Events/PlayInstrumentEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;
using QSB.Utility;

2
QSB/Instruments/InstrumentsManager.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Instruments.QSBCamera;
using QSB.Player;
using UnityEngine;

0
QSB/Messaging/EventType.cs → QSB/MessagesCore/EventType.cs
View File

0
QSB/Messaging/PlayerMessage.cs → QSB/MessagesCore/PlayerMessage.cs
View File

4
QSB/Messaging/MessageHandler.cs → QSB/MessagesCore/QSBMessageHandler.cs
View File

@ -7,14 +7,14 @@ using UnityEngine.Networking;
namespace QSB.Messaging
{
// Extend this to create new message handlers.
public class MessageHandler<T> where T : MessageBase, new()
public class QSBMessageHandler<T> where T : MessageBase, new()
{
public event Action<T> OnClientReceiveMessage;
public event Action<T> OnServerReceiveMessage;
private readonly EventType _eventType;
public MessageHandler(EventType eventType)
public QSBMessageHandler(EventType eventType)
{
_eventType = eventType + MsgType.Highest + 1;
if (QSBNetworkManager.Instance.IsReady)

0
QSB/Messaging/ToggleMessage.cs → QSB/MessagesCore/ToggleMessage.cs
View File

2
QSB/OrbSync/Events/OrbSlotEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.WorldSync;

2
QSB/OrbSync/Events/OrbUserEvent.cs
View File

@ -1,5 +1,5 @@
using OWML.Common;
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.TransformSync;
using QSB.Utility;

2
QSB/OrbSync/OrbPatches.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.WorldSync;
using UnityEngine;

2
QSB/OrbSync/QSBOrbSlot.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.WorldSync;
namespace QSB.OrbSync

2
QSB/Player/Events/PlayerJoinEvent.cs
View File

@ -1,5 +1,5 @@
using OWML.Common;
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Utility;

2
QSB/Player/Events/PlayerLeaveEvent.cs
View File

@ -1,5 +1,5 @@
using OWML.Common;
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Utility;
using System.Linq;

2
QSB/Player/Events/PlayerReadyEvent.cs
View File

@ -1,5 +1,5 @@
using OWML.Common;
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.TransformSync;
using QSB.Utility;

8
QSB/Events/PlayerStateEvent.cs → QSB/Player/Events/PlayerStateEvent.cs
View File

@ -1,19 +1,17 @@
using QSB.Messaging;
using QSB.Player;
using QSB.Player.Events;
using UnityEngine.Networking;
namespace QSB.Events
namespace QSB.Player.Events
{
public class PlayerStateEvent : NetworkBehaviour
{
public static PlayerStateEvent LocalInstance { get; private set; }
private MessageHandler<PlayerStateMessage> _messageHandler;
private QSBMessageHandler<PlayerStateMessage> _messageHandler;
private void Awake()
{
_messageHandler = new MessageHandler<PlayerStateMessage>(EventType.FullState);
_messageHandler = new QSBMessageHandler<PlayerStateMessage>(EventType.FullState);
_messageHandler.OnClientReceiveMessage += OnClientReceiveMessage;
LocalInstance = this;

2
QSB/Player/Events/PlayerStatesRequestEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.TransformSync;
using QSB.Utility;

18
QSB/QSB.csproj
View File

@ -143,9 +143,9 @@
<Compile Include="ElevatorSync\Events\ElevatorEvent.cs" />
<Compile Include="ElevatorSync\ElevatorManager.cs" />
<Compile Include="ElevatorSync\ElevatorPatches.cs" />
<Compile Include="Events\EventNames.cs" />
<Compile Include="EventsCore\EventNames.cs" />
<Compile Include="DeathSync\Events\PlayerDeathEvent.cs" />
<Compile Include="Events\IQSBEvent.cs" />
<Compile Include="EventsCore\IQSBEvent.cs" />
<Compile Include="Instruments\Events\PlayInstrumentEvent.cs" />
<Compile Include="Instruments\Events\PlayInstrumentMessage.cs" />
<Compile Include="Instruments\InstrumentType.cs" />
@ -183,9 +183,9 @@
<Compile Include="Tools\Events\PlayerProbeLauncherEvent.cs" />
<Compile Include="Tools\Events\PlayerSignalscopeEvent.cs" />
<Compile Include="Tools\Events\PlayerTranslatorEvent.cs" />
<Compile Include="Events\QSBEvent.cs" />
<Compile Include="EventsCore\QSBEvent.cs" />
<Compile Include="Player\Events\PlayerJoinMessage.cs" />
<Compile Include="Messaging\ToggleMessage.cs" />
<Compile Include="MessagesCore\ToggleMessage.cs" />
<Compile Include="TransformSync\QSBSector.cs" />
<Compile Include="TransformSync\QSBSectorManager.cs" />
<Compile Include="TransformSync\TransformSync.cs" />
@ -199,14 +199,14 @@
<Compile Include="Tools\ToolType.cs" />
<Compile Include="TransformSync\PlayerProbeSync.cs" />
<Compile Include="Utility\DebugActions.cs" />
<Compile Include="Events\QSBEventManager.cs" />
<Compile Include="EventsCore\QSBEventManager.cs" />
<Compile Include="Player\Events\PlayerStateMessage.cs" />
<Compile Include="Events\PlayerStateEvent.cs" />
<Compile Include="Player\Events\PlayerStateEvent.cs" />
<Compile Include="DeathSync\Necronomicon.cs" />
<Compile Include="Utility\DebugLog.cs" />
<Compile Include="Messaging\PlayerMessage.cs" />
<Compile Include="Messaging\MessageHandler.cs" />
<Compile Include="Messaging\EventType.cs" />
<Compile Include="MessagesCore\PlayerMessage.cs" />
<Compile Include="MessagesCore\QSBMessageHandler.cs" />
<Compile Include="MessagesCore\EventType.cs" />
<Compile Include="Player\PlayerInfo.cs" />
<Compile Include="Player\State.cs" />
<Compile Include="DeathSync\PreventShipDestruction.cs" />

5
QSB/QSBNetworkManager.cs
View File

@ -4,11 +4,12 @@ using QSB.Animation;
using QSB.ConversationSync;
using QSB.DeathSync;
using QSB.ElevatorSync;
using QSB.Events;
using QSB.EventsCore;
using QSB.GeyserSync;
using QSB.OrbSync;
using QSB.Patches;
using QSB.Player;
using QSB.Player.Events;
using QSB.TimeSync;
using QSB.TransformSync;
using QSB.Utility;
@ -102,7 +103,7 @@ namespace QSB
channels.Add(QosType.Reliable);
channels.Add(QosType.Unreliable);
gameObject.AddComponent<Events.PlayerStateEvent>();
gameObject.AddComponent<PlayerStateEvent>();
}
public override void OnStartServer()

2
QSB/TimeSync/Events/ServerTimeEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
namespace QSB.TimeSync.Events

2
QSB/TimeSync/WakeUpSync.cs
View File

@ -1,6 +1,6 @@
using OWML.ModHelper.Events;
using QSB.DeathSync;
using QSB.Events;
using QSB.EventsCore;
using QSB.TimeSync.Events;
using QSB.Utility;
using UnityEngine;

2
QSB/Tools/Events/PlayerFlashlightEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;

2
QSB/Tools/Events/PlayerProbeEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;

2
QSB/Tools/Events/PlayerProbeLauncherEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;

2
QSB/Tools/Events/PlayerSignalscopeEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;

2
QSB/Tools/Events/PlayerTranslatorEvent.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;

2
QSB/Tools/ProbePatches.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
namespace QSB.Tools
{

2
QSB/TransformSync/PlayerCameraSync.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Player;
using QSB.Tools;
using QSB.Utility;

2
QSB/TransformSync/PlayerSectorEvent.cs
View File

@ -1,5 +1,5 @@
using OWML.Common;
using QSB.Events;
using QSB.EventsCore;
using QSB.Messaging;
using QSB.Player;
using QSB.Utility;

2
QSB/TransformSync/SectorSync.cs
View File

@ -1,4 +1,4 @@
using QSB.Events;
using QSB.EventsCore;
using QSB.Player;
using System.Linq;
using UnityEngine;