diff options
| author | snowleo <schneeleo@gmail.com> | 2012-03-02 00:06:57 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-03-02 00:06:57 +0100 |
| commit | bf61edd3bb9e4efec31066e4a162c35b5808419d (patch) | |
| tree | eb99de3490a3c8e0dfc7c242d50457ce69579b51 | |
| parent | 384e41bf41abbd40ffa629478f7089ed5ecfa20e (diff) | |
| download | Essentials-bf61edd3bb9e4efec31066e4a162c35b5808419d.tar Essentials-bf61edd3bb9e4efec31066e4a162c35b5808419d.tar.gz Essentials-bf61edd3bb9e4efec31066e4a162c35b5808419d.tar.lz Essentials-bf61edd3bb9e4efec31066e4a162c35b5808419d.tar.xz Essentials-bf61edd3bb9e4efec31066e4a162c35b5808419d.zip | |
New Entities and Items for 1.2
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Mob.java | 4 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java | 12 | ||||
| -rw-r--r-- | Essentials/src/items.csv | 7 |
3 files changed, 22 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Mob.java b/Essentials/src/com/earth2me/essentials/Mob.java index 7be698950..656ed6bc1 100644 --- a/Essentials/src/com/earth2me/essentials/Mob.java +++ b/Essentials/src/com/earth2me/essentials/Mob.java @@ -38,7 +38,9 @@ public enum Mob BLAZE("Blaze", Enemies.ENEMY, EntityType.BLAZE), MUSHROOMCOW("MushroomCow", Enemies.FRIENDLY, EntityType.MUSHROOM_COW), MAGMACUBE("MagmaCube", Enemies.ENEMY, EntityType.MAGMA_CUBE), - SNOWMAN("Snowman", Enemies.FRIENDLY, "", EntityType.SNOWMAN); + SNOWMAN("Snowman", Enemies.FRIENDLY, "", EntityType.SNOWMAN), + OCELOT("Ocelot", Enemies.NEUTRAL, EntityType.OCELOT), + IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM); public static final Logger logger = Logger.getLogger("Minecraft"); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java index 4971c7922..c793c9ab3 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java @@ -271,5 +271,17 @@ public class Commandspawnmob extends EssentialsCommand { ((Creeper)spawned).setPowered(true); } + if (type == EntityType.OCELOT && data.equalsIgnoreCase("siamese")) + { + ((Ocelot)spawned).setCatType(Ocelot.Type.SIAMESE_CAT); + } + if (type == EntityType.OCELOT && data.equalsIgnoreCase("red")) + { + ((Ocelot)spawned).setCatType(Ocelot.Type.RED_CAT); + } + if (type == EntityType.OCELOT && data.equalsIgnoreCase("black")) + { + ((Ocelot)spawned).setCatType(Ocelot.Type.BLACK_CAT); + } } } diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv index 98c25c327..2c8a65a1e 100644 --- a/Essentials/src/items.csv +++ b/Essentials/src/items.csv @@ -1461,6 +1461,9 @@ dragonegg,122,0 degg,122,0 bossegg,122,0 begg,122,0 +redstonelamp,123,0 +redlamp,123,0 +rslamp,123,0 ironshovel,256,0 ironspade,256,0 ishovel,256,0 @@ -2453,6 +2456,10 @@ wolfegg,383,95 mooshroomegg,383,96 mushroomcowegg,383,96 villageregg,383,120 +bottleofenchanting,384,0 +enchantingbottle,384,0 +expbottle,384,0 +xpbottle,384,0 goldmusicrecord,2256,0 goldmusicdisk,2256,0 goldmusiccd,2256,0 |