Update Bukkit to Minecraft 1.4.6

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bukkit</groupId>
     <artifactId>bukkit</artifactId>
-    <version>1.4.5-R1.1-SNAPSHOT</version>
+    <version>1.4.6-R0.1-SNAPSHOT</version>
     <name>Bukkit</name>
     <url>http://www.bukkit.org</url>
 

src/main/java/org/bukkit/Material.java

@@ -5,7 +5,53 @@ import java.util.Map;
 
 import org.apache.commons.lang.Validate;
 import org.bukkit.map.MapView;
-import org.bukkit.material.*;
+import org.bukkit.material.Bed;
+import org.bukkit.material.Button;
+import org.bukkit.material.Cake;
+import org.bukkit.material.Cauldron;
+import org.bukkit.material.Chest;
+import org.bukkit.material.Coal;
+import org.bukkit.material.CocoaPlant;
+import org.bukkit.material.Command;
+import org.bukkit.material.Crops;
+import org.bukkit.material.DetectorRail;
+import org.bukkit.material.Diode;
+import org.bukkit.material.Dispenser;
+import org.bukkit.material.Door;
+import org.bukkit.material.Dye;
+import org.bukkit.material.EnderChest;
+import org.bukkit.material.FlowerPot;
+import org.bukkit.material.Furnace;
+import org.bukkit.material.Gate;
+import org.bukkit.material.Ladder;
+import org.bukkit.material.Lever;
+import org.bukkit.material.LongGrass;
+import org.bukkit.material.MaterialData;
+import org.bukkit.material.MonsterEggs;
+import org.bukkit.material.Mushroom;
+import org.bukkit.material.PistonBaseMaterial;
+import org.bukkit.material.PistonExtensionMaterial;
+import org.bukkit.material.PoweredRail;
+import org.bukkit.material.PressurePlate;
+import org.bukkit.material.Pumpkin;
+import org.bukkit.material.Rails;
+import org.bukkit.material.RedstoneTorch;
+import org.bukkit.material.RedstoneWire;
+import org.bukkit.material.Sandstone;
+import org.bukkit.material.Sign;
+import org.bukkit.material.Skull;
+import org.bukkit.material.SmoothBrick;
+import org.bukkit.material.SpawnEgg;
+import org.bukkit.material.Stairs;
+import org.bukkit.material.Step;
+import org.bukkit.material.Torch;
+import org.bukkit.material.TrapDoor;
+import org.bukkit.material.Tree;
+import org.bukkit.material.Tripwire;
+import org.bukkit.material.TripwireHook;
+import org.bukkit.material.Vine;
+import org.bukkit.material.WoodenStep;
+import org.bukkit.material.Wool;
 import org.bukkit.potion.Potion;
 import org.bukkit.util.Java15Compat;
 
@@ -313,6 +359,9 @@ public enum Material {
     CARROT_STICK(398, 1, 25),
     NETHER_STAR(399),
     PUMPKIN_PIE(400),
+    FIREWORK(401),
+    FIREWORK_CHARGE(402),
+    ENCHANTED_BOOK(403, 1),
     GOLD_RECORD(2256, 1),
     GREEN_RECORD(2257, 1),
     RECORD_3(2258, 1),

src/main/java/org/bukkit/enchantments/Enchantment.java

@@ -2,6 +2,7 @@ package org.bukkit.enchantments;
 
 import java.util.HashMap;
 import java.util.Map;
+
 import org.bukkit.command.defaults.EnchantCommand;
 import org.bukkit.inventory.ItemStack;
 
@@ -44,6 +45,11 @@ public abstract class Enchantment {
      */
     public static final Enchantment WATER_WORKER = new EnchantmentWrapper(6);
 
+    /**
+     * Damages the attacker
+     */
+    public static final Enchantment THORNS = new EnchantmentWrapper(7);
+
     /**
      * Increases damage against all targets
      */

src/main/java/org/bukkit/entity/EntityType.java

@@ -22,6 +22,7 @@ public enum EntityType {
     WITHER_SKULL("WitherSkull", WitherSkull.class, 19),
     PRIMED_TNT("PrimedTnt", TNTPrimed.class, 20),
     FALLING_BLOCK("FallingSand", FallingBlock.class, 21, false),
+    FIREWORK("FireworksRocketEntity", Firework.class, 22, false),
     MINECART("Minecart", Minecart.class, 40),
     BOAT("Boat", Boat.class, 41),
     CREEPER("Creeper", Creeper.class, 50),

src/main/java/org/bukkit/entity/Firework.java

@@ -0,0 +1,5 @@
+package org.bukkit.entity;
+
+public interface Firework extends Entity {
+
+}

src/main/java/org/bukkit/inventory/meta/FireworkMeta.java

@@ -0,0 +1,10 @@
+package org.bukkit.inventory.meta;
+
+import org.bukkit.Material;
+
+/**
+ * Represents a {@link Material#FIREWORK} and its effects.
+ */
+public interface FireworkMeta extends ItemMeta {
+    
+}