mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-06 00:39:55 +00:00
Code Issues Projects Releases Wiki Activity

rename IWorldObject.ReturnObject to AttachedObject

Browse Source
This commit is contained in:
JohnCorby 2022-01-26 00:55:47 -08:00
parent 8fbc946252
commit 503c0b85cc
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
QSB/ItemSync/WorldObjects/Sockets/QSBOWItemDoubleSocket.cs
View File

@ -17,7 +17,7 @@ namespace QSB.ItemSync.WorldObjects.Sockets
=> AttachedObject.IsSocketOccupied(); => AttachedObject.IsSocketOccupied();
public virtual bool PlaceIntoSocket(IQSBOWItem item) public virtual bool PlaceIntoSocket(IQSBOWItem item)
=> AttachedObject.PlaceIntoSocket((OWItem)item.ReturnObject()); => AttachedObject.PlaceIntoSocket((OWItem)item.AttachedObject);
public virtual IQSBOWItem RemoveFromSocket() public virtual IQSBOWItem RemoveFromSocket()
=> AttachedObject.RemoveFromSocket().GetWorldObject<IQSBOWItem>(); => AttachedObject.RemoveFromSocket().GetWorldObject<IQSBOWItem>();

2
QSB/ItemSync/WorldObjects/Sockets/QSBOWItemSocket.cs
View File

@ -17,7 +17,7 @@ namespace QSB.ItemSync.WorldObjects.Sockets
=> AttachedObject.IsSocketOccupied(); => AttachedObject.IsSocketOccupied();
public virtual bool PlaceIntoSocket(IQSBOWItem item) public virtual bool PlaceIntoSocket(IQSBOWItem item)
=> AttachedObject.PlaceIntoSocket((OWItem)item.ReturnObject()); => AttachedObject.PlaceIntoSocket((OWItem)item.AttachedObject);
public virtual IQSBOWItem RemoveFromSocket() public virtual IQSBOWItem RemoveFromSocket()
=> AttachedObject.RemoveFromSocket().GetWorldObject<IQSBOWItem>(); => AttachedObject.RemoveFromSocket().GetWorldObject<IQSBOWItem>();

6
QSB/Utility/DebugGUI.cs
View File

@ -258,14 +258,14 @@ namespace QSB.Utility
foreach (var obj in QSBWorldSync.GetWorldObjects()) foreach (var obj in QSBWorldSync.GetWorldObjects())
{ {
if (obj.ReturnObject() == null) if (obj.AttachedObject == null)
{ {
return; return;
} }
if (obj.ShouldDisplayDebug()) if (obj.ShouldDisplayDebug())
{ {
DrawLabel(obj.ReturnObject().transform, obj.ReturnLabel()); DrawLabel(obj.AttachedObject.transform, obj.ReturnLabel());
} }
} }
} }
@ -279,7 +279,7 @@ namespace QSB.Utility
foreach (var obj in QSBWorldSync.GetWorldObjects()) foreach (var obj in QSBWorldSync.GetWorldObjects())
{ {
if (obj.ReturnObject() == null) if (obj.AttachedObject == null)
{ {
return; return;
} }

2
QSB/WorldSync/IWorldObject.cs
View File

@ -6,9 +6,9 @@ namespace QSB.WorldSync
{ {
int ObjectId { get; } int ObjectId { get; }
string Name { get; } string Name { get; }
MonoBehaviour AttachedObject { get; }
void OnRemoval(); void OnRemoval();
MonoBehaviour ReturnObject();
bool ShouldDisplayDebug(); bool ShouldDisplayDebug();
string ReturnLabel(); string ReturnLabel();
void DisplayLines(); void DisplayLines();

2
QSB/WorldSync/WorldObject.cs
View File

@ -6,13 +6,13 @@ namespace QSB.WorldSync
where T : MonoBehaviour where T : MonoBehaviour
{ {
public int ObjectId { get; init; } public int ObjectId { get; init; }
MonoBehaviour IWorldObject.AttachedObject => AttachedObject;
public T AttachedObject { get; init; } public T AttachedObject { get; init; }
public string Name => AttachedObject ? AttachedObject.name : "<NullObject!>"; public string Name => AttachedObject ? AttachedObject.name : "<NullObject!>";
public override string ToString() => $"{ObjectId}:{GetType().Name} ({Name})"; public override string ToString() => $"{ObjectId}:{GetType().Name} ({Name})";
public virtual void Init() { } public virtual void Init() { }
public virtual void OnRemoval() { } public virtual void OnRemoval() { }
public MonoBehaviour ReturnObject() => AttachedObject;
public virtual bool ShouldDisplayDebug() => QSBWorldSync.AllObjectsReady && AttachedObject && AttachedObject.gameObject.activeInHierarchy; public virtual bool ShouldDisplayDebug() => QSBWorldSync.AllObjectsReady && AttachedObject && AttachedObject.gameObject.activeInHierarchy;
public virtual string ReturnLabel() => ToString(); public virtual string ReturnLabel() => ToString();
public virtual void DisplayLines() { } public virtual void DisplayLines() { }