From d8188064116912fb3fdde7b99bb8b65084f1f061 Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Wed, 9 Nov 2011 22:00:09 -0500 Subject: [PATCH] A bunch of entity types needed the new keyword on their static TypeId properties. --- SubstrateCS/Source/Entities/EntityBlaze.cs | 2 +- SubstrateCS/Source/Entities/EntityCaveSpider.cs | 2 +- SubstrateCS/Source/Entities/EntityChicken.cs | 2 +- SubstrateCS/Source/Entities/EntityCow.cs | 2 +- SubstrateCS/Source/Entities/EntityCreeper.cs | 2 +- SubstrateCS/Source/Entities/EntityEnderDragon.cs | 2 +- SubstrateCS/Source/Entities/EntityEnderman.cs | 2 +- SubstrateCS/Source/Entities/EntityGhast.cs | 2 +- SubstrateCS/Source/Entities/EntityGiant.cs | 2 +- SubstrateCS/Source/Entities/EntityMagmaCube.cs | 2 +- SubstrateCS/Source/Entities/EntityMinecartChest.cs | 2 +- SubstrateCS/Source/Entities/EntityMinecartFurnace.cs | 2 +- SubstrateCS/Source/Entities/EntityMonster.cs | 2 +- SubstrateCS/Source/Entities/EntityMooshroom.cs | 2 +- SubstrateCS/Source/Entities/EntityPig.cs | 2 +- SubstrateCS/Source/Entities/EntityPigZombie.cs | 2 +- SubstrateCS/Source/Entities/EntitySheep.cs | 2 +- SubstrateCS/Source/Entities/EntitySilverfish.cs | 2 +- SubstrateCS/Source/Entities/EntitySkeleton.cs | 2 +- SubstrateCS/Source/Entities/EntitySlime.cs | 2 +- SubstrateCS/Source/Entities/EntitySmallFireball.cs | 2 +- SubstrateCS/Source/Entities/EntitySnowman.cs | 2 +- SubstrateCS/Source/Entities/EntitySpider.cs | 2 +- SubstrateCS/Source/Entities/EntitySquid.cs | 2 +- SubstrateCS/Source/Entities/EntityVillager.cs | 2 +- SubstrateCS/Source/Entities/EntityWolf.cs | 2 +- SubstrateCS/Source/Entities/EntityZombie.cs | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/SubstrateCS/Source/Entities/EntityBlaze.cs b/SubstrateCS/Source/Entities/EntityBlaze.cs index d5e2294..16e8e80 100644 --- a/SubstrateCS/Source/Entities/EntityBlaze.cs +++ b/SubstrateCS/Source/Entities/EntityBlaze.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Blaze"; } } diff --git a/SubstrateCS/Source/Entities/EntityCaveSpider.cs b/SubstrateCS/Source/Entities/EntityCaveSpider.cs index e856dd6..905c18c 100644 --- a/SubstrateCS/Source/Entities/EntityCaveSpider.cs +++ b/SubstrateCS/Source/Entities/EntityCaveSpider.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "CaveSpider"; } } diff --git a/SubstrateCS/Source/Entities/EntityChicken.cs b/SubstrateCS/Source/Entities/EntityChicken.cs index 6465f2d..325f69c 100644 --- a/SubstrateCS/Source/Entities/EntityChicken.cs +++ b/SubstrateCS/Source/Entities/EntityChicken.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Chicken"; } } diff --git a/SubstrateCS/Source/Entities/EntityCow.cs b/SubstrateCS/Source/Entities/EntityCow.cs index 0c2b37e..12c6ef3 100644 --- a/SubstrateCS/Source/Entities/EntityCow.cs +++ b/SubstrateCS/Source/Entities/EntityCow.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Cow"; } } diff --git a/SubstrateCS/Source/Entities/EntityCreeper.cs b/SubstrateCS/Source/Entities/EntityCreeper.cs index bf80075..00918f6 100644 --- a/SubstrateCS/Source/Entities/EntityCreeper.cs +++ b/SubstrateCS/Source/Entities/EntityCreeper.cs @@ -14,7 +14,7 @@ namespace Substrate.Entities new SchemaNodeScaler("powered", TagType.TAG_BYTE, SchemaOptions.OPTIONAL), }); - public static string TypeId + public static new string TypeId { get { return "Creeper"; } } diff --git a/SubstrateCS/Source/Entities/EntityEnderDragon.cs b/SubstrateCS/Source/Entities/EntityEnderDragon.cs index 24dcd9b..b3d6221 100644 --- a/SubstrateCS/Source/Entities/EntityEnderDragon.cs +++ b/SubstrateCS/Source/Entities/EntityEnderDragon.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "EnderDragon"; } } diff --git a/SubstrateCS/Source/Entities/EntityEnderman.cs b/SubstrateCS/Source/Entities/EntityEnderman.cs index c4becae..40437fa 100644 --- a/SubstrateCS/Source/Entities/EntityEnderman.cs +++ b/SubstrateCS/Source/Entities/EntityEnderman.cs @@ -19,7 +19,7 @@ namespace Substrate.Entities new SchemaNodeScaler("carriedData", TagType.TAG_SHORT, SchemaOptions.CREATE_ON_MISSING), }); - public static string TypeId + public static new string TypeId { get { return "Enderman"; } } diff --git a/SubstrateCS/Source/Entities/EntityGhast.cs b/SubstrateCS/Source/Entities/EntityGhast.cs index ffb1e46..d59a2ce 100644 --- a/SubstrateCS/Source/Entities/EntityGhast.cs +++ b/SubstrateCS/Source/Entities/EntityGhast.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Ghast"; } } diff --git a/SubstrateCS/Source/Entities/EntityGiant.cs b/SubstrateCS/Source/Entities/EntityGiant.cs index 30729de..84c0c6c 100644 --- a/SubstrateCS/Source/Entities/EntityGiant.cs +++ b/SubstrateCS/Source/Entities/EntityGiant.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Giant"; } } diff --git a/SubstrateCS/Source/Entities/EntityMagmaCube.cs b/SubstrateCS/Source/Entities/EntityMagmaCube.cs index b794749..f89b985 100644 --- a/SubstrateCS/Source/Entities/EntityMagmaCube.cs +++ b/SubstrateCS/Source/Entities/EntityMagmaCube.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "LavaSlime"; } } diff --git a/SubstrateCS/Source/Entities/EntityMinecartChest.cs b/SubstrateCS/Source/Entities/EntityMinecartChest.cs index 7c8b8f0..008b27a 100644 --- a/SubstrateCS/Source/Entities/EntityMinecartChest.cs +++ b/SubstrateCS/Source/Entities/EntityMinecartChest.cs @@ -12,7 +12,7 @@ namespace Substrate.Entities new SchemaNodeList("Items", TagType.TAG_COMPOUND, ItemCollection.Schema), }); - public static string TypeId + public static new string TypeId { get { return EntityMinecart.TypeId; } } diff --git a/SubstrateCS/Source/Entities/EntityMinecartFurnace.cs b/SubstrateCS/Source/Entities/EntityMinecartFurnace.cs index 015e574..955ad93 100644 --- a/SubstrateCS/Source/Entities/EntityMinecartFurnace.cs +++ b/SubstrateCS/Source/Entities/EntityMinecartFurnace.cs @@ -15,7 +15,7 @@ namespace Substrate.Entities new SchemaNodeScaler("Fuel", TagType.TAG_SHORT), }); - public static string TypeId + public static new string TypeId { get { return EntityMinecart.TypeId; } } diff --git a/SubstrateCS/Source/Entities/EntityMonster.cs b/SubstrateCS/Source/Entities/EntityMonster.cs index 29733d9..91ad7d1 100644 --- a/SubstrateCS/Source/Entities/EntityMonster.cs +++ b/SubstrateCS/Source/Entities/EntityMonster.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Monster"; } } diff --git a/SubstrateCS/Source/Entities/EntityMooshroom.cs b/SubstrateCS/Source/Entities/EntityMooshroom.cs index bef556f..b9ff6d4 100644 --- a/SubstrateCS/Source/Entities/EntityMooshroom.cs +++ b/SubstrateCS/Source/Entities/EntityMooshroom.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "MushroomCow"; } } diff --git a/SubstrateCS/Source/Entities/EntityPig.cs b/SubstrateCS/Source/Entities/EntityPig.cs index fdb062a..425ad9b 100644 --- a/SubstrateCS/Source/Entities/EntityPig.cs +++ b/SubstrateCS/Source/Entities/EntityPig.cs @@ -14,7 +14,7 @@ namespace Substrate.Entities new SchemaNodeScaler("Saddle", TagType.TAG_BYTE), }); - public static string TypeId + public static new string TypeId { get { return "Pig"; } } diff --git a/SubstrateCS/Source/Entities/EntityPigZombie.cs b/SubstrateCS/Source/Entities/EntityPigZombie.cs index a6f02a0..9cb0884 100644 --- a/SubstrateCS/Source/Entities/EntityPigZombie.cs +++ b/SubstrateCS/Source/Entities/EntityPigZombie.cs @@ -14,7 +14,7 @@ namespace Substrate.Entities new SchemaNodeScaler("Anger", TagType.TAG_SHORT), }); - public static string TypeId + public static new string TypeId { get { return "PigZombie"; } } diff --git a/SubstrateCS/Source/Entities/EntitySheep.cs b/SubstrateCS/Source/Entities/EntitySheep.cs index f042a04..180ab4c 100644 --- a/SubstrateCS/Source/Entities/EntitySheep.cs +++ b/SubstrateCS/Source/Entities/EntitySheep.cs @@ -15,7 +15,7 @@ namespace Substrate.Entities new SchemaNodeScaler("Color", TagType.TAG_BYTE, SchemaOptions.CREATE_ON_MISSING), }); - public static string TypeId + public static new string TypeId { get { return "Sheep"; } } diff --git a/SubstrateCS/Source/Entities/EntitySilverfish.cs b/SubstrateCS/Source/Entities/EntitySilverfish.cs index 149d9c4..62b2e72 100644 --- a/SubstrateCS/Source/Entities/EntitySilverfish.cs +++ b/SubstrateCS/Source/Entities/EntitySilverfish.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Silverfish"; } } diff --git a/SubstrateCS/Source/Entities/EntitySkeleton.cs b/SubstrateCS/Source/Entities/EntitySkeleton.cs index 0600596..98bb7e7 100644 --- a/SubstrateCS/Source/Entities/EntitySkeleton.cs +++ b/SubstrateCS/Source/Entities/EntitySkeleton.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Skeleton"; } } diff --git a/SubstrateCS/Source/Entities/EntitySlime.cs b/SubstrateCS/Source/Entities/EntitySlime.cs index c5cf24d..2dcbcde 100644 --- a/SubstrateCS/Source/Entities/EntitySlime.cs +++ b/SubstrateCS/Source/Entities/EntitySlime.cs @@ -14,7 +14,7 @@ namespace Substrate.Entities new SchemaNodeScaler("Size", TagType.TAG_INT), }); - public static string TypeId + public static new string TypeId { get { return "Slime"; } } diff --git a/SubstrateCS/Source/Entities/EntitySmallFireball.cs b/SubstrateCS/Source/Entities/EntitySmallFireball.cs index d8b2dd7..acaa1dc 100644 --- a/SubstrateCS/Source/Entities/EntitySmallFireball.cs +++ b/SubstrateCS/Source/Entities/EntitySmallFireball.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "SmallFireball"; } } diff --git a/SubstrateCS/Source/Entities/EntitySnowman.cs b/SubstrateCS/Source/Entities/EntitySnowman.cs index e9626ef..2238c53 100644 --- a/SubstrateCS/Source/Entities/EntitySnowman.cs +++ b/SubstrateCS/Source/Entities/EntitySnowman.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "SnowMan"; } } diff --git a/SubstrateCS/Source/Entities/EntitySpider.cs b/SubstrateCS/Source/Entities/EntitySpider.cs index 5f82d78..bb024c4 100644 --- a/SubstrateCS/Source/Entities/EntitySpider.cs +++ b/SubstrateCS/Source/Entities/EntitySpider.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Spider"; } } diff --git a/SubstrateCS/Source/Entities/EntitySquid.cs b/SubstrateCS/Source/Entities/EntitySquid.cs index cdc4f2b..1f78b38 100644 --- a/SubstrateCS/Source/Entities/EntitySquid.cs +++ b/SubstrateCS/Source/Entities/EntitySquid.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Squid"; } } diff --git a/SubstrateCS/Source/Entities/EntityVillager.cs b/SubstrateCS/Source/Entities/EntityVillager.cs index 974a9bc..b4f38fe 100644 --- a/SubstrateCS/Source/Entities/EntityVillager.cs +++ b/SubstrateCS/Source/Entities/EntityVillager.cs @@ -23,7 +23,7 @@ namespace Substrate.Entities new SchemaNodeScaler("Profession", TagType.TAG_INT), }); - public static string TypeId + public static new string TypeId { get { return "Villager"; } } diff --git a/SubstrateCS/Source/Entities/EntityWolf.cs b/SubstrateCS/Source/Entities/EntityWolf.cs index 9a7f01e..345d681 100644 --- a/SubstrateCS/Source/Entities/EntityWolf.cs +++ b/SubstrateCS/Source/Entities/EntityWolf.cs @@ -16,7 +16,7 @@ namespace Substrate.Entities new SchemaNodeScaler("Angry", TagType.TAG_BYTE), }); - public static string TypeId + public static new string TypeId { get { return "Wolf"; } } diff --git a/SubstrateCS/Source/Entities/EntityZombie.cs b/SubstrateCS/Source/Entities/EntityZombie.cs index f0e9a8b..0bff8e8 100644 --- a/SubstrateCS/Source/Entities/EntityZombie.cs +++ b/SubstrateCS/Source/Entities/EntityZombie.cs @@ -13,7 +13,7 @@ namespace Substrate.Entities new SchemaNodeString("id", TypeId), }); - public static string TypeId + public static new string TypeId { get { return "Zombie"; } }