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

Revert "fix events"

Browse Source 
This reverts commit 2024c4c821b13aa18164a674057eb42e0e72a45f.
This commit is contained in:
Mister_Nebula 2021-02-13 10:11:02 +00:00
parent 8d9972b590
commit 6890005653
23 changed files with 48 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
QSB/Animation/AnimationSync.cs
View File

@ -145,19 +145,19 @@ namespace QSB.Animation
private void OnBecomeUngrounded() => _netAnim.SetTrigger("Ungrounded");
public void SendCrouch(float value = 0) => QSBEventManager.FireEvent<float>(EventNames.QSBCrouch, value);
public void SendCrouch(float value = 0) => QSBEventManager.FireEvent(EventNames.QSBCrouch, value);
public void HandleCrouch(float value) => _crouchSync.CrouchParam.Target = value;
private void SuitUp()
{
QSBEventManager.FireEvent<uint, AnimationType>(EventNames.QSBChangeAnimType, PlayerId, AnimationType.PlayerSuited);
QSBEventManager.FireEvent(EventNames.QSBChangeAnimType, PlayerId, AnimationType.PlayerSuited);
SetAnimationType(AnimationType.PlayerSuited);
}
private void SuitDown()
{
QSBEventManager.FireEvent<uint, AnimationType>(EventNames.QSBChangeAnimType, PlayerId, AnimationType.PlayerUnsuited);
QSBEventManager.FireEvent(EventNames.QSBChangeAnimType, PlayerId, AnimationType.PlayerUnsuited);
SetAnimationType(AnimationType.PlayerUnsuited);
}

10
QSB/ConversationSync/ConversationManager.cs
View File

@ -42,7 +42,7 @@ namespace QSB.ConversationSync
}
public void SendPlayerOption(string text) =>
QSBEventManager.FireEvent<uint, string, ConversationType>(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, text, ConversationType.Player);
QSBEventManager.FireEvent(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, text, ConversationType.Player);
public void SendCharacterDialogue(int id, string text)
{
@ -51,14 +51,14 @@ namespace QSB.ConversationSync
DebugLog.ToConsole("Warning - Tried to send conv. event with char id -1.", MessageType.Warning);
return;
}
QSBEventManager.FireEvent<uint, string, ConversationType>(EventNames.QSBConversation, (uint)id, text, ConversationType.Character);
QSBEventManager.FireEvent(EventNames.QSBConversation, (uint)id, text, ConversationType.Character);
}
public void CloseBoxPlayer() =>
QSBEventManager.FireEvent<uint, string, ConversationType>(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, "", ConversationType.ClosePlayer);
QSBEventManager.FireEvent(EventNames.QSBConversation, QSBPlayerManager.LocalPlayerId, "", ConversationType.ClosePlayer);
public void CloseBoxCharacter(int id) =>
QSBEventManager.FireEvent<uint, string, ConversationType>(EventNames.QSBConversation, (uint)id, "", ConversationType.CloseCharacter);
QSBEventManager.FireEvent(EventNames.QSBConversation, (uint)id, "", ConversationType.CloseCharacter);
public void SendConvState(int charId, bool state)
{
@ -67,7 +67,7 @@ namespace QSB.ConversationSync
DebugLog.ToConsole("Warning - Tried to send conv. start/end event with char id -1.", MessageType.Warning);
return;
}
QSBEventManager.FireEvent<int, uint, bool>(EventNames.QSBConversationStartEnd, charId, QSBPlayerManager.LocalPlayerId, state);
QSBEventManager.FireEvent(EventNames.QSBConversationStartEnd, charId, QSBPlayerManager.LocalPlayerId, state);
}
public void DisplayPlayerConversationBox(uint playerId, string text)

2
QSB/DeathSync/Patches/DeathPatches.cs
View File

@ -50,7 +50,7 @@ namespace QSB.DeathSync.Patches
}
public static void BroadcastDeath(DeathType deathType)
=> QSBEventManager.FireEvent<DeathType>(EventNames.QSBPlayerDeath, deathType);
=> QSBEventManager.FireEvent(EventNames.QSBPlayerDeath, deathType);
public static void DamageController_Exploded(ref bool ____exploded)
=> ____exploded = true;

2
QSB/ElevatorSync/Patches/ElevatorPatches.cs
View File

@ -12,7 +12,7 @@ namespace QSB.ElevatorSync.Patches
{
var isGoingUp = __instance.GetValue<bool>("_goingToTheEnd");
var id = ElevatorManager.Instance.GetId(__instance);
QSBEventManager.FireEvent<int, bool>(EventNames.QSBStartLift, id, isGoingUp);
QSBEventManager.FireEvent(EventNames.QSBStartLift, id, isGoingUp);
}
public override void DoPatches() => QSBCore.Helper.HarmonyHelper.AddPostfix<Elevator>("StartLift", typeof(ElevatorPatches), nameof(StartLift));

