Merge pull request #626 from misternebula/dev

0.28.1

Author: misternebula

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 });
+		}
 	}
-}
+}

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;
 	}
 }

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);
 

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()
 	{

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 });

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);
 	}
 

QSB/AssetBundles/qsb_hud

@@ -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;