StardewValley
/
Stardew_Valley_Mods
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More netcode updates.

This commit is contained in:
JoshuaNavarro 2019-08-23 14:46:07 -07:00
parent 6d2d31ce23
commit b70b4f1813
3 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
GeneralMods/Revitalize/Framework/Objects/CustomObject.cs
View File

@ -8,6 +8,8 @@ using PyTK.CustomElementHandler;
using StardustCore.Animations; using StardustCore.Animations;
using StardewValley; using StardewValley;
using StardewValley.Objects; using StardewValley.Objects;
using Netcode;
using StardewModdingAPI;
namespace Revitalize.Framework.Objects namespace Revitalize.Framework.Objects
{ {
@ -523,5 +525,13 @@ namespace Revitalize.Framework.Objects
//Load in a file that has all object names referenced here or something. //Load in a file that has all object names referenced here or something.
return this.info.name; return this.info.name;
} }
public virtual void setNetFieldParent(INetSerializable Parent)
{
this.NetFields.Parent = Parent;
IReflectedProperty<INetRoot> p=ModCore.ModHelper.Reflection.GetProperty<INetRoot>(this.NetFields, "Root", true);
p.SetValue(Parent.Root);
}
} }
} }

1
GeneralMods/Revitalize/Framework/Objects/MultiTiledObject.cs
View File

@ -4,6 +4,7 @@ using System.IO;
using System.Text; using System.Text;
using Microsoft.Xna.Framework; using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics; using Microsoft.Xna.Framework.Graphics;
using Netcode;
using Newtonsoft.Json; using Newtonsoft.Json;
using PyTK.CustomElementHandler; using PyTK.CustomElementHandler;
using StardewValley; using StardewValley;

21
GeneralMods/Revitalize/Framework/Utilities/Serialization/Serialization.cs
View File

@ -4,6 +4,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Netcode;
using Newtonsoft.Json; using Newtonsoft.Json;
using Revitalize.Framework.Objects; using Revitalize.Framework.Objects;
using Revitalize.Framework.Objects.Furniture; using Revitalize.Framework.Objects.Furniture;
@ -165,6 +166,10 @@ namespace Revitalize.Framework.Utilities
if (o is Chest && o.Name != "Chest") if (o is Chest && o.Name != "Chest")
{ {
Item I = this.GetItemFromChestName(o.Name); Item I = this.GetItemFromChestName(o.Name);
if (I.NetFields != null)
{
(I as CustomObject).setNetFieldParent(o.NetFields);
}
ModCore.log("Found a custom item in a chest!"); ModCore.log("Found a custom item in a chest!");
toAdd.Add(I); toAdd.Add(I);
toRemove.Add(o); toRemove.Add(o);
@ -190,6 +195,10 @@ namespace Revitalize.Framework.Utilities
if (o is Chest && o.Name != "Chest") if (o is Chest && o.Name != "Chest")
{ {
Item I = this.GetItemFromChestName(o.Name); Item I = this.GetItemFromChestName(o.Name);
if (I.NetFields != null)
{
(I as CustomObject).setNetFieldParent(o.NetFields);
}
toAdd.Add(I); toAdd.Add(I);
toRemove.Add(o); toRemove.Add(o);
} }
@ -208,6 +217,10 @@ namespace Revitalize.Framework.Utilities
{ {
ModCore.log("Found a custom object as a held object!"); ModCore.log("Found a custom object as a held object!");
Item I = this.GetItemFromChestName(c.heldObject.Value.Name); Item I = this.GetItemFromChestName(c.heldObject.Value.Name);
if (I.NetFields != null)
{
(I as CustomObject).setNetFieldParent(c.NetFields);
}
c.heldObject.Value = (StardewValley.Object)I; c.heldObject.Value = (StardewValley.Object)I;
} }
} }
@ -220,6 +233,10 @@ namespace Revitalize.Framework.Utilities
{ {
ModCore.log("Found a custom object as a held object!"); ModCore.log("Found a custom object as a held object!");
Item I = this.GetItemFromChestName(c.heldObject.Value.Name); Item I = this.GetItemFromChestName(c.heldObject.Value.Name);
if (I.NetFields != null)
{
(I as CustomObject).setNetFieldParent(c.NetFields);
}
c.heldObject.Value = (StardewValley.Object)I; c.heldObject.Value = (StardewValley.Object)I;
} }
} }
@ -236,6 +253,10 @@ namespace Revitalize.Framework.Utilities
if (I is Chest && I.Name != "Chest") if (I is Chest && I.Name != "Chest")
{ {
Item ret = this.GetItemFromChestName(I.Name); Item ret = this.GetItemFromChestName(I.Name);
if (I.NetFields != null)
{
(ret as CustomObject).setNetFieldParent(I.NetFields);
}
toAdd2.Add(ret); toAdd2.Add(ret);
toRemove2.Add(I); toRemove2.Add(I);
} }