12
QSB/Events/QSBEventManager.cs
View File

@ -92,34 +92,34 @@ namespace QSB.Events
GlobalMessenger.FireEvent(eventName);
}
public static void FireEvent<T>(string eventName, object arg)
public static void FireEvent<T>(string eventName, T arg)
{
if (!QSBCore.IsInMultiplayer)
{
DebugLog.ToConsole($"Warning - Tried to send event {eventName} while not connected to/hosting server.", MessageType.Warning);
return;
}
GlobalMessenger<T>.FireEvent(eventName, (T)arg);
GlobalMessenger<T>.FireEvent(eventName, arg);
}
public static void FireEvent<T, U>(string eventName, object arg1, object arg2)
public static void FireEvent<T, U>(string eventName, T arg1, U arg2)
{
if (!QSBCore.IsInMultiplayer)
{
DebugLog.ToConsole($"Warning - Tried to send event {eventName} while not connected to/hosting server.", MessageType.Warning);
return;
}
GlobalMessenger<T, U>.FireEvent(eventName, (T)arg1, (U)arg2);
GlobalMessenger<T, U>.FireEvent(eventName, arg1, arg2);
}
public static void FireEvent<T, U, V>(string eventName, object arg1, object arg2, object arg3)
public static void FireEvent<T, U, V>(string eventName, T arg1, U arg2, V arg3)
{
if (!QSBCore.IsInMultiplayer)
{
DebugLog.ToConsole($"Warning - Tried to send event {eventName} while not connected to/hosting server.", MessageType.Warning);
return;
}
GlobalMessenger<T, U, V>.FireEvent(eventName, (T)arg1, (U)arg2, (V)arg3);
GlobalMessenger<T, U, V>.FireEvent(eventName, arg1, arg2, arg3);
}
}
}

4
QSB/FrequencySync/Patches/FrequencyPatches.cs
View File

@ -20,9 +20,9 @@ namespace QSB.FrequencySync.Patches
}
public static void IdentifyFrequency(SignalFrequency ____frequency)
=> QSBEventManager.FireEvent<SignalFrequency>(EventNames.QSBIdentifyFrequency, ____frequency);
=> QSBEventManager.FireEvent(EventNames.QSBIdentifyFrequency, ____frequency);
public static void IdentifySignal(SignalName ____name)
=> QSBEventManager.FireEvent<SignalName>(EventNames.QSBIdentifySignal, ____name);
=> QSBEventManager.FireEvent(EventNames.QSBIdentifySignal, ____name);
}
}

2
QSB/GeyserSync/WorldObjects/QSBGeyser.cs
View File

@ -18,7 +18,7 @@ namespace QSB.GeyserSync.WorldObjects
{
if (QNetworkServer.active)
{
QSBEventManager.FireEvent<int, bool>(EventNames.QSBGeyserState, ObjectId, state);
QSBEventManager.FireEvent(EventNames.QSBGeyserState, ObjectId, state);
}
}

2
QSB/Instruments/InstrumentsManager.cs
View File

@ -115,7 +115,7 @@ namespace QSB.Instruments
public void SwitchToType(AnimationType type)
{
QSBEventManager.FireEvent<uint, AnimationType>(EventNames.QSBChangeAnimType, QSBPlayerManager.LocalPlayerId, type);
QSBEventManager.FireEvent(EventNames.QSBChangeAnimType, QSBPlayerManager.LocalPlayerId, type);
QSBPlayerManager.LocalPlayer.AnimationSync.SetAnimationType(type);
CheckInstrumentProps(type);
}

4
QSB/Instruments/QSBCamera/CameraManager.cs
View File

@ -82,7 +82,7 @@ namespace QSB.Instruments.QSBCamera
return;
}
OWInput.ChangeInputMode(InputMode.None);
QSBEventManager.FireEvent<OWCamera>("SwitchActiveCamera", _owCamera);
QSBEventManager.FireEvent("SwitchActiveCamera", _owCamera);
Locator.GetPlayerCamera().mainCamera.enabled = false;
if (_cameraObj.GetComponent<PostProcessingBehaviour>() == null)
{
@ -108,7 +108,7 @@ namespace QSB.Instruments.QSBCamera
return;
}
OWInput.ChangeInputMode(InputMode.Character);
QSBEventManager.FireEvent<OWCamera>("SwitchActiveCamera", Locator.GetPlayerCamera());
QSBEventManager.FireEvent("SwitchActiveCamera", Locator.GetPlayerCamera());
Locator.GetActiveCamera().mainCamera.enabled = true;
_camera.enabled = false;
Mode = CameraMode.FirstPerson;

