Merge pull request #176 from necrodoom/patch-14

update files to minecraft 1.4

2 files changed, 391 insertions, 16 deletions

diff --git a/Essentials/src/com/earth2me/essentials/Mob.java b/Essentials/src/com/earth2me/essentials/Mob.java
index 6cef12a7c..346f1d7ef 100644
--- a/Essentials/src/com/earth2me/essentials/Mob.java
+++ b/Essentials/src/com/earth2me/essentials/Mob.java
@@ -38,6 +38,9 @@ public enum Mob
 	SNOWMAN("Snowman", Enemies.FRIENDLY, "", EntityType.SNOWMAN),
 	OCELOT("Ocelot", Enemies.NEUTRAL, EntityType.OCELOT),
 	IRONGOLEM("IronGolem", Enemies.NEUTRAL, EntityType.IRON_GOLEM);
+	WITHER("Wither", Enemies.ENEMY, EntityType.WITHER);
+	BAT("Bat", Enemies.NEUTRAL, EntityType.BAT);
+	WITCH("Witch", Enemies.ENEMY, EntityType.WITCH);
 	
 	public static final Logger logger = Logger.getLogger("Minecraft");
 
diff --git a/Essentials/src/items.csv b/Essentials/src/items.csv
index da66c0e5c..fdbaca731 100644
--- a/Essentials/src/items.csv
+++ b/Essentials/src/items.csv
@@ -639,19 +639,22 @@ pstick,29,7
 spiderweb,30,0
 sweb,30,0
 web,30,0
-longgrass,31,0
-tallgrass,31,0
-wildgrass,31,0
-grasslong,31,0
-grasstall,31,0
-grasswild,31,0
-lgrass,31,0
-tgrass,31,0
-wgrass,31,0
+longgrass,31,1
+tallgrass,31,1
+wildgrass,31,1
+grasslong,31,1
+grasstall,31,1
+grasswild,31,1
+lgrass,31,1
+tgrass,31,1
+wgrass,31,1
+fern,31,2
+bush,31,2
 deadshrub,32,0
-shrubdead,32,0
 dshrub,32,0
-shrubd,32,0
+deadbush,32,0
+dbush,32,0
+deadsapling,32,0
 normalpistonbase,33,7
 normalpiston,33,7
 normpistonbase,33,7
@@ -826,12 +829,16 @@ rose,38,0
 redflower,38,0
 rflower,38,0
 brownmushroom,39,0
+brownshroom,39,0
 brownmush,39,0
 bmushroom,39,0
+bshroom,39,0
 bmush,39,0
 redmushroom,40,0
+redshroom,40,0
 redmush,40,0
 rmushroom,40,0
+rshroom,40,0
 rmush,40,0
 goldblock,41,0
 blockgold,41,0
@@ -1659,16 +1666,30 @@ circlestonebrick,98,3
 circlestonebb,98,3
 circlestone,98,3
 circlesbb,98,3
+giantredmushroom,99,0
 hugeredmushroom,99,0
 bigredmushroom,99,0
-brmushroom,99,0
-giantredmushroom,99,0
+gredmushroom,99,0
+hredmushroom,99,0
+bredmushroom,99,0
+giantrmushroom,99,0
+hugermushroom,99,0
+bigrmushroom,99,0
 grmushroom,99,0
+hrmushroom,99,0
+brmushroom,99,0
+giantbrownmushroom,100,0
 hugebrownmushroom,100,0
 bigbrownmushroom,100,0
-bbmushroom,100,0
-giantbrownmushroom,100,0
+gbrownmushroom,100,0
+hbrownmushroom,100,0
+bbrownmushroom,100,0
+giantbmushroom,100,0
+hugebmushroom,100,0
+bigbmushroom,100,0
 gbmushroom,100,0
+hbmushroom,100,0
+bbmushroom,100,0
 ironbars,101,0
 ironbarsb,101,0
 ironbarsblock,101,0
@@ -2949,6 +2970,141 @@ forestwoodenstair,136,0
 forestwoodstair,136,0
 forestwstair,136,0
 foreststair,136,0
