Merge pull request #626 from misternebula/dev

0.28.1
qsb-dev · Jun 22, 2023 · 03bcc60 · 03bcc60
2 parents 992851a + 1fdefbb
commit 03bcc60
Show file tree

Hide file tree

Showing 71 changed files with 450 additions and 297 deletions.
diff --git a/MirrorWeaver/Program.cs b/MirrorWeaver/Program.cs
@@ -50,11 +50,14 @@ public static void Main(string[] args)
 
 		var log = new ConsoleLogger();
 		var weaver = new Weaver(log);
-		if (!weaver.Weave(assembly, resolver, out _))
+		if (!weaver.Weave(assembly, resolver, out var modified))
 		{
 			Environment.Exit(1);
 		}
 
-		assembly.Write(new WriterParameters { WriteSymbols = assembly.MainModule.HasSymbols });
+		if (modified)
+		{
+			assembly.Write(new WriterParameters { WriteSymbols = assembly.MainModule.HasSymbols });
+		}
 	}
-}
+}
diff --git a/MirrorWeaver/QSBReaderWriterProcessor.cs b/MirrorWeaver/QSBReaderWriterProcessor.cs
@@ -14,7 +14,7 @@ public static class QSBReaderWriterProcessor
 	/// traverses from non generic classes up thru base types
 	/// in order to replace generic parameters with their corresponding generic arguments.
 	/// </summary>
-	public static void Process(ModuleDefinition module, Writers writers, Readers readers, ref bool weavingFailed)
+	public static bool Process(ModuleDefinition module, Writers writers, Readers readers, ref bool weavingFailed)
 	{
 		var sw = Stopwatch.StartNew();
 
@@ -85,5 +85,6 @@ argType is GenericParameter genericParameter &&
 		}
 
 		Console.WriteLine($"got/generated {count} read/write funcs in {sw.ElapsedMilliseconds} ms");
+		return count > 0;
 	}
 }
diff --git a/MirrorWeaver/Weaver/Weaver.cs b/MirrorWeaver/Weaver/Weaver.cs
@@ -207,7 +207,7 @@ public bool Weave(AssemblyDefinition assembly, IAssemblyResolver resolver, out b
                 Console.WriteLine($"Script Module: {moduleDefinition.Name}");
 
                 // CHANGED
-                QSBReaderWriterProcessor.Process(moduleDefinition, writers, readers, ref WeavingFailed);
+                modified |= QSBReaderWriterProcessor.Process(moduleDefinition, writers, readers, ref WeavingFailed);
 
                 modified |= WeaveModule(moduleDefinition);
 

diff --git a/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs b/QSB/Anglerfish/TransformSync/AnglerTransformSync.cs
@@ -1,5 +1,5 @@
 using QSB.Anglerfish.WorldObjects;
-using QSB.AuthoritySync;
+using QSB.OwnershipSync;
 using QSB.Syncs.Unsectored.Rigidbodies;
 using QSB.Utility.LinkedWorldObject;
 using QSB.WorldSync;
@@ -22,7 +22,7 @@ public override void OnStartClient()
 	{
 		if (QSBCore.IsHost)
 		{
-			netIdentity.RegisterAuthQueue();
+			netIdentity.RegisterOwnerQueue();
 		}
 
 		base.OnStartClient();
@@ -32,7 +32,7 @@ public override void OnStopClient()
 	{
 		if (QSBCore.IsHost)
 		{
-			netIdentity.UnregisterAuthQueue();
+			netIdentity.UnregisterOwnerQueue();
 		}
 
 		base.OnStopClient();
@@ -48,7 +48,7 @@ protected override void Init()
 
 		AttachedRigidbody.OnUnsuspendOWRigidbody += OnUnsuspend;
 		AttachedRigidbody.OnSuspendOWRigidbody += OnSuspend;
-		netIdentity.UpdateAuthQueue(AttachedRigidbody.IsSuspended() ? AuthQueueAction.Remove : AuthQueueAction.Add);
+		netIdentity.UpdateOwnerQueue(AttachedRigidbody.IsSuspended() ? OwnerQueueAction.Remove : OwnerQueueAction.Add);
 	}
 
 	protected override void Uninit()
@@ -59,8 +59,8 @@ protected override void Uninit()
 		AttachedRigidbody.OnSuspendOWRigidbody -= OnSuspend;
 	}
 
-	private void OnUnsuspend(OWRigidbody suspendedBody) => netIdentity.UpdateAuthQueue(AuthQueueAction.Add);
-	private void OnSuspend(OWRigidbody suspendedBody) => netIdentity.UpdateAuthQueue(AuthQueueAction.Remove);
+	private void OnUnsuspend(OWRigidbody suspendedBody) => netIdentity.UpdateOwnerQueue(OwnerQueueAction.Add);
+	private void OnSuspend(OWRigidbody suspendedBody) => netIdentity.UpdateOwnerQueue(OwnerQueueAction.Remove);
 
 	protected override void OnRenderObject()
 	{

diff --git a/QSB/Anglerfish/WorldObjects/QSBAngler.cs b/QSB/Anglerfish/WorldObjects/QSBAngler.cs
@@ -16,7 +16,7 @@ public class QSBAngler : LinkedWorldObject<AnglerfishController, AnglerTransform
 	private Vector3 _lastTargetPosition;
 
 	protected override GameObject NetworkObjectPrefab => QSBNetworkManager.singleton.AnglerPrefab;
-	protected override bool SpawnWithServerAuthority => false;
+	protected override bool SpawnWithServerOwnership => false;
 
 	public override void SendInitialState(uint to) =>
 		this.SendMessage(new AnglerDataMessage(this) { To = to });

diff --git a/QSB/Animation/Player/AnimationSync.cs b/QSB/Animation/Player/AnimationSync.cs
@@ -103,7 +103,7 @@ public void InitRemote(Transform body)
 	private void InitAccelerationSync()
 	{
 		Player.JetpackAcceleration = GetComponent<JetpackAccelerationSync>();
-		var thrusterModel = hasAuthority ? Locator.GetPlayerBody().GetComponent<ThrusterModel>() : null;
+		var thrusterModel = isOwned ? Locator.GetPlayerBody().GetComponent<ThrusterModel>() : null;
 		Player.JetpackAcceleration.Init(thrusterModel);
 	}
 

diff --git a/QSB/AssetBundles/qsb_hud b/QSB/AssetBundles/qsb_hud
diff --git a/QSB/AuthoritySync/AuthorityManager.cs b/QSB/AuthoritySync/AuthorityManager.cs
diff --git a/QSB/AuthoritySync/IAuthWorldObject_Extensions.cs b/QSB/AuthoritySync/IAuthWorldObject_Extensions.cs
diff --git a/QSB/EchoesOfTheEye/AlarmTotemSync/Patches/AlarmTotemPatches.cs b/QSB/EchoesOfTheEye/AlarmTotemSync/Patches/AlarmTotemPatches.cs
@@ -1,8 +1,8 @@
 using HarmonyLib;
-using QSB.AuthoritySync;
 using QSB.EchoesOfTheEye.AlarmTotemSync.Messages;
 using QSB.EchoesOfTheEye.AlarmTotemSync.WorldObjects;
 using QSB.Messaging;
+using QSB.OwnershipSync;
 using QSB.Patches;
 using QSB.Player;
 using QSB.Utility;

diff --git a/QSB/EchoesOfTheEye/AlarmTotemSync/WorldObjects/QSBAlarmTotem.cs b/QSB/EchoesOfTheEye/AlarmTotemSync/WorldObjects/QSBAlarmTotem.cs
@@ -1,10 +1,10 @@
-using QSB.AuthoritySync;
-using QSB.EchoesOfTheEye.AlarmTotemSync.Messages;
+using QSB.EchoesOfTheEye.AlarmTotemSync.Messages;
 using QSB.Messaging;
+using QSB.OwnershipSync;
 
 namespace QSB.EchoesOfTheEye.AlarmTotemSync.WorldObjects;
 
-public class QSBAlarmTotem : AuthWorldObject<AlarmTotem>
+public class QSBAlarmTotem : OwnedWorldObject<AlarmTotem>
 {
 	public override bool CanOwn => AttachedObject.enabled;
 

diff --git a/QSB/EchoesOfTheEye/DreamRafts/Patches/DreamRaftPatches.cs b/QSB/EchoesOfTheEye/DreamRafts/Patches/DreamRaftPatches.cs
@@ -1,10 +1,10 @@
 using HarmonyLib;
-using QSB.AuthoritySync;
 using QSB.EchoesOfTheEye.DreamCandles.Patches;
 using QSB.EchoesOfTheEye.DreamObjectProjectors.WorldObject;
 using QSB.EchoesOfTheEye.DreamRafts.Messages;
 using QSB.EchoesOfTheEye.DreamRafts.WorldObjects;
 using QSB.Messaging;
+using QSB.OwnershipSync;
 using QSB.Patches;
 using QSB.WorldSync;
 
@@ -75,10 +75,10 @@ private static bool ExtinguishDreamRaft(DreamWorldController __instance)
 
 		if (__instance._lastUsedRaftProjector)
 		{
-			// still release authority over the raft tho
+			// still release ownership over the raft tho
 			__instance._lastUsedRaftProjector
 				._dreamRaftProjection.GetComponent<DreamRaftController>().GetWorldObject<QSBDreamRaft>()
-				.NetworkBehaviour.netIdentity.UpdateAuthQueue(AuthQueueAction.Remove);
+				.NetworkBehaviour.netIdentity.UpdateOwnerQueue(OwnerQueueAction.Remove);
 		}
 
 		return false;

diff --git a/QSB/EchoesOfTheEye/DreamRafts/WorldObjects/QSBDreamRaft.cs b/QSB/EchoesOfTheEye/DreamRafts/WorldObjects/QSBDreamRaft.cs
@@ -7,5 +7,5 @@ namespace QSB.EchoesOfTheEye.DreamRafts.WorldObjects;
 public class QSBDreamRaft : LinkedWorldObject<DreamRaftController, RaftTransformSync>
 {
 	protected override GameObject NetworkObjectPrefab => QSBNetworkManager.singleton.RaftPrefab;
-	protected override bool SpawnWithServerAuthority => false;
+	protected override bool SpawnWithServerOwnership => false;
 }
diff --git a/QSB/EchoesOfTheEye/DreamRafts/WorldObjects/QSBSealRaft.cs b/QSB/EchoesOfTheEye/DreamRafts/WorldObjects/QSBSealRaft.cs
@@ -7,5 +7,5 @@ namespace QSB.EchoesOfTheEye.DreamRafts.WorldObjects;
 public class QSBSealRaft : LinkedWorldObject<SealRaftController, RaftTransformSync>
 {
 	protected override GameObject NetworkObjectPrefab => QSBNetworkManager.singleton.RaftPrefab;
-	protected override bool SpawnWithServerAuthority => false;
+	protected override bool SpawnWithServerOwnership => false;
 }
diff --git a/QSB/EchoesOfTheEye/EclipseDoors/WorldObjects/QSBEclipseDoorController.cs b/QSB/EchoesOfTheEye/EclipseDoors/WorldObjects/QSBEclipseDoorController.cs
@@ -10,7 +10,7 @@ internal class QSBEclipseDoorController : QSBRotatingElements<EclipseDoorControl
 	protected override IEnumerable<SingleLightSensor> LightSensors => AttachedObject._lightSensors;
 
 	public override string ReturnLabel()
-		=> $"{base.ReturnLabel()}\r\n- SyncerValue:{NetworkBehaviour.Value?.Join()}\r\n- HasAuth:{NetworkBehaviour.hasAuthority}";
+		=> $"{base.ReturnLabel()}\r\n- SyncerValue:{NetworkBehaviour.Value?.Join()}\r\n- IsOwned:{NetworkBehaviour.isOwned}";
 
 	protected override GameObject NetworkObjectPrefab => QSBNetworkManager.singleton.DoorPrefab;
 }
diff --git a/QSB/EchoesOfTheEye/EclipseElevators/WorldObjects/QSBEclipseElevatorController.cs b/QSB/EchoesOfTheEye/EclipseElevators/WorldObjects/QSBEclipseElevatorController.cs
@@ -10,7 +10,7 @@ internal class QSBEclipseElevatorController : QSBRotatingElements<EclipseElevato
 	protected override IEnumerable<SingleLightSensor> LightSensors => AttachedObject._lightSensors;
 
 	public override string ReturnLabel()
-		=> $"{base.ReturnLabel()}\r\n- SyncerValue:{NetworkBehaviour.Value?.Join()}\r\n- HasAuth:{NetworkBehaviour.hasAuthority}";
+		=> $"{base.ReturnLabel()}\r\n- SyncerValue:{NetworkBehaviour.Value?.Join()}\r\n- IsOwned:{NetworkBehaviour.isOwned}";
 
 	protected override GameObject NetworkObjectPrefab => QSBNetworkManager.singleton.ElevatorPrefab;
 }
diff --git a/QSB/EchoesOfTheEye/LightSensorSync/Patches/LightSensorPatches.cs b/QSB/EchoesOfTheEye/LightSensorSync/Patches/LightSensorPatches.cs
@@ -1,8 +1,8 @@
 using HarmonyLib;
-using QSB.AuthoritySync;
 using QSB.EchoesOfTheEye.LightSensorSync.Messages;
 using QSB.EchoesOfTheEye.LightSensorSync.WorldObjects;
 using QSB.Messaging;
+using QSB.OwnershipSync;
 using QSB.Patches;
 using QSB.Player;
 using QSB.Tools.FlashlightTool;

diff --git a/QSB/EchoesOfTheEye/LightSensorSync/QSBPlayerLightSensor.cs b/QSB/EchoesOfTheEye/LightSensorSync/QSBPlayerLightSensor.cs
@@ -16,7 +16,7 @@ namespace QSB.EchoesOfTheEye.LightSensorSync;
 /// only purpose is to handle initial state sync.
 ///
 /// we don't have to worry about start illuminated or sectors.
-/// authority is always given to local player light sensor.
+/// ownership is always given to local player light sensor.
 ///
 /// 2 uses:
 /// - AlarmTotem.CheckPlayerVisible

diff --git a/QSB/EchoesOfTheEye/LightSensorSync/WorldObjects/QSBLightSensor.cs b/QSB/EchoesOfTheEye/LightSensorSync/WorldObjects/QSBLightSensor.cs
@@ -1,7 +1,7 @@
 using Cysharp.Threading.Tasks;
-using QSB.AuthoritySync;
 using QSB.EchoesOfTheEye.LightSensorSync.Messages;
 using QSB.Messaging;
+using QSB.OwnershipSync;
 using QSB.Utility;
 using QSB.WorldSync;
 using System;
@@ -14,7 +14,7 @@
 
 namespace QSB.EchoesOfTheEye.LightSensorSync.WorldObjects;
 
-internal class QSBLightSensor : AuthWorldObject<SingleLightSensor>
+internal class QSBLightSensor : OwnedWorldObject<SingleLightSensor>
 {
 	internal bool _locallyIlluminated;
 

diff --git a/QSB/EchoesOfTheEye/QSBRotatingElements.cs b/QSB/EchoesOfTheEye/QSBRotatingElements.cs
@@ -1,7 +1,7 @@
 using Cysharp.Threading.Tasks;
 using Mirror;
-using QSB.AuthoritySync;
 using QSB.EchoesOfTheEye.LightSensorSync.WorldObjects;
+using QSB.OwnershipSync;
 using QSB.Utility.LinkedWorldObject;
 using QSB.WorldSync;
 using System.Collections.Generic;
@@ -52,7 +52,7 @@ private void OnDetectLocalLight()
 		_litSensors++;
 		if (_litSensors == 1)
 		{
-			NetworkBehaviour.netIdentity.UpdateAuthQueue(AuthQueueAction.Add);
+			NetworkBehaviour.netIdentity.UpdateOwnerQueue(OwnerQueueAction.Add);
 		}
 	}
 
@@ -61,9 +61,9 @@ private void OnDetectLocalDarkness()
 		_litSensors--;
 		if (_litSensors == 0)
 		{
-			NetworkBehaviour.netIdentity.UpdateAuthQueue(AuthQueueAction.Remove);
+			NetworkBehaviour.netIdentity.UpdateOwnerQueue(OwnerQueueAction.Remove);
 		}
 	}
 
-	protected override bool SpawnWithServerAuthority => false;
+	protected override bool SpawnWithServerOwnership => false;
 }