2
QSB/LogSync/Patches/LogPatches.cs
View File

@ -13,7 +13,7 @@ namespace QSB.LogSync.Patches
{
return;
}
QSBEventManager.FireEvent<string, bool, bool>(EventNames.QSBRevealFact, id, saveGame, showNotification);
QSBEventManager.FireEvent(EventNames.QSBRevealFact, id, saveGame, showNotification);
}
public override void DoPatches() => QSBCore.Helper.HarmonyHelper.AddPostfix<ShipLogManager>("RevealFact", typeof(LogPatches), nameof(RevealFact));

2
QSB/OrbSync/Patches/OrbPatches.cs
View File

@ -13,7 +13,7 @@ namespace QSB.OrbSync.Patches
{
if (__result)
{
QSBEventManager.FireEvent<int>(EventNames.QSBOrbUser, QSBWorldSync.OldOrbList.FindIndex(x => x == __instance));
QSBEventManager.FireEvent(EventNames.QSBOrbUser, QSBWorldSync.OldOrbList.FindIndex(x => x == __instance));
}
}

2
QSB/OrbSync/WorldObjects/QSBOrbSlot.cs
View File

@ -33,7 +33,7 @@ namespace QSB.OrbSync.WorldObjects
{
return;
}
QSBEventManager.FireEvent<int, int, bool>(EventNames.QSBOrbSlot, ObjectId, orbId, state);
QSBEventManager.FireEvent(EventNames.QSBOrbSlot, ObjectId, orbId, state);
if (QSBCore.DebugMode)
{
_debugBoxText.text = state.ToString();

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

@ -1,7 +1,6 @@
using OWML.Common;
using QSB.Events;
using QSB.Messaging;
using QSB.SectorSync.WorldObjects;
using QSB.Utility;
using System.Linq;
@ -54,7 +53,7 @@ namespace QSB.Player.Events
foreach (var item in QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
.Where(x => x != null && x.IsReady && x.ReferenceSector != null && x.PlayerId == LocalPlayerId))
{
QSBEventManager.FireEvent<uint, QSBSector>(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector);
QSBEventManager.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector);
}
}
}

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

@ -2,7 +2,6 @@
using QSB.Events;
using QSB.Messaging;
using QSB.QuantumSync;
using QSB.SectorSync.WorldObjects;
using QSB.TranslationSync;
using QSB.TranslationSync.WorldObjects;
using QSB.Utility;
@ -33,7 +32,7 @@ namespace QSB.Player.Events
foreach (var item in QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
.Where(x => x != null && x.IsReady && x.ReferenceSector != null))
{
QSBEventManager.FireEvent<uint, QSBSector>(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector);
QSBEventManager.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector);
}
if (!server)
@ -45,19 +44,19 @@ namespace QSB.Player.Events
foreach (var condition in QSBWorldSync.DialogueConditions)
{
QSBEventManager.FireEvent<string, bool>(EventNames.DialogueCondition, condition.Key, condition.Value);
QSBEventManager.FireEvent(EventNames.DialogueCondition, condition.Key, condition.Value);
}
foreach (var fact in QSBWorldSync.ShipLogFacts)
{
QSBEventManager.FireEvent<string, bool, bool>(EventNames.QSBRevealFact, fact.Id, fact.SaveGame, false);
QSBEventManager.FireEvent(EventNames.QSBRevealFact, fact.Id, fact.SaveGame, false);
}
foreach (var wallText in QSBWorldSync.GetWorldObjects<QSBWallText>().Where(x => x.AttachedObject.GetValue<bool>("_initialized") && x.AttachedObject.GetNumTextBlocks() > 0))
{
foreach (var id in wallText.GetTranslatedIds())
{
QSBEventManager.FireEvent<NomaiTextType, int, int>(EventNames.QSBTextTranslated, NomaiTextType.WallText, wallText.ObjectId, id);
QSBEventManager.FireEvent(EventNames.QSBTextTranslated, NomaiTextType.WallText, wallText.ObjectId, id);
}
}
@ -65,7 +64,7 @@ namespace QSB.Player.Events
{
foreach (var id in computer.GetTranslatedIds())
{
QSBEventManager.FireEvent<NomaiTextType, int, int>(EventNames.QSBTextTranslated, NomaiTextType.Computer, computer.ObjectId, id);
QSBEventManager.FireEvent(EventNames.QSBTextTranslated, NomaiTextType.Computer, computer.ObjectId, id);
}
}
@ -73,14 +72,14 @@ namespace QSB.Player.Events
{
foreach (var id in vesselComputer.GetTranslatedIds())
{
QSBEventManager.FireEvent<NomaiTextType, int, int>(EventNames.QSBTextTranslated, NomaiTextType.VesselComputer, vesselComputer.ObjectId, id);
QSBEventManager.FireEvent(EventNames.QSBTextTranslated, NomaiTextType.VesselComputer, vesselComputer.ObjectId, id);
}
}
var list = QSBWorldSync.GetWorldObjects<IQSBQuantumObject>().ToList();
for (var i = 0; i < list.Count; i++)
{
QSBEventManager.FireEvent<int, uint>(EventNames.QSBQuantumAuthority, i, list[i].ControllingPlayer);
QSBEventManager.FireEvent(EventNames.QSBQuantumAuthority, i, list[i].ControllingPlayer);
}
}
}