+commandblock,137,0
+blockcommand,137,0
+cmdblock,137,0
+blockcmd,137,0
+macroblock,137,0
+blockmacro,137,0
+beacon,138,0
+beaconblock,138,0
+cobblestonewall,139,0
+cstonewall,139,0
+cobblewall,139,0
+cobblestonefence,139,0
+cstonefence,139,0
+cobblefence,139,0
+mosscobblestonewall,139,1
+mosscstonewall,139,1
+mosscobblewall,139,1
+mcobblestonewall,139,1
+mcstonewall,139,1
+mcobblewall,139,1
+mosscobblestonefence,139,1
+mosscstonefence,139,1
+mosscobblefence,139,1
+mcobblestonefence,139,1
+mcstonefence,139,1
+mcobblefence,139,1
+emptyflowerpot,140,0
+emptypot,140,0
+flowerpotblock,140,0
+potblock,140,0
+roseflowerpot,140,1
+rosepot,140,1
+dandelionflowerpot,140,2
+dandelionpot,140,2
+oaksaplingflowerpot,140,3
+saplingflowerpot,140,3
+oakflowerpot,140,3
+oaksaplingpot,140,3
+saplingpot,140,3
+oakpot,140,3
+sprucesaplingflowerpot,140,4
+spruceflowerpot,140,4
+darksaplingflowerpot,140,4
+darkflowerpot,140,4
+pinesaplingflowerpot,140,4
+pineflowerpot,140,4
+sprucesaplingpot,140,4
+sprucepot,140,4
+darksaplingpot,140,4
+darkpot,140,4
+pinesaplingpot,140,4
+pinepot,140,4
+birchsaplingflowerpot,140,5
+birchflowerpot,140,5
+lightsaplingflowerpot,140,5
+lightflowerpot,140,5
+whitesaplingflowerpot,140,5
+whiteflowerpot,140,5
+birchsaplingpot,140,5
+birchpot,140,5
+lightsaplingpot,140,5
+lightpot,140,5
+whitesaplingpot,140,5
+whitepot,140,5
+forestsaplingflowerpot,140,6
+forestflowerpot,140,6
+junglesaplingflowerpot,140,6
+jungleflowerpot,140,6
+forestsaplingpot,140,6
+forestpot,140,6
+junglesaplingpot,140,6
+junglepot,140,6
+redmushroomflowerpot,140,7
+redshroomflowerpot,140,7
+redmushflowerpot,140,7
+rmushroomflowerpot,140,7
+rshroomflowerpot,140,7
+rmushflowerpot,140,7
+redmushroompot,140,7
+redshroompot,140,7
+redmushpot,140,7
+rmushroompot,140,7
+rshroompot,140,7
+rmushpot,140,7
+brownmushroomflowerpot,140,8
+brownshroomflowerpot,140,8
+brownmushflowerpot,140,8
+bmushroomflowerpot,140,8
+bshroomflowerpot,140,7
+bmushflowerpot,140,8
+brownmushroompot,140,8
+brownshroompot,140,8
+brownmushpot,140,8
+bmushroompot,140,8
+bshroompot,140,8
+bmushpot,140,8
+cactusflowerpot,140,9
+cactuspot,140,9
+deadbushflowerpot,140,10
+dbushflowerpot,140,10
+deadsaplingflowerpot,140,10
+dsaplingflowerpot,140,10
+deadshrubflowerpot,140,10
+dshrubflowerpot,140,10
+deadbushpot,140,10
+dbushpot,140,10
+deadsaplingpot,140,10
+dsaplingpot,140,10
+deadshrubpot,140,10
+dshrubpot,140,10
+fernflowerpot,140,11
+bushflowerpot,140,11
+fernpot,140,11
+bushpot,140,11
+carrots,141,0
+plantedcarrot,141,0
+plantcarrot,141,0
+growingcarrot,141,0
+potatoes,142,0
+plantedpotato,142,0
+plantpotato,142,0
+growingpotato,142,0
+woodenplankbutton,143,0
+woodplankbutton,143,0
+wplankbutton,143,0
+plankbutton,143,0
+woodenbutton,143,0
+woodbutton,143,0
+wbutton,143,0
+headblock,144,0
+anvil,145,0
+slightlydamagedanvil,145,1
+slightdamageanvil,145,1
+damagedanvil,145,1
+verydamagedanvil,145,2
 ironshovel,256,0
 ironspade,256,0
 ishovel,256,0
@@ -3818,7 +3974,6 @@ dioder,356,0
 diode,356,0
 cookie,357,0
 chart,358,0
-map,358,0
 map0,358,0
 map1,358,1
 map2,358,2
@@ -4074,6 +4229,19 @@ healingpot,373,8197
 healpot,373,8197
 lifepot,373,8197
 hpot,373,8197
+nightvisionpotion,373,8198
+nvisionpotion,373,8198
+nightvpotion,373,8198
+darkvisionpotion,373,8198
+dvisionpotion,373,8198
+darkvpotion,373,8198
+nightvisionpot,373,8198
+nvisionpot,373,8198
+nightvpot,373,8198
+darkvisionpot,373,8198
+dvisionpot,373,8198
+darkvpot,373,8198
+npot,373,8198
 weaknesspotion,373,8200
 weakpotion,373,8200
 weaknesspot,373,8200
@@ -4098,6 +4266,13 @@ harmingpot,373,8204
 damagepot,373,8204
 dmgpot,373,8204
 dpot,373,8204
