amethyst/NBTExplorer
1
0
Fork 0
forked from mirrors/NBTExplorer
Code Pull requests Activity

Merge branch 'master' of github.com:jaquadro/Substrate

Browse source
This commit is contained in:
Justin Aquadro 2012-11-04 21:08:57 -05:00
commit 700266615f
3 changed files with 42 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SubstrateCS/Source/TileEntities/TileEntityBeacon.cs
View file

@ -69,7 +69,7 @@ namespace Substrate.TileEntities
public override TileEntity Copy ()
{
return new TileEntityMusic(this);
return new TileEntityBeacon(this);
}
#endregion

2
SubstrateCS/Source/TileEntities/TileEntityControl.cs
View file

@ -51,7 +51,7 @@ namespace Substrate.TileEntities
public override TileEntity Copy ()
{
return new TileEntityMusic(this);
return new TileEntityControl(this);
}
#endregion

41
SubstrateCS/Source/TileEntities/TileEntityMobSpawner.cs
View file

@ -13,6 +13,10 @@ namespace Substrate.TileEntities
new SchemaNodeString("id", TypeId),
new SchemaNodeScaler("EntityId", TagType.TAG_STRING),
new SchemaNodeScaler("Delay", TagType.TAG_SHORT),
new SchemaNodeScaler("MaxSpawnDelay", TagType.TAG_SHORT, SchemaOptions.CREATE_ON_MISSING),
new SchemaNodeScaler("MinSpawnDelay", TagType.TAG_SHORT, SchemaOptions.CREATE_ON_MISSING),
new SchemaNodeScaler("SpawnCount", TagType.TAG_SHORT),
Entity.Schema.MergeInto(new SchemaNodeCompound("SpawnData", SchemaOptions.OPTIONAL))
});
public static string TypeId
@ -22,6 +26,10 @@ namespace Substrate.TileEntities
private short _delay;
private string _entityID;
private short _maxDelay;
private short _minDelay;
private short _spawnCount;
private Entity _spawnData;
public int Delay
{
@ -29,12 +37,36 @@ namespace Substrate.TileEntities
set { _delay = (short)value; }
}
public Entity SpawnData
{
get { return _spawnData; }
set { _spawnData = value; }
}
public string EntityID
{
get { return _entityID; }
set { _entityID = value; }
}
public short MaxSpawnDelay
{
get { return _maxDelay; }
set { _maxDelay = value; }
}
public short MinSpawnDelay
{
get { return _minDelay; }
set { _minDelay = value; }
}
public short SpawnCount
{
get { return _spawnCount; }
set { _spawnCount = value; }
}
protected TileEntityMobSpawner (string id)
: base(id)
{
@ -77,6 +109,10 @@ namespace Substrate.TileEntities
_delay = ctree["Delay"].ToTagShort();
_entityID = ctree["EntityId"].ToTagString();
_maxDelay = ctree["MaxSpawnDelay"].ToTagShort();
_minDelay = ctree["MinSpawnDelay"].ToTagShort();
_spawnCount = ctree["SpawnCount"].ToTagShort();
_spawnData = new Entity().LoadTree(ctree["SpawnData"].ToTagCompound());
return this;
}
@ -86,7 +122,10 @@ namespace Substrate.TileEntities
TagNodeCompound tree = base.BuildTree() as TagNodeCompound;
tree["EntityId"] = new TagNodeString(_entityID);
tree["Delay"] = new TagNodeShort(_delay);
tree["MaxSpawnDelay"] = new TagNodeShort(_maxDelay);
tree["MinSpawnDelay"] = new TagNodeShort(_minDelay);
tree["SpawnCount"] = new TagNodeShort(_spawnCount);
tree["SpawnData"] = _spawnData.BuildTree();
return tree;
}