2
QSB/QSBNetworkManager.cs
View File

@ -188,7 +188,7 @@ namespace QSB
IsReady = true;
QSBCore.Helper.Events.Unity.RunWhen(() => QSBEventManager.Ready && PlayerTransformSync.LocalInstance != null,
() => QSBEventManager.FireEvent<string>(EventNames.QSBPlayerJoin, _lobby.PlayerName));
() => QSBEventManager.FireEvent(EventNames.QSBPlayerJoin, _lobby.PlayerName));
if (!QSBCore.IsServer)
{

4
QSB/QuantumSync/Events/QuantumAuthorityEvent.cs
View File

@ -50,7 +50,6 @@ namespace QSB.QuantumSync.Events
var objects = QSBWorldSync.GetWorldObjects<IQSBQuantumObject>();
var obj = objects.ToList()[message.ObjectId];
obj.ControllingPlayer = message.AuthorityOwner;
DebugLog.DebugWrite($"LOCAL {(obj as IWorldObject).Name} to owner {message.AuthorityOwner}");
}
public override void OnReceiveRemote(bool server, QuantumAuthorityMessage message)
@ -62,11 +61,10 @@ namespace QSB.QuantumSync.Events
DebugLog.ToConsole($"Warning - object {(obj as IWorldObject).Name} already has owner {obj.ControllingPlayer}, but trying to be replaced by {message.AuthorityOwner}!", MessageType.Warning);
}
obj.ControllingPlayer = message.AuthorityOwner;
DebugLog.DebugWrite($"{(obj as IWorldObject).Name} to owner {message.AuthorityOwner}");
if (obj.ControllingPlayer == 0 && obj.IsEnabled)
{
// object has no owner, but is still active for this player. request ownership
QSBEventManager.FireEvent<int, uint>(EventNames.QSBQuantumAuthority, message.ObjectId, QSBPlayerManager.LocalPlayerId);
QSBEventManager.FireEvent(EventNames.QSBQuantumAuthority, message.ObjectId, QSBPlayerManager.LocalPlayerId);
}
}
}

6
QSB/QuantumSync/Patches/QuantumPatches.cs
View File

@ -62,7 +62,7 @@ namespace QSB.QuantumSync.Patches
var objId = QuantumManager.Instance.GetId(__instance);
var socketId = QuantumManager.Instance.GetId(socket);
//DebugLog.DebugWrite($"{__instance.name} to socket {socketId}");
QSBEventManager.FireEvent<int, int, Quaternion>(
QSBEventManager.FireEvent(
EventNames.QSBSocketStateChange,
objId,
socketId,
@ -95,7 +95,7 @@ namespace QSB.QuantumSync.Patches
____shuffledObjects[j].localPosition = ____localPositions[____indexList[j]];
}
//DebugLog.DebugWrite($"{__instance.name} shuffled.");
QSBEventManager.FireEvent<int, int[]>(
QSBEventManager.FireEvent(
EventNames.QSBQuantumShuffle,
QuantumManager.Instance.GetId(__instance),
____indexList.ToArray());
@ -124,7 +124,7 @@ namespace QSB.QuantumSync.Patches
return;
}
//DebugLog.DebugWrite($"{owner.AttachedObject.name} to quantum state {Array.IndexOf(owner.QuantumStates, __instance)}");
QSBEventManager.FireEvent<int, int>(
QSBEventManager.FireEvent(
EventNames.QSBMultiStateChange,
QuantumManager.Instance.GetId(owner.AttachedObject),
Array.IndexOf(owner.QuantumStates, __instance));

4
QSB/QuantumSync/Patches/ServerQuantumPatches.cs
View File

@ -130,7 +130,7 @@ namespace QSB.QuantumSync.Patches
{
____stateSkipCounts[k] = (k != ____stateIndex) ? (____stateSkipCounts[k] + 1) : 0;
}
QSBEventManager.FireEvent<int, Vector3, int>(EventNames.QSBMoonStateChange, stateIndex, onUnitSphere, orbitAngle);
QSBEventManager.FireEvent(EventNames.QSBMoonStateChange, stateIndex, onUnitSphere, orbitAngle);
break;
}
____visibilityTracker.transform.localPosition = Vector3.zero;
@ -157,7 +157,7 @@ namespace QSB.QuantumSync.Patches
{
____deactivateAtEye[l].SetActive(____stateIndex != 5);
}
QSBEventManager.FireEvent<OWRigidbody>("QuantumMoonChangeState", ____moonBody);
QSBEventManager.FireEvent("QuantumMoonChangeState", ____moonBody);
__result = true;
return false;
}

4
QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs
View File

@ -41,7 +41,7 @@ namespace QSB.QuantumSync.WorldObjects
}
var id = QSBWorldSync.GetWorldObjects<IQSBQuantumObject>().ToList().IndexOf(this);
// no one is controlling this object right now, request authority
QSBEventManager.FireEvent<int, uint>(EventNames.QSBQuantumAuthority, id, QSBPlayerManager.LocalPlayerId);
QSBEventManager.FireEvent(EventNames.QSBQuantumAuthority, id, QSBPlayerManager.LocalPlayerId);
}
private void OnDisable()
@ -54,7 +54,7 @@ namespace QSB.QuantumSync.WorldObjects
}
var id = QSBWorldSync.GetWorldObjects<IQSBQuantumObject>().ToList().IndexOf(this);
// send event to other players that we're releasing authority
QSBEventManager.FireEvent<int, uint>(EventNames.QSBQuantumAuthority, id, 0);
QSBEventManager.FireEvent(EventNames.QSBQuantumAuthority, id, 0);
}
}
}

2
QSB/SectorSync/SectorSync.cs
View File

@ -44,6 +44,6 @@ namespace QSB.SectorSync
}
private void SendSector(uint id, QSBSector sector) =>
QSBEventManager.FireEvent<uint, QSBSector>(EventNames.QSBSectorChange, id, sector);
QSBEventManager.FireEvent(EventNames.QSBSectorChange, id, sector);
}
}

2
QSB/TimeSync/WakeUpSync.cs
View File

@ -95,7 +95,7 @@ namespace QSB.TimeSync
}
}
private void SendServerTime() => QSBEventManager.FireEvent<float, int>(EventNames.QSBServerTime, Time.timeSinceLevelLoad, _localLoopCount);
private void SendServerTime() => QSBEventManager.FireEvent(EventNames.QSBServerTime, Time.timeSinceLevelLoad, _localLoopCount);
public void OnClientReceiveMessage(ServerTimeMessage message)
{

2
QSB/TransformSync/PlayerCameraSync.cs
View File

@ -16,7 +16,7 @@ namespace QSB.TransformSync
Player.CameraBody = body.gameObject;
Player.IsReady = true;
QSBEventManager.FireEvent<bool>(EventNames.QSBPlayerReady, true);
QSBEventManager.FireEvent(EventNames.QSBPlayerReady, true);
DebugLog.DebugWrite("PlayerCameraSync init done - Request state!");
QSBEventManager.FireEvent(EventNames.QSBPlayerStatesRequest);

6
QSB/TranslationSync/Patches/SpiralPatches.cs
View File

@ -27,7 +27,7 @@ namespace QSB.TranslationSync.Patches
{
return true;
}
QSBEventManager.FireEvent<NomaiTextType, int, int>(
QSBEventManager.FireEvent(
EventNames.QSBTextTranslated,
NomaiTextType.WallText,
SpiralManager.Instance.GetId(__instance),
@ -41,7 +41,7 @@ namespace QSB.TranslationSync.Patches
{
return true;
}
QSBEventManager.FireEvent<NomaiTextType, int, int>(
QSBEventManager.FireEvent(
EventNames.QSBTextTranslated,
NomaiTextType.Computer,
SpiralManager.Instance.GetId(__instance),
@ -55,7 +55,7 @@ namespace QSB.TranslationSync.Patches
{
return true;
}
QSBEventManager.FireEvent<NomaiTextType, int, int>(
QSBEventManager.FireEvent(
EventNames.QSBTextTranslated,
NomaiTextType.VesselComputer,
SpiralManager.Instance.GetId(__instance),