+invisibilitypotion,373,8206
+invisiblepotion,373,8206
+invpotion,373,8206
+invisibilitypot,373,8206
+invisiblepot,373,8206
+invpot,373,8206
+ipot,373,8206
 regenerationleveliipotion,373,8225
 regenerateleveliipotion,373,8225
 regenleveliipotion,373,8225
@@ -4248,6 +4423,31 @@ acidextendedpot,373,8260
 posionexpot,373,8260
 acidexpot,373,8260
 pepot,373,8260
+nightvisionextendedpotion,373,8262
+nvisionextendedpotion,373,8262
+nightvextendedpotion,373,8262
+darkvisionextendedpotion,373,8262
+dvisionextendedpotion,373,8262
+darkvextendedpotion,373,8262
+nightvisionexpotion,373,8262
+nvisionexpotion,373,8262
+nightvexpotion,373,8262
+darkvisionexpotion,373,8262
+dvisionexpotion,373,8262
+darkvexpotion,373,8262
+nightvisionextendedpot,373,8262
+nvisionextendedpot,373,8262
+nightvextendedpot,373,8262
+darkvisionextendedpot,373,8262
+dvisionextendedpot,373,8262
+darkvextendedpot,373,8262
+nightvisionexpot,373,8262
+nvisionexpot,373,8262
+nightvexpot,373,8262
+darkvisionexpot,373,8262
+dvisionexpot,373,8262
+darkvexpot,373,8262
+nepot,373,8262
 weaknessextendedpotion,373,8264
 weakextendedpotion,373,8264
 weaknessexpotion,373,8264
@@ -4279,6 +4479,19 @@ slowextenedpot,373,8266
 slownessexpot,373,8266
 slowexpot,373,8266
 slepot,373,8266
+invisibilityextendedpotion,373,8270
+invisibleextendedpotion,373,8270
+invextendedpotion,373,8270
+invisibilityexpotion,373,8270
+invisibleexpotion,373,8270
+invexpotion,373,8270
+invisibilityextendedpot,373,8270
+invisibleextendedpot,373,8270
+invextendedpot,373,8270
+invisibilityexpot,373,8270
+invisibleexpot,373,8270
+invexpot,373,8270
+iepot,373,8270
 regenerationdualbitpotion,373,8289
 regeneratedualbitpotion,373,8289
 regendualbitpotion,373,8289
@@ -4397,6 +4610,31 @@ splashclearpotion,373,16390
 splashclearpot,373,16390
 splclearpotion,373,16390
 splclearpot,373,16390
+splashnightvisionpotion,373,16390
+splashnvisionpotion,373,16390
+splashnightvpotion,373,16390
+splashdarkvisionpotion,373,16390
+splashdvisionpotion,373,16390
+splashdarkvpotion,373,16390
+splashnightvisionpot,373,16390
+splashnvisionpot,373,16390
+splashnightvpot,373,16390
+splashdarkvisionpot,373,16390
+splashdvisionpot,373,16390
+splashdarkvpot,373,16390
+splnightvisionpotion,373,16390
+splnvisionpotion,373,16390
+splnightvpotion,373,16390
+spldarkvisionpotion,373,16390
+spldvisionpotion,373,16390
+spldarkvpotion,373,16390
+splnightvisionpot,373,16390
+splnvisionpot,373,16390
+splnightvpot,373,16390
+spldarkvisionpot,373,16390
+spldvisionpot,373,16390
+spldarkvpot,373,16390
+spnpot,373,16390
 splashclearextendedpotion,373,16391
 splashclearexpotion,373,16391
 splashclear2potion,373,16391
@@ -4465,6 +4703,19 @@ splashthinpotion,373,16398
 splashthinpot,373,16398
 splthinpotion,373,16398
 splthinpot,373,16398
+splashinvisibilitypotion,373,16398
+splashinvisiblepotion,373,16398
+splashinvpotion,373,16398
+splashinvisibilitypot,373,16398
+splashinvisiblepot,373,16398
+splashinvpot,373,16398
+splinvisibilitypotion,373,16398
+splinvisiblepotion,373,16398
+splinvpotion,373,16398
+splinvisibilitypot,373,16398
+splinvisiblepot,373,16398
+splinvpot,373,16398
+spipot,373,16398
 splashthinextendedpotion,373,16399
 splashthinexpotion,373,16399
 splashthin2potion,373,16399
@@ -4911,6 +5162,55 @@ splacidextendedpot,373,16452
 splposionexpot,373,16452
 splacidexpot,373,16452
 sppepot,373,16452
+splashnightvisionextendedpotion,373,16454
+splashnvisionextendedpotion,373,16454
+splashnightvextendedpotion,373,16454
+splashdarkvisionextendedpotion,373,16454
+splashdvisionextendedpotion,373,16454
+splashdarkvextendedpotion,373,16454
+splashnightvisionextendedpot,373,16454
+splashnvisionextendedpot,373,16454
+splashnightvextendedpot,373,16454
+splashdarkvisionextendedpot,373,16454
+splashdvisionextendedpot,373,16454
+splashdarkvextendedpot,373,16454
+splashnightvisionexpotion,373,16454
+splashnvisionexpotion,373,16454
+splashnightvexpotion,373,16454
+splashdarkvisionexpotion,373,16454
+splashdvisionexpotion,373,16454
+splashdarkvexpotion,373,16454
+splashnightvisionexpot,373,16454
+splashnvisionexpot,373,16454
+splashnightvexpot,373,16454
+splashdarkvisionexpot,373,16454
+splashdvisionexpot,373,16454
+splashdarkvexpot,373,16454
+splnightvisionextendedpotion,373,16454
+splnvisionextendedpotion,373,16454
+splnightvextendedpotion,373,16454
+spldarkvisionextendedpotion,373,16454
+spldvisionextendedpotion,373,16454
+spldarkvextendedpotion,373,16454
+splnightvisionextendedpot,373,16454
+splnvisionextendedpot,373,16454
+splnightvextendedpot,373,16454
+spldarkvisionextendedpot,373,16454
+spldvisionextendedpot,373,16454
+spldarkvextendedpot,373,16454
+splnightvisionexpotion,373,16454
+splnvisionexpotion,373,16454
+splnightvexpotion,373,16454
+spldarkvisionexpotion,373,16454
+spldvisionexpotion,373,16454
+spldarkvexpotion,373,16454
+splnightvisionexpot,373,16454
+splnvisionexpot,373,16454
+splnightvexpot,373,16454
+spldarkvisionexpot,373,16454
+spldvisionexpot,373,16454
+spldarkvexpot,373,16454
+spnepot,373,16454
 splashweaknessextendedpotion,373,16456
 splashweakextendedpotion,373,16456
 splashweaknessexpotion,373,16456
@@ -4970,6 +5270,31 @@ splslowextenedpot,373,16458
 splslownessexpot,373,16458
 splslowexpot,373,16458
 spslepot,373,16458
+splashinvisibilityextendedpotion,373,16462
+splashinvisibleextendedpotion,373,16462
+splashinvextendedpotion,373,16462
+splashinvisibilityextendedpot,373,16462
+splashinvisibleextendedpot,373,16462
+splashinvextendedpot,373,16462
+splashinvisibilityexpotion,373,16462
+splashinvisibleexpotion,373,16462
+splashinvexpotion,373,16462
+splashinvisibilityexpot,373,16462
+splashinvisibleexpot,373,16462
+splashinvexpot,373,16462
+splinvisibilityextendedpotion,373,16462
+splinvisibleextendedpotion,373,16462
+splinvextendedpotion,373,16462
+splinvisibilityextendedpot,373,16462
+splinvisibleextendedpot,373,16462
+splinvextendedpot,373,16462
+splinvisibilityexpotion,373,16462
+splinvisibleexpotion,373,16462
+splinvexpotion,373,16462
+splinvisibilityexpot,373,16462
+splinvisibleexpot,373,16462
+splinvexpot,373,16462
+spiepot,373,16462
 splashregenerationdualbitpotion,373,16481
 splashregeneratedualbitpotion,373,16481
 splashregendualbitpotion,373,16481
@@ -5242,6 +5567,53 @@ sealedbook,387,0
 diary,387,0
 ownedbook,387,0
 emerald,388,0
+itemframe,389,0
+pictureframe,389,0
+iframe,389,0
+pframe,389,0
+flowerpot,390,0
+pot,390,0
+carrot,391,0
+potato,392,0
+bakedpotato,393,0
+roastedpotato,393,0
+cookedpotato,393,0
+bakepotato,393,0
+roastpotato,393,0
+cookpotato,393,0
+posionouspotato,394,0
+posionpotato,394,0
+emptymap,395,0
+map,395,0
+goldencarrot,396,0
+goldcarrot,396,0
+gcarrot,396,0
+head,397,0
+skeletonhead,397,0
+headskeleton,397,0
+witherhead,397,1
+witherskeletonhead,397,1
+wskeletionhead,397,1
+headwither,397,1
+headwitherskeleton,397,1
+headwskeletion,397,1
+zombiehead,397,2
+headzombie,397,2
+humanhead,397,3
+stevehead,397,3
+headhuman,397,3
+headsteve,397,3
+creeperhead,397,4
+headcreeper,397,4
+carrotonastick,398,0
+carrotonstick,398,0
+netherstar,399,0
+hellstar,399,0
+pumpkinpie,400,0
+pumpkincake,400,0
+ppie,400,0
+pcake,400,0
+pie,400,0
 goldmusicrecord,2256,0
 goldmusicdisk,2256,0
 goldmusicdisc,2256,0