Revert "change name"

This reverts commit f75daded8453ad98666b6ee68fc68f573a286511.
This commit is contained in:
Mister_Nebula 2021-04-11 16:49:07 +01:00
parent 942dff9332
commit ad9ad8a676
13 changed files with 13 additions and 43 deletions

View File

@ -1,11 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace QSB.ModelShipSync
{
class ModelShipManager
{
}
}

View File

@ -1,7 +1,6 @@
using OWML.Common;
using QSB.Events;
using QSB.SectorSync.WorldObjects;
using QSB.TransformSync;
using QSB.Utility;
using QSB.WorldSync;
using QSB.WorldSync.Events;
@ -37,7 +36,7 @@ namespace QSB.Player.Events
return;
}
var transformSync = QSBPlayerManager.GetSyncObject<PlayerObjectTransformSync>(message.AboutId);
var transformSync = QSBPlayerManager.GetSyncObject<TransformSync.TransformSync>(message.AboutId);
QSBCore.UnityEvents.RunWhen(() => transformSync?.SyncedTransform != null,
() => transformSync?.SetReferenceSector(sector));

View File

@ -3,7 +3,6 @@ using QSB.CampfireSync.WorldObjects;
using QSB.Events;
using QSB.Messaging;
using QSB.QuantumSync;
using QSB.TransformSync;
using QSB.TranslationSync;
using QSB.TranslationSync.WorldObjects;
using QSB.Utility;
@ -31,7 +30,7 @@ namespace QSB.Player.Events
{
DebugLog.DebugWrite($"Get state request from {message.FromId} - isServer?{server}");
QSBEventManager.FireEvent(EventNames.QSBServerSendPlayerStates);
foreach (var item in QSBPlayerManager.GetSyncObjects<PlayerObjectTransformSync>()
foreach (var item in QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
.Where(x => x != null && x.IsReady && x.ReferenceSector != null))
{
QSBEventManager.FireEvent(EventNames.QSBSectorChange, item.NetId.Value, item.ReferenceSector);

View File

@ -1,6 +1,5 @@
using OWML.Common;
using QSB.Events;
using QSB.TransformSync;
using QSB.Utility;
namespace QSB.Player.Events
@ -33,7 +32,7 @@ namespace QSB.Player.Events
{
DebugLog.DebugWrite($"Received playerstate of player ID {message.AboutId}", MessageType.Info);
QSBCore.UnityEvents.RunWhen(
() => QSBPlayerManager.GetSyncObject<PlayerObjectTransformSync>(message.AboutId) != null,
() => QSBPlayerManager.GetSyncObject<TransformSync.TransformSync>(message.AboutId) != null,
() => QSBPlayerManager.HandleFullStateMessage(message));
}
}

View File

@ -142,7 +142,6 @@
<Compile Include="Instruments\QSBCamera\CameraMode.cs" />
<Compile Include="Instruments\InstrumentsManager.cs" />
<Compile Include="Messaging\BoolMessage.cs" />
<Compile Include="ModelShipSync\ModelShipManager.cs" />
<Compile Include="PoolSync\CustomNomaiRemoteCameraPlatform.cs" />
<Compile Include="PoolSync\CustomNomaiRemoteCameraStreaming.cs" />
<Compile Include="ItemSync\Events\DropItemEvent.cs" />
@ -229,7 +228,6 @@
<Compile Include="StatueSync\Events\StartStatueMessage.cs" />
<Compile Include="StatueSync\Patches\StatuePatches.cs" />
<Compile Include="StatueSync\StatueManager.cs" />
<Compile Include="TransformSync\Rigidbody\RigidbodyTransformSync.cs" />
<Compile Include="TransformSync\RoastingStickTransformSync.cs" />
<Compile Include="TranslationSync\Events\SetAsTranslatedEvent.cs" />
<Compile Include="TranslationSync\Events\SetAsTranslatedMessage.cs" />
@ -262,7 +260,7 @@
<Compile Include="Messaging\ToggleMessage.cs" />
<Compile Include="SectorSync\WorldObjects\QSBSector.cs" />
<Compile Include="SectorSync\SectorSync.cs" />
<Compile Include="TransformSync\PlayerObjectTransformSync.cs" />
<Compile Include="TransformSync\TransformSync.cs" />
<Compile Include="Utility\CustomCallbacks.cs" />
<Compile Include="Utility\DebugBoxManager.cs" />
<Compile Include="Utility\DebugZOverride.cs" />
@ -344,9 +342,7 @@
<Version>1.1.8</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Folder Include="ModelShipSync\Patches\" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>xcopy /e /i /y "$(TargetDir)*" "$(OwmlDir)\Mods\$(ProjectName)"

View File

@ -2,7 +2,6 @@
using QSB.Events;
using QSB.Player;
using QSB.SectorSync.WorldObjects;
using QSB.TransformSync;
using QSB.Utility;
using QSB.WorldSync;
using System.Collections.Generic;
@ -22,7 +21,7 @@ namespace QSB.SectorSync
public void Invoke()
{
QSBPlayerManager.GetSyncObjects<PlayerObjectTransformSync>()
QSBPlayerManager.GetSyncObjects<TransformSync.TransformSync>()
.Where(x => x.HasAuthority).ToList().ForEach(CheckTransformSyncSector);
}
@ -55,7 +54,7 @@ namespace QSB.SectorSync
IsReady = QSBWorldSync.GetWorldObjects<QSBSector>().Any();
}
private void CheckTransformSyncSector(PlayerObjectTransformSync transformSync)
private void CheckTransformSyncSector(TransformSync.TransformSync transformSync)
{
var syncedTransform = transformSync.SyncedTransform;
if (syncedTransform == null || syncedTransform.position == Vector3.zero)

View File

@ -6,7 +6,7 @@ using UnityEngine;
namespace QSB.TransformSync
{
public class PlayerCameraSync : PlayerObjectTransformSync
public class PlayerCameraSync : TransformSync
{
protected override Transform InitLocalTransform()
{

View File

@ -6,7 +6,7 @@ using UnityEngine;
namespace QSB.TransformSync
{
public class PlayerProbeSync : PlayerObjectTransformSync
public class PlayerProbeSync : TransformSync
{
private Transform _disabledSocket;

View File

@ -5,7 +5,7 @@ using UnityEngine;
namespace QSB.TransformSync
{
public class PlayerTransformSync : PlayerObjectTransformSync
public class PlayerTransformSync : TransformSync
{
public static PlayerTransformSync LocalInstance { get; private set; }

View File

@ -1,11 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace QSB.TransformSync.RigidbodyTransformSync
{
class RigidbodyTransformSync
{
}
}

View File

@ -7,7 +7,7 @@ using UnityEngine;
namespace QSB.TransformSync
{
internal class RoastingStickTransformSync : PlayerObjectTransformSync
internal class RoastingStickTransformSync : TransformSync
{
private Transform _stickTip;
private Transform _networkStickTip => gameObject.transform.GetChild(0);

View File

@ -3,7 +3,7 @@ using UnityEngine;
namespace QSB.TransformSync
{
public class ShipTransformSync : PlayerObjectTransformSync
public class ShipTransformSync : TransformSync
{
private Transform GetShipModel() => Locator.GetShipTransform();

View File

@ -7,7 +7,7 @@ using UnityEngine;
namespace QSB.TransformSync
{
public abstract class PlayerObjectTransformSync : PlayerSyncObject
public abstract class TransformSync : PlayerSyncObject
{
public abstract bool IsReady { get; }