Moved itemstack.type to material

3 files changed, 26 insertions, 216 deletions

diff --git a/src/org/bukkit/Block.java b/src/org/bukkit/Block.java
index 9dcd7204..0c32c321 100644
--- a/src/org/bukkit/Block.java
+++ b/src/org/bukkit/Block.java
@@ -18,7 +18,7 @@ public interface Block {
      * @param face Face of this block to return
      * @return Block at the given face
      */
-    Block getFace(final BlockFace face);
+    Block getFace(BlockFace face);
 
     /**
      * Gets the block at the given offsets
@@ -28,14 +28,21 @@ public interface Block {
      * @param modZ Z-coordinate offset
      * @return Block at the given offsets
      */
-    Block getRelative(final int modX, final int modY, final int modZ);
+    Block getRelative(int modX, int modY, int modZ);
+
+    /**
+     * Gets the type of this block
+     *
+     * @return block type
+     */
+    Material getType();
 
     /**
      * Gets the type-ID of this block
      *
      * @return block type-ID
      */
-    int getType();
+    int getTypeID();
 
     /**
      * Gets the world which contains this Block
@@ -77,12 +84,19 @@ public interface Block {
      *
      * @param data New block specific metadata
      */
-    void setData(final byte data);
+    void setData(byte data);
+
+    /**
+     * Sets the type of this block
+     *
+     * @param type Material to change this block to
+     */
+    void setType(Material type);
 
     /**
      * Sets the type-ID of this block
      *
      * @param type Type-ID to change this block to
      */
-    void setType(final int type);
+    void setTypeID(int type);
 }
diff --git a/src/org/bukkit/ItemStack.java b/src/org/bukkit/ItemStack.java
index 1edf367c..2ca42274 100644
--- a/src/org/bukkit/ItemStack.java
+++ b/src/org/bukkit/ItemStack.java
@@ -1,9 +1,6 @@
 
 package org.bukkit;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Represents a stack of items
  */
@@ -15,7 +12,7 @@ public class ItemStack {
         this.type = type;
     }
 
-    public ItemStack(final Type type) {
+    public ItemStack(final Material type) {
         this(type.getID());
     }
 
@@ -24,7 +21,7 @@ public class ItemStack {
         this.amount = amount;
     }
 
-    public ItemStack(final Type type, final int amount) {
+    public ItemStack(final Material type, final int amount) {
         this(type.getID(), amount);
     }
 
@@ -33,8 +30,8 @@ public class ItemStack {
      *
      * @return Type of the items in this stack
      */
-    public Type getType() {
-        return Type.getType(type);
+    public Material getType() {
+        return Material.getMaterial(type);
     }
 
     /**
@@ -42,7 +39,7 @@ public class ItemStack {
      *
      * @param type New type to set the items in this stack to
      */
-    public void setType(Type type) {
+    public void setType(Material type) {
         this.type = type.getID();
     }
 
@@ -81,205 +78,4 @@ public class ItemStack {
     public void setAmount(int amount) {
         this.amount = amount;
     }
-
-    /**
-     * An enum of all type IDs accepted by the official server + client
-     */
-    public enum Type {
-        Air (0),
-        Stone (1),
-        Grass(2),
-        Dirt(3),
-        Cobblestone(4),
-        Wood(5),
-        Sapling(6),
-        Bedrock(7),
-        Water(8),
-        StationaryWater(9),
-        Lava(10),
-        StationaryLava(11),
-        Sand(12),
-        Gravel(13),
-        GoldOre(14),
-        IronOre(15),
-        CoalOre(16),
-        Log(17),
-        Leaves(18),
-        Sponge(19),
-        Glass(20),
-        Cloth(35),
-        YellowFlower(37),
-        RedRose(38),
-        BrownMushroom(39),
-        RedMushroom(40),
-        GoldBlock(41),
-        IronBlock(42),
-        DoubleStep(43),
-        Step(44),
-        Brick(45),
-        TNT(46),
-        BookShelf(47),
-        MossyCobblestone(48),
-        Obsidian(49),
-        Torch(50),
-        Fire(51),
-        MobSpawner(52),
-        WoodStairs(53),
-        Chest(54),
-        RedstoneWire(55),
-        DiamondOre(56),
-        DiamondBlock(57),
-        Workbench(58),
-        Crops(59),
-        Soil(60),
-        Furnace(61),
-        BurningFurnace(62),
-        SignPost(63),
-        WoodenDoor(64),
-        Ladder(65),
-        Rails(66),
-        CobblestoneStairs(67),
-        WallSign(68),
-        Lever(69),
-        StonePlate(70),
-        IronDoorBlock(71),
-        WoodPlate(72),
-        RedstoneOre(73),
-        GlowingRedstoneOre(74),
-        RedstoneTorchOff(75),
-        RedstoneTorchOn(76),
-        StoneButton(77),
-        Snow(78),
-        Ice(79),
-        SnowBlock(80),
-        Cactus(81),
-        Clay(82),
-        ReedBlock(83),
-        Jukebox(84),
-        Fence(85),
-        Pumpkin(86),
-        Netherstone(87),
-        SlowSand(88),
-        LightStone(89),
-        Portal(90),
-        JackOLantern(91),
-        IronSpade(256),
-        IronPickaxe(257),
-        IronAxe(258),
-        FlintAndSteel(259),
-        Apple(260),
-        Bow(261),
-        Arrow(262),
-        Coal(263),
-        Diamond(264),
-        IronIngot(265),
-        GoldIngot(266),
-        IronSword(267),
-        WoodSword(268),
-        WoodSpade(269),
-        WoodPickaxe(270),
-        WoodAxe(271),
-        StoneSword(272),
-        StoneSpade(273),
-        StonePickaxe(274),
-        StoneAxe(275),
-        DiamondSword(276),
-        DiamondSpade(277),
-        DiamondPickaxe(278),
-        DiamondAxe(279),
-        Stick(280),
-        Bowl(281),
-        MushroomSoup(282),
-        GoldSword(283),
-        GoldSpade(284),
-        GoldPickaxe(285),
-        GoldAxe(286),
-        String(287),
-        Feather(288),
-        Gunpowder(289),
-        WoodHoe(290),
-        StoneHoe(291),
-        IronHoe(292),
-        DiamondHoe(293),
-        GoldHoe(294),
-        Seeds(295),
-        Wheat(296),
-        Bread(297),
-        LeatherHelmet(298),
-        LeatherChestplate(299),
-        LeatherLeggings(300),
-        LeatherBoots(301),
-        ChainmailHelmet(302),
-        ChainmailChestplate(303),
-        ChainmailLeggings(304),
-        ChainmailBoots(305),
-        IronHelmet(306),
-        IronChestplate(307),
-        IronLeggings(308),
-        IronBoots(309),
-        DiamondHelmet(310),
-        DiamondChestplate(311),
-        DiamondLeggings(312),
-        DiamondBoots(313),
-        GoldHelmet(314),
-        GoldChestplate(315),
-        GoldLeggings(316),
-        GoldBoots(317),
-        Flint(318),
-        Pork(319),
-        GrilledPork(320),
-        Painting(321),
-        GoldenApple(322),
-        Sign(323),
-        WoodDoor(324),
-        Bucket(325),
-        WaterBucket(326),
-        LavaBucket(327),
-        Minecart(328),
-        Saddle(329),
-        IronDoor(330),
-        RedStone(331),
-        SnowBall(332),
-        Boat(333),
-        Leather(334),
-        MilkBucket(335),
-        ClayBrick(336),
-        ClayBall(337),
-        Reed(338),
-        Paper(339),
-        Book(340),
-        SlimeBall(341),
-        StorageMinecart(342),
-        PoweredMinecart(343),
-        Egg(344),
-        Compass(345),
-        FishingRod(346),
-        Watch(347),
-        LightstoneDust(348),
-        RawFish(349),
-        CookedFish(350),
-        GoldRecord(2256),
-        GreenRecord(2257);
-
-        private final int id;
-        private final static Map<Integer, Type> lookup = new HashMap<Integer, Type>();
-
-        private Type(final int id) {
-            this.id = id;
-        }
-
-        public int getID() {
-            return id;
-        }
-        
-        public static Type getType(final int id) {
-            return lookup.get(id);
-        }
-
-        static {
-            for (Type type : values()) {
-                lookup.put(type.getID(), type);
-            }
-        }
-    }
 }
diff --git a/src/org/bukkit/event/block/BlockPhysicsEvent.java b/src/org/bukkit/event/block/BlockPhysicsEvent.java
index d42f2151..f47416e7 100644
--- a/src/org/bukkit/event/block/BlockPhysicsEvent.java
+++ b/src/org/bukkit/event/block/BlockPhysicsEvent.java
@@ -32,8 +32,8 @@ public class BlockPhysicsEvent extends BlockEvent {
      *
      * @return Changed block's type
      */
-    public ItemStack.Type getChangedType() {
-        return ItemStack.Type.getType(changed); // TODO: Move type to its own file
+    public Material getChangedType() {
+        return Material.getType(changed); // TODO: Move type to its own file
     }
 
     /**