diff --git a/QSB/Anglerfish/WorldObjects/QSBAngler.cs b/QSB/Anglerfish/WorldObjects/QSBAngler.cs index dbf06475..97e8d36c 100644 --- a/QSB/Anglerfish/WorldObjects/QSBAngler.cs +++ b/QSB/Anglerfish/WorldObjects/QSBAngler.cs @@ -14,11 +14,8 @@ namespace QSB.Anglerfish.WorldObjects private Vector3 _lastTargetPosition; - public override void Init(AnglerfishController attachedObject, int id) + public override void Init() { - ObjectId = id; - AttachedObject = attachedObject; - if (QSBCore.IsHost) { QNetworkServer.Spawn(Object.Instantiate(QSBNetworkManager.Instance.AnglerPrefab)); diff --git a/QSB/Animation/NPC/WorldObjects/NpcAnimController.cs b/QSB/Animation/NPC/WorldObjects/NpcAnimController.cs index 86ca2d77..74a41b5d 100644 --- a/QSB/Animation/NPC/WorldObjects/NpcAnimController.cs +++ b/QSB/Animation/NPC/WorldObjects/NpcAnimController.cs @@ -7,12 +7,6 @@ namespace QSB.Animation.NPC.WorldObjects internal abstract class NpcAnimController : WorldObject, INpcAnimController where T : MonoBehaviour { - public override void Init(T controller, int id) - { - ObjectId = id; - AttachedObject = controller; - } - public abstract CharacterDialogueTree GetDialogueTree(); public virtual void StartConversation() diff --git a/QSB/Animation/NPC/WorldObjects/QSBSolanumAnimController.cs b/QSB/Animation/NPC/WorldObjects/QSBSolanumAnimController.cs index 3505f973..e940c8c9 100644 --- a/QSB/Animation/NPC/WorldObjects/QSBSolanumAnimController.cs +++ b/QSB/Animation/NPC/WorldObjects/QSBSolanumAnimController.cs @@ -8,12 +8,6 @@ namespace QSB.Animation.NPC.WorldObjects { private readonly List _playersInHeadZone = new(); - public override void Init(SolanumAnimController controller, int id) - { - ObjectId = id; - AttachedObject = controller; - } - public List GetPlayersInHeadZone() => _playersInHeadZone; diff --git a/QSB/CampfireSync/WorldObjects/QSBCampfire.cs b/QSB/CampfireSync/WorldObjects/QSBCampfire.cs index b4d43649..60e08cbd 100644 --- a/QSB/CampfireSync/WorldObjects/QSBCampfire.cs +++ b/QSB/CampfireSync/WorldObjects/QSBCampfire.cs @@ -5,12 +5,6 @@ namespace QSB.CampfireSync.WorldObjects { public class QSBCampfire : WorldObject { - public override void Init(Campfire campfire, int id) - { - ObjectId = id; - AttachedObject = campfire; - } - public void StartRoasting() => AttachedObject .GetType() diff --git a/QSB/EchoesOfTheEye/AirlockSync/WorldObjects/QSBGhostAirlock.cs b/QSB/EchoesOfTheEye/AirlockSync/WorldObjects/QSBGhostAirlock.cs index 67b73576..b19bf457 100644 --- a/QSB/EchoesOfTheEye/AirlockSync/WorldObjects/QSBGhostAirlock.cs +++ b/QSB/EchoesOfTheEye/AirlockSync/WorldObjects/QSBGhostAirlock.cs @@ -4,10 +4,5 @@ namespace QSB.EchoesOfTheEye.AirlockSync.WorldObjects { internal class QSBGhostAirlock : WorldObject { - public override void Init(GhostAirlock airlock, int id) - { - ObjectId = id; - AttachedObject = airlock; - } } } diff --git a/QSB/EchoesOfTheEye/LightSensorSync/WorldObjects/QSBSingleLightSensor.cs b/QSB/EchoesOfTheEye/LightSensorSync/WorldObjects/QSBSingleLightSensor.cs index 089e67d3..92aab307 100644 --- a/QSB/EchoesOfTheEye/LightSensorSync/WorldObjects/QSBSingleLightSensor.cs +++ b/QSB/EchoesOfTheEye/LightSensorSync/WorldObjects/QSBSingleLightSensor.cs @@ -4,10 +4,5 @@ namespace QSB.EchoesOfTheEye.LightSensorSync.WorldObjects { internal class QSBSingleLightSensor : WorldObject { - public override void Init(SingleLightSensor sensor, int id) - { - ObjectId = id; - AttachedObject = sensor; - } } } diff --git a/QSB/ElevatorSync/WorldObjects/QSBElevator.cs b/QSB/ElevatorSync/WorldObjects/QSBElevator.cs index f322af7a..7ca93dee 100644 --- a/QSB/ElevatorSync/WorldObjects/QSBElevator.cs +++ b/QSB/ElevatorSync/WorldObjects/QSBElevator.cs @@ -13,10 +13,8 @@ namespace QSB.ElevatorSync.WorldObjects private OWAudioSource _owAudioSourceLP; private OWTriggerVolume _elevatorTrigger; - public override void Init(Elevator elevator, int id) + public override void Init() { - AttachedObject = elevator; - ObjectId = id; QSBCore.UnityEvents.RunWhen(() => AttachedObject._interactVolume != null, InitValues); } diff --git a/QSB/GeyserSync/WorldObjects/QSBGeyser.cs b/QSB/GeyserSync/WorldObjects/QSBGeyser.cs index 0cac3e86..34ef9b94 100644 --- a/QSB/GeyserSync/WorldObjects/QSBGeyser.cs +++ b/QSB/GeyserSync/WorldObjects/QSBGeyser.cs @@ -6,10 +6,8 @@ namespace QSB.GeyserSync.WorldObjects { public class QSBGeyser : WorldObject { - public override void Init(GeyserController geyserController, int id) + public override void Init() { - ObjectId = id; - AttachedObject = geyserController; AttachedObject.OnGeyserActivateEvent += () => HandleEvent(true); AttachedObject.OnGeyserDeactivateEvent += () => HandleEvent(false); } diff --git a/QSB/ItemSync/WorldObjects/Items/QSBNomaiConversationStone.cs b/QSB/ItemSync/WorldObjects/Items/QSBNomaiConversationStone.cs index 97a2798e..05f8de45 100644 --- a/QSB/ItemSync/WorldObjects/Items/QSBNomaiConversationStone.cs +++ b/QSB/ItemSync/WorldObjects/Items/QSBNomaiConversationStone.cs @@ -2,11 +2,5 @@ { internal class QSBNomaiConversationStone : QSBOWItem { - public override void Init(NomaiConversationStone attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } } } diff --git a/QSB/ItemSync/WorldObjects/Items/QSBOWItem.cs b/QSB/ItemSync/WorldObjects/Items/QSBOWItem.cs index cb335596..6feb597d 100644 --- a/QSB/ItemSync/WorldObjects/Items/QSBOWItem.cs +++ b/QSB/ItemSync/WorldObjects/Items/QSBOWItem.cs @@ -17,9 +17,9 @@ namespace QSB.ItemSync.WorldObjects.Items public QSBSector InitialSector { get; private set; } public uint HoldingPlayer { get; private set; } - public override void Init(T attachedObject, int id) + public override void Init() { - if (attachedObject == null) + if (AttachedObject == null) { DebugLog.ToConsole($"Error - AttachedObject is null! Type:{GetType().Name}", OWML.Common.MessageType.Error); return; @@ -30,10 +30,10 @@ namespace QSB.ItemSync.WorldObjects.Items { FinishDelayedReady(); - InitialParent = attachedObject.transform.parent; - InitialPosition = attachedObject.transform.localPosition; - InitialRotation = attachedObject.transform.localRotation; - var initialSector = attachedObject.GetSector(); + InitialParent = AttachedObject.transform.parent; + InitialPosition = AttachedObject.transform.localPosition; + InitialRotation = AttachedObject.transform.localRotation; + var initialSector = AttachedObject.GetSector(); if (initialSector != null) { InitialSector = QSBWorldSync.GetWorldFromUnity(initialSector); @@ -41,7 +41,7 @@ namespace QSB.ItemSync.WorldObjects.Items if (InitialParent == null) { - DebugLog.ToConsole($"Warning - InitialParent of {attachedObject.name} is null!", OWML.Common.MessageType.Warning); + DebugLog.ToConsole($"Warning - InitialParent of {AttachedObject.name} is null!", OWML.Common.MessageType.Warning); } if (InitialParent?.GetComponent() != null) diff --git a/QSB/ItemSync/WorldObjects/Items/QSBScrollItem.cs b/QSB/ItemSync/WorldObjects/Items/QSBScrollItem.cs index 425f980c..ef66c5b3 100644 --- a/QSB/ItemSync/WorldObjects/Items/QSBScrollItem.cs +++ b/QSB/ItemSync/WorldObjects/Items/QSBScrollItem.cs @@ -2,13 +2,6 @@ { internal class QSBScrollItem : QSBOWItem { - public override void Init(ScrollItem attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } - public override void PlaySocketAnimation() => AttachedObject.PlaySocketAnimation(); diff --git a/QSB/ItemSync/WorldObjects/Items/QSBSharedStone.cs b/QSB/ItemSync/WorldObjects/Items/QSBSharedStone.cs index fe2830f4..1b10bb63 100644 --- a/QSB/ItemSync/WorldObjects/Items/QSBSharedStone.cs +++ b/QSB/ItemSync/WorldObjects/Items/QSBSharedStone.cs @@ -2,13 +2,6 @@ { internal class QSBSharedStone : QSBOWItem { - public override void Init(SharedStone attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } - public override void PlaySocketAnimation() => AttachedObject.PlaySocketAnimation(); diff --git a/QSB/ItemSync/WorldObjects/Items/QSBSimpleLanternItem.cs b/QSB/ItemSync/WorldObjects/Items/QSBSimpleLanternItem.cs index 12bf9c7b..782dbf3e 100644 --- a/QSB/ItemSync/WorldObjects/Items/QSBSimpleLanternItem.cs +++ b/QSB/ItemSync/WorldObjects/Items/QSBSimpleLanternItem.cs @@ -2,13 +2,6 @@ { internal class QSBSimpleLanternItem : QSBOWItem { - public override void Init(SimpleLanternItem attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } - public override void PlaySocketAnimation() => AttachedObject.PlaySocketAnimation(); diff --git a/QSB/ItemSync/WorldObjects/Items/QSBSlideReelItem.cs b/QSB/ItemSync/WorldObjects/Items/QSBSlideReelItem.cs index 41735ea0..ae7ceefc 100644 --- a/QSB/ItemSync/WorldObjects/Items/QSBSlideReelItem.cs +++ b/QSB/ItemSync/WorldObjects/Items/QSBSlideReelItem.cs @@ -2,13 +2,6 @@ { internal class QSBSlideReelItem : QSBOWItem { - public override void Init(SlideReelItem attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } - public override void PlaySocketAnimation() => AttachedObject.PlaySocketAnimation(); diff --git a/QSB/ItemSync/WorldObjects/Items/QSBWarpCoreItem.cs b/QSB/ItemSync/WorldObjects/Items/QSBWarpCoreItem.cs index 3be29380..e82308bf 100644 --- a/QSB/ItemSync/WorldObjects/Items/QSBWarpCoreItem.cs +++ b/QSB/ItemSync/WorldObjects/Items/QSBWarpCoreItem.cs @@ -2,13 +2,6 @@ { internal class QSBWarpCoreItem : QSBOWItem { - public override void Init(WarpCoreItem attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } - public bool IsVesselCoreType() => AttachedObject.IsVesselCoreType(); } diff --git a/QSB/ItemSync/WorldObjects/Sockets/QSBNomaiConversationStoneSocket.cs b/QSB/ItemSync/WorldObjects/Sockets/QSBNomaiConversationStoneSocket.cs index bc48b86e..8a678bd1 100644 --- a/QSB/ItemSync/WorldObjects/Sockets/QSBNomaiConversationStoneSocket.cs +++ b/QSB/ItemSync/WorldObjects/Sockets/QSBNomaiConversationStoneSocket.cs @@ -2,11 +2,5 @@ { internal class QSBNomaiConversationStoneSocket : QSBOWItemSocket { - public override void Init(NomaiConversationStoneSocket attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } } } diff --git a/QSB/ItemSync/WorldObjects/Sockets/QSBOWItemDoubleSocket.cs b/QSB/ItemSync/WorldObjects/Sockets/QSBOWItemDoubleSocket.cs index 7ca06e54..286cbb3d 100644 --- a/QSB/ItemSync/WorldObjects/Sockets/QSBOWItemDoubleSocket.cs +++ b/QSB/ItemSync/WorldObjects/Sockets/QSBOWItemDoubleSocket.cs @@ -6,8 +6,6 @@ namespace QSB.ItemSync.WorldObjects.Sockets internal class QSBOWItemDoubleSocket : WorldObject, IQSBOWItemSocket where T : OWItemSocket { - public override void Init(T attachedObject, int id) { } - public virtual bool AcceptsItem(IQSBOWItem item) { var itemType = item.GetItemType(); diff --git a/QSB/ItemSync/WorldObjects/Sockets/QSBOWItemSocket.cs b/QSB/ItemSync/WorldObjects/Sockets/QSBOWItemSocket.cs index 545e8ca1..96a6c0da 100644 --- a/QSB/ItemSync/WorldObjects/Sockets/QSBOWItemSocket.cs +++ b/QSB/ItemSync/WorldObjects/Sockets/QSBOWItemSocket.cs @@ -6,8 +6,6 @@ namespace QSB.ItemSync.WorldObjects.Sockets internal class QSBOWItemSocket : WorldObject, IQSBOWItemSocket where T : OWItemSocket { - public override void Init(T attachedObject, int id) { } - public virtual bool AcceptsItem(IQSBOWItem item) { var itemType = item.GetItemType(); diff --git a/QSB/ItemSync/WorldObjects/Sockets/QSBScrollSocket.cs b/QSB/ItemSync/WorldObjects/Sockets/QSBScrollSocket.cs index 79755b9d..b6bc98b1 100644 --- a/QSB/ItemSync/WorldObjects/Sockets/QSBScrollSocket.cs +++ b/QSB/ItemSync/WorldObjects/Sockets/QSBScrollSocket.cs @@ -2,11 +2,5 @@ { internal class QSBScrollSocket : QSBOWItemSocket { - public override void Init(ScrollSocket attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } } } diff --git a/QSB/ItemSync/WorldObjects/Sockets/QSBSharedStoneSocket.cs b/QSB/ItemSync/WorldObjects/Sockets/QSBSharedStoneSocket.cs index 357b3a0b..3efe3002 100644 --- a/QSB/ItemSync/WorldObjects/Sockets/QSBSharedStoneSocket.cs +++ b/QSB/ItemSync/WorldObjects/Sockets/QSBSharedStoneSocket.cs @@ -2,11 +2,5 @@ { internal class QSBSharedStoneSocket : QSBOWItemSocket { - public override void Init(SharedStoneSocket attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } } } diff --git a/QSB/ItemSync/WorldObjects/Sockets/QSBSlideProjectorSocket.cs b/QSB/ItemSync/WorldObjects/Sockets/QSBSlideProjectorSocket.cs index 6d353c95..87e6aefd 100644 --- a/QSB/ItemSync/WorldObjects/Sockets/QSBSlideProjectorSocket.cs +++ b/QSB/ItemSync/WorldObjects/Sockets/QSBSlideProjectorSocket.cs @@ -2,11 +2,5 @@ { internal class QSBSlideProjectorSocket : QSBOWItemDoubleSocket { - public override void Init(SlideProjectorSocket attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } } } diff --git a/QSB/ItemSync/WorldObjects/Sockets/QSBSlideReelSocket.cs b/QSB/ItemSync/WorldObjects/Sockets/QSBSlideReelSocket.cs index 72ed11e3..de18c9ee 100644 --- a/QSB/ItemSync/WorldObjects/Sockets/QSBSlideReelSocket.cs +++ b/QSB/ItemSync/WorldObjects/Sockets/QSBSlideReelSocket.cs @@ -2,11 +2,5 @@ { internal class QSBSlideReelSocket : QSBOWItemSocket { - public override void Init(SlideReelSocket attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } } } diff --git a/QSB/ItemSync/WorldObjects/Sockets/QSBWarpCoreSocket.cs b/QSB/ItemSync/WorldObjects/Sockets/QSBWarpCoreSocket.cs index 5afa4e20..e834888c 100644 --- a/QSB/ItemSync/WorldObjects/Sockets/QSBWarpCoreSocket.cs +++ b/QSB/ItemSync/WorldObjects/Sockets/QSBWarpCoreSocket.cs @@ -2,11 +2,5 @@ { internal class QSBWarpCoreSocket : QSBOWItemSocket { - public override void Init(WarpCoreSocket attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - base.Init(attachedObject, id); - } } } diff --git a/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs b/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs index 53f801c1..3a5429ba 100644 --- a/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs +++ b/QSB/JellyfishSync/WorldObjects/QSBJellyfish.cs @@ -11,10 +11,8 @@ namespace QSB.JellyfishSync.WorldObjects public JellyfishTransformSync TransformSync; private AlignWithTargetBody _alignWithTargetBody; - public override void Init(JellyfishController attachedObject, int id) + public override void Init() { - ObjectId = id; - AttachedObject = attachedObject; _alignWithTargetBody = AttachedObject.GetRequiredComponent(); if (QSBCore.IsHost) diff --git a/QSB/MeteorSync/WorldObjects/QSBFragment.cs b/QSB/MeteorSync/WorldObjects/QSBFragment.cs index bb95c0a6..ccec51ae 100644 --- a/QSB/MeteorSync/WorldObjects/QSBFragment.cs +++ b/QSB/MeteorSync/WorldObjects/QSBFragment.cs @@ -5,10 +5,8 @@ namespace QSB.MeteorSync.WorldObjects { public class QSBFragment : WorldObject { - public override void Init(FragmentIntegrity attachedObject, int id) + public override void Init() { - ObjectId = id; - AttachedObject = attachedObject; DetachableFragment = AttachedObject.GetComponent(); if (QSBCore.IsHost) diff --git a/QSB/MeteorSync/WorldObjects/QSBMeteor.cs b/QSB/MeteorSync/WorldObjects/QSBMeteor.cs index f3214007..4ea4b704 100644 --- a/QSB/MeteorSync/WorldObjects/QSBMeteor.cs +++ b/QSB/MeteorSync/WorldObjects/QSBMeteor.cs @@ -5,12 +5,6 @@ namespace QSB.MeteorSync.WorldObjects { public class QSBMeteor : WorldObject { - public override void Init(MeteorController attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - } - public static bool IsSpecialImpact(GameObject go) => go == Locator.GetPlayerCollider().gameObject || go == Locator.GetProbe()._anchor._collider.gameObject; diff --git a/QSB/MeteorSync/WorldObjects/QSBMeteorLauncher.cs b/QSB/MeteorSync/WorldObjects/QSBMeteorLauncher.cs index a2321a5b..d9a2903c 100644 --- a/QSB/MeteorSync/WorldObjects/QSBMeteorLauncher.cs +++ b/QSB/MeteorSync/WorldObjects/QSBMeteorLauncher.cs @@ -4,12 +4,6 @@ namespace QSB.MeteorSync.WorldObjects { public class QSBMeteorLauncher : WorldObject { - public override void Init(MeteorLauncher attachedObject, int id) - { - ObjectId = id; - AttachedObject = attachedObject; - } - public int MeteorId; public float LaunchSpeed; diff --git a/QSB/OrbSync/WorldObjects/QSBOrbSlot.cs b/QSB/OrbSync/WorldObjects/QSBOrbSlot.cs index 65c5a5c9..58f64047 100644 --- a/QSB/OrbSync/WorldObjects/QSBOrbSlot.cs +++ b/QSB/OrbSync/WorldObjects/QSBOrbSlot.cs @@ -11,10 +11,8 @@ namespace QSB.OrbSync.WorldObjects private bool _initialized; - public override void Init(NomaiInterfaceSlot slot, int id) + public override void Init() { - ObjectId = id; - AttachedObject = slot; _initialized = true; } diff --git a/QSB/QuantumSync/WorldObjects/QSBEyeProxyQuantumMoon.cs b/QSB/QuantumSync/WorldObjects/QSBEyeProxyQuantumMoon.cs index 6f21d9c0..7166b578 100644 --- a/QSB/QuantumSync/WorldObjects/QSBEyeProxyQuantumMoon.cs +++ b/QSB/QuantumSync/WorldObjects/QSBEyeProxyQuantumMoon.cs @@ -4,12 +4,10 @@ namespace QSB.QuantumSync.WorldObjects { internal class QSBEyeProxyQuantumMoon : QSBQuantumObject { - public override void Init(EyeProxyQuantumMoon moonObject, int id) + public override void Init() { - ObjectId = id; - AttachedObject = moonObject; ControllingPlayer = QSBPlayerManager.LocalPlayerId; - base.Init(moonObject, id); + base.Init(); } } } diff --git a/QSB/QuantumSync/WorldObjects/QSBMultiStateQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBMultiStateQuantumObject.cs index a35c019c..18ee5aef 100644 --- a/QSB/QuantumSync/WorldObjects/QSBMultiStateQuantumObject.cs +++ b/QSB/QuantumSync/WorldObjects/QSBMultiStateQuantumObject.cs @@ -21,17 +21,14 @@ namespace QSB.QuantumSync.WorldObjects } } - public override void Init(MultiStateQuantumObject attachedObject, int id) + public override void Init() { - ObjectId = id; - AttachedObject = attachedObject; - if (QSBCore.ShowQuantumDebugBoxes) { - DebugBoxText = DebugBoxManager.CreateBox(AttachedObject.transform, 0, $"Multistate\r\nid:{id}\r\nstate:{CurrentState}").GetComponent(); + DebugBoxText = DebugBoxManager.CreateBox(AttachedObject.transform, 0, $"Multistate\r\nid:{ObjectId}\r\nstate:{CurrentState}").GetComponent(); } - base.Init(attachedObject, id); + base.Init(); StartDelayedReady(); QSBCore.UnityEvents.RunWhen(() => WorldObjectManager.AllObjectsAdded, () => diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumMoon.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumMoon.cs index 184cedfb..3e4572ee 100644 --- a/QSB/QuantumSync/WorldObjects/QSBQuantumMoon.cs +++ b/QSB/QuantumSync/WorldObjects/QSBQuantumMoon.cs @@ -5,14 +5,12 @@ namespace QSB.QuantumSync.WorldObjects { internal class QSBQuantumMoon : QSBQuantumObject { - public override void Init(QuantumMoon moonObject, int id) + public override void Init() { - ObjectId = id; - AttachedObject = moonObject; ControllingPlayer = QSBCore.IsHost ? QSBPlayerManager.LocalPlayerId : QSBPlayerManager.PlayerList.OrderBy(x => x.PlayerId).First().PlayerId; - base.Init(moonObject, id); + base.Init(); } } } diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs index 8005135a..7d5bd64d 100644 --- a/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs +++ b/QSB/QuantumSync/WorldObjects/QSBQuantumObject.cs @@ -24,7 +24,7 @@ namespace QSB.QuantumSync.WorldObjects } } - public override void Init(T attachedObject, int id) + public override void Init() { var debugBundle = QSBCore.DebugAssetBundle; var sphere = debugBundle.LoadAsset("Assets/Prefabs/Sphere.prefab"); diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumShuffleObject.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumShuffleObject.cs index e663b87c..b02fed69 100644 --- a/QSB/QuantumSync/WorldObjects/QSBQuantumShuffleObject.cs +++ b/QSB/QuantumSync/WorldObjects/QSBQuantumShuffleObject.cs @@ -5,13 +5,6 @@ namespace QSB.QuantumSync.WorldObjects { internal class QSBQuantumShuffleObject : QSBQuantumObject { - public override void Init(QuantumShuffleObject shuffleObject, int id) - { - ObjectId = id; - AttachedObject = shuffleObject; - base.Init(shuffleObject, id); - } - public void ShuffleObjects(int[] indexArray) { var shuffledObjects = AttachedObject.GetValue("_shuffledObjects"); diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumSocket.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumSocket.cs index 69ef33d9..5c1d2336 100644 --- a/QSB/QuantumSync/WorldObjects/QSBQuantumSocket.cs +++ b/QSB/QuantumSync/WorldObjects/QSBQuantumSocket.cs @@ -5,10 +5,8 @@ namespace QSB.QuantumSync.WorldObjects { internal class QSBQuantumSocket : WorldObject { - public override void Init(QuantumSocket quantumSocket, int id) + public override void Init() { - ObjectId = id; - AttachedObject = quantumSocket; AttachedObject.GetType().SetValue("_randomYRotation", false); } } diff --git a/QSB/QuantumSync/WorldObjects/QSBQuantumState.cs b/QSB/QuantumSync/WorldObjects/QSBQuantumState.cs index 4461b5a2..c05ae8ac 100644 --- a/QSB/QuantumSync/WorldObjects/QSBQuantumState.cs +++ b/QSB/QuantumSync/WorldObjects/QSBQuantumState.cs @@ -6,12 +6,6 @@ namespace QSB.QuantumSync.WorldObjects { public bool IsMeantToBeEnabled; - public override void Init(QuantumState state, int id) - { - ObjectId = id; - AttachedObject = state; - } - public void SetVisible(bool visible) { IsMeantToBeEnabled = visible; diff --git a/QSB/QuantumSync/WorldObjects/QSBSocketedQuantumObject.cs b/QSB/QuantumSync/WorldObjects/QSBSocketedQuantumObject.cs index 621881c9..89f38cfd 100644 --- a/QSB/QuantumSync/WorldObjects/QSBSocketedQuantumObject.cs +++ b/QSB/QuantumSync/WorldObjects/QSBSocketedQuantumObject.cs @@ -13,11 +13,9 @@ namespace QSB.QuantumSync.WorldObjects { public Text DebugBoxText; - public override void Init(SocketedQuantumObject quantumObject, int id) + public override void Init() { - ObjectId = id; - AttachedObject = quantumObject; - base.Init(quantumObject, id); + base.Init(); if (QSBCore.ShowQuantumDebugBoxes) { DebugBoxText = DebugBoxManager.CreateBox(AttachedObject.transform, 0, $"Socketed\r\nid:{ObjectId}").GetComponent(); diff --git a/QSB/SectorSync/WorldObjects/QSBSector.cs b/QSB/SectorSync/WorldObjects/QSBSector.cs index 0a85a8e5..cbb2aabc 100644 --- a/QSB/SectorSync/WorldObjects/QSBSector.cs +++ b/QSB/SectorSync/WorldObjects/QSBSector.cs @@ -27,10 +27,8 @@ namespace QSB.SectorSync.WorldObjects public Vector3 Position => Transform.position; public bool IsFakeSector => AttachedObject.GetType() == typeof(FakeSector); - public override void Init(Sector sector, int id) + public override void Init() { - ObjectId = id; - AttachedObject = sector; if (IsFakeSector) { QSBSectorManager.Instance.FakeSectors.Add(this); diff --git a/QSB/ShipSync/WorldObjects/QSBShipComponent.cs b/QSB/ShipSync/WorldObjects/QSBShipComponent.cs index 15bba4e0..5b193859 100644 --- a/QSB/ShipSync/WorldObjects/QSBShipComponent.cs +++ b/QSB/ShipSync/WorldObjects/QSBShipComponent.cs @@ -6,12 +6,6 @@ namespace QSB.ShipSync.WorldObjects { internal class QSBShipComponent : WorldObject { - public override void Init(ShipComponent component, int id) - { - ObjectId = id; - AttachedObject = component; - } - public void SetDamaged() { DebugLog.DebugWrite($"[S COMPONENT] {AttachedObject} Set damaged."); diff --git a/QSB/ShipSync/WorldObjects/QSBShipHull.cs b/QSB/ShipSync/WorldObjects/QSBShipHull.cs index 01b69f40..3f928bcc 100644 --- a/QSB/ShipSync/WorldObjects/QSBShipHull.cs +++ b/QSB/ShipSync/WorldObjects/QSBShipHull.cs @@ -6,12 +6,6 @@ namespace QSB.ShipSync.WorldObjects { internal class QSBShipHull : WorldObject { - public override void Init(ShipHull hull, int id) - { - ObjectId = id; - AttachedObject = hull; - } - public void SetDamaged() { DebugLog.DebugWrite($"[HULL] {AttachedObject} Set damaged."); diff --git a/QSB/Tools/ProbeLauncherTool/WorldObjects/QSBProbeLauncher.cs b/QSB/Tools/ProbeLauncherTool/WorldObjects/QSBProbeLauncher.cs index f703712b..c3517b02 100644 --- a/QSB/Tools/ProbeLauncherTool/WorldObjects/QSBProbeLauncher.cs +++ b/QSB/Tools/ProbeLauncherTool/WorldObjects/QSBProbeLauncher.cs @@ -12,10 +12,8 @@ namespace QSB.Tools.ProbeLauncherTool.WorldObjects private ProbeLauncherEffects _effects; private SingularityWarpEffect _probeRetrievalEffect; - public override void Init(ProbeLauncher launcher, int id) + public override void Init() { - ObjectId = id; - AttachedObject = launcher; _probeRetrievalLength = AttachedObject.GetValue("_probeRetrievalLength"); _preLaunchProbeProxy = AttachedObject.GetValue("_preLaunchProbeProxy"); _effects = AttachedObject.GetValue("_effects"); diff --git a/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBComputer.cs b/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBComputer.cs index 7f645870..7e6cd03d 100644 --- a/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBComputer.cs +++ b/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBComputer.cs @@ -6,12 +6,6 @@ namespace QSB.Tools.TranslatorTool.TranslationSync.WorldObjects { internal class QSBComputer : WorldObject { - public override void Init(NomaiComputer computer, int id) - { - ObjectId = id; - AttachedObject = computer; - } - public void HandleSetAsTranslated(int id) { if (AttachedObject.IsTranslated(id)) diff --git a/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBVesselComputer.cs b/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBVesselComputer.cs index e50b64fd..f993e914 100644 --- a/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBVesselComputer.cs +++ b/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBVesselComputer.cs @@ -7,12 +7,6 @@ namespace QSB.Tools.TranslatorTool.TranslationSync.WorldObjects { internal class QSBVesselComputer : WorldObject { - public override void Init(NomaiVesselComputer computer, int id) - { - ObjectId = id; - AttachedObject = computer; - } - public void HandleSetAsTranslated(int id) { if (AttachedObject.IsTranslated(id)) diff --git a/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBWallText.cs b/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBWallText.cs index 249ffc04..2102f50d 100644 --- a/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBWallText.cs +++ b/QSB/Tools/TranslatorTool/TranslationSync/WorldObjects/QSBWallText.cs @@ -6,12 +6,6 @@ namespace QSB.Tools.TranslatorTool.TranslationSync.WorldObjects { internal class QSBWallText : WorldObject { - public override void Init(NomaiWallText wallText, int id) - { - ObjectId = id; - AttachedObject = wallText; - } - public void HandleSetAsTranslated(int id) { if (AttachedObject.IsTranslated(id)) diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs index 5342543f..7f335ac9 100644 --- a/QSB/WorldSync/QSBWorldSync.cs +++ b/QSB/WorldSync/QSBWorldSync.cs @@ -149,7 +149,9 @@ namespace QSB.WorldSync for (var id = 0; id < list.Count; id++) { var obj = CreateWorldObject(); - obj.Init(list[id], id); + obj.AttachedObject = list[id]; + obj.ObjectId = id; + obj.Init(); WorldObjectsToUnityObjects.Add(list[id], obj); } } diff --git a/QSB/WorldSync/WorldObject.cs b/QSB/WorldSync/WorldObject.cs index 0d05a26e..b2d699b7 100644 --- a/QSB/WorldSync/WorldObject.cs +++ b/QSB/WorldSync/WorldObject.cs @@ -6,12 +6,12 @@ namespace QSB.WorldSync public abstract class WorldObject : IWorldObject where T : MonoBehaviour { - public int ObjectId { get; protected set; } - public T AttachedObject { get; protected set; } + public int ObjectId { get; set; } + public T AttachedObject { get; set; } public string Name => AttachedObject == null ? "" : AttachedObject.name; public string LogName => $"{QSBPlayerManager.LocalPlayerId}.{ObjectId}:{GetType().Name}"; - public abstract void Init(T attachedObject, int id); + public virtual void Init() { } public virtual void OnRemoval() { } public MonoBehaviour ReturnObject() => AttachedObject; diff --git a/QSB/ZeroGCaveSync/WorldObjects/QSBSatelliteNode.cs b/QSB/ZeroGCaveSync/WorldObjects/QSBSatelliteNode.cs index 6be183d7..0598d3be 100644 --- a/QSB/ZeroGCaveSync/WorldObjects/QSBSatelliteNode.cs +++ b/QSB/ZeroGCaveSync/WorldObjects/QSBSatelliteNode.cs @@ -5,12 +5,6 @@ namespace QSB.ZeroGCaveSync.WorldObjects { internal class QSBSatelliteNode : WorldObject { - public override void Init(SatelliteNode component, int id) - { - ObjectId = id; - AttachedObject = component; - } - public void SetRepaired() { DebugLog.DebugWrite($"[SATELLITE NODE] {AttachedObject} Set repaired.");