diff --git a/QSB/Animation/NPC/WorldObjects/INpcAnimController.cs b/QSB/Animation/NPC/WorldObjects/INpcAnimController.cs index 1449d417..807adf7c 100644 --- a/QSB/Animation/NPC/WorldObjects/INpcAnimController.cs +++ b/QSB/Animation/NPC/WorldObjects/INpcAnimController.cs @@ -2,7 +2,7 @@ namespace QSB.Animation.NPC.WorldObjects { - public interface INpcAnimController : IWorldObjectTypeSubset + public interface INpcAnimController : IWorldObject { CharacterDialogueTree GetDialogueTree(); void StartConversation(); diff --git a/QSB/ItemSync/WorldObjects/Items/IQSBOWItem.cs b/QSB/ItemSync/WorldObjects/Items/IQSBOWItem.cs index 4fc184e0..035d43c2 100644 --- a/QSB/ItemSync/WorldObjects/Items/IQSBOWItem.cs +++ b/QSB/ItemSync/WorldObjects/Items/IQSBOWItem.cs @@ -3,7 +3,7 @@ using UnityEngine; namespace QSB.ItemSync.WorldObjects.Items { - public interface IQSBOWItem : IWorldObjectTypeSubset + public interface IQSBOWItem : IWorldObject { ItemType GetItemType(); void SetColliderActivation(bool active); diff --git a/QSB/ItemSync/WorldObjects/Sockets/IQSBOWItemSocket.cs b/QSB/ItemSync/WorldObjects/Sockets/IQSBOWItemSocket.cs index a1cc6887..ba51ec1e 100644 --- a/QSB/ItemSync/WorldObjects/Sockets/IQSBOWItemSocket.cs +++ b/QSB/ItemSync/WorldObjects/Sockets/IQSBOWItemSocket.cs @@ -3,7 +3,7 @@ using QSB.WorldSync; namespace QSB.ItemSync.WorldObjects.Sockets { - public interface IQSBOWItemSocket : IWorldObjectTypeSubset + public interface IQSBOWItemSocket : IWorldObject { bool AcceptsItem(IQSBOWItem item); bool IsSocketOccupied(); diff --git a/QSB/QuantumSync/WorldObjects/IQSBQuantumObject.cs b/QSB/QuantumSync/WorldObjects/IQSBQuantumObject.cs index 8d314a44..3d38c3f9 100644 --- a/QSB/QuantumSync/WorldObjects/IQSBQuantumObject.cs +++ b/QSB/QuantumSync/WorldObjects/IQSBQuantumObject.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace QSB.QuantumSync { - public interface IQSBQuantumObject : IWorldObjectTypeSubset + public interface IQSBQuantumObject : IWorldObject { uint ControllingPlayer { get; set; } bool IsEnabled { get; set; } diff --git a/QSB/WorldSync/IWorldObjectTypeSubset.cs b/QSB/WorldSync/IWorldObjectTypeSubset.cs deleted file mode 100644 index 02d47c27..00000000 --- a/QSB/WorldSync/IWorldObjectTypeSubset.cs +++ /dev/null @@ -1,4 +0,0 @@ -namespace QSB.WorldSync -{ - public interface IWorldObjectTypeSubset : IWorldObject { } -} diff --git a/QSB/WorldSync/QSBWorldSync.cs b/QSB/WorldSync/QSBWorldSync.cs index bc628ae2..124563f3 100644 --- a/QSB/WorldSync/QSBWorldSync.cs +++ b/QSB/WorldSync/QSBWorldSync.cs @@ -70,18 +70,6 @@ namespace QSB.WorldSync where TWorldObject : IWorldObject => GetWorldFromUnity(unityObject).ObjectId; - public static int GetIdFromTypeSubset(TTypeSubset typeSubset) - where TTypeSubset : IWorldObjectTypeSubset - { - var index = GetWorldObjects().ToList().IndexOf(typeSubset); - if (index == -1) - { - DebugLog.ToConsole($"Warning - {typeSubset.Name} doesn't exist in list of {typeof(TTypeSubset).Name} !", MessageType.Warning); - } - - return index; - } - public static void RemoveWorldObjects() where TWorldObject : IWorldObject {