diff --git a/src/org/bukkit/Material.java b/src/org/bukkit/Material.java
new file mode 100644
index 00000000..1b6323d7
--- /dev/null
+++ b/src/org/bukkit/Material.java
@@ -0,0 +1,205 @@
+package org.bukkit;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * An enum of all material IDs accepted by the official server + client
+ */
+public enum Material {
+    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 static final Map<Integer, Material> lookup = new HashMap<Integer, Material>();
+
+    private Material(final int id) {
+        this.id = id;
+    }
+
+    public int getID() {
+        return id;
+    }
+
+    public static Material getMaterial(final int id) {
+        return lookup.get(id);
+    }
+
+    static {
+        for (Material material : values()) {
+            lookup.put(material.getID(), material);
+        }
+    }
+}
diff --git a/src/org/bukkit/event/Cancellable.java b/src/org/bukkit/event/Cancellable.java
index 05789dea..985dc1de 100644
--- a/src/org/bukkit/event/Cancellable.java
+++ b/src/org/bukkit/event/Cancellable.java
@@ -1,6 +1,6 @@
-package org.bukkit.event;
-
-public interface Cancellable {
-	public boolean isCancelled();
-	public void setCancelled(boolean cancel);
-}
+package org.bukkit.event;
+
+public interface Cancellable {
+	public boolean isCancelled();
+	public void setCancelled(boolean cancel);
+}
diff --git a/src/org/bukkit/event/block/BlockCanBuildEvent.java b/src/org/bukkit/event/block/BlockCanBuildEvent.java
index 859c8d30..21b22df4 100644
--- a/src/org/bukkit/event/block/BlockCanBuildEvent.java
+++ b/src/org/bukkit/event/block/BlockCanBuildEvent.java
@@ -1,39 +1,39 @@
-/**
- * 
- */
-package org.bukkit.event.block;
-
-import org.bukkit.Block;
-import org.bukkit.event.Cancellable;
-
-/**
- * @author durron597
- */
-public class BlockCanBuildEvent extends BlockEvent implements Cancellable {
-	protected boolean cancel;
-	
-	public BlockCanBuildEvent(Type type, Block block, boolean canBuild) {
-		super(type, block);
-		
-		cancel = canBuild;
-	}
-
-	/**
-	 * Returns whether or not the block can be built here. By default, returns
-	 * Minecraft's answer on whether the block can be built
-	 * 
-	 * @return boolean whether or not the block can be built
-	 */
-	@Override
-	public boolean isCancelled() {
-		return cancel;
-	}
-	
-	/**
-	 * Set whether the block can be built here.
-	 */
-	@Override
-	public void setCancelled(boolean cancel) {
-		this.cancel = cancel;
-	}
-}
+/**
+ * 
+ */
+package org.bukkit.event.block;
+
+import org.bukkit.Block;
+import org.bukkit.event.Cancellable;
+
+/**
+ * @author durron597
+ */
+public class BlockCanBuildEvent extends BlockEvent implements Cancellable {
+	protected boolean cancel;
+	
+	public BlockCanBuildEvent(Type type, Block block, boolean canBuild) {
+		super(type, block);
+		
+		cancel = canBuild;
+	}
+
+	/**
+	 * Returns whether or not the block can be built here. By default, returns
+	 * Minecraft's answer on whether the block can be built
+	 * 
+	 * @return boolean whether or not the block can be built
+	 */
+	@Override
+	public boolean isCancelled() {
+		return cancel;
+	}
+	
+	/**
+	 * Set whether the block can be built here.
+	 */
+	@Override
+	public void setCancelled(boolean cancel) {
+		this.cancel = cancel;
+	}
+}
diff --git a/src/org/bukkit/event/block/BlockPhysicsEvent.java b/src/org/bukkit/event/block/BlockPhysicsEvent.java
index f47416e7..addb6b18 100644
--- a/src/org/bukkit/event/block/BlockPhysicsEvent.java
+++ b/src/org/bukkit/event/block/BlockPhysicsEvent.java
@@ -2,6 +2,7 @@ package org.bukkit.event.block;
 
 import org.bukkit.Block;
 import org.bukkit.ItemStack;
+import org.bukkit.Material;
 import org.bukkit.event.Event;
 
 /**
@@ -33,7 +34,7 @@ public class BlockPhysicsEvent extends BlockEvent {
      * @return Changed block's type
      */
     public Material getChangedType() {
-        return Material.getType(changed); // TODO: Move type to its own file
+        return Material.getMaterial(changed);
     }
 
     /**
diff --git a/src/org/bukkit/event/block/BlockPlacedEvent.java b/src/org/bukkit/event/block/BlockPlacedEvent.java
index 7b7710f4..de5d9427 100644
--- a/src/org/bukkit/event/block/BlockPlacedEvent.java
+++ b/src/org/bukkit/event/block/BlockPlacedEvent.java
@@ -1,32 +1,32 @@
-package org.bukkit.event.block;
-
-import org.bukkit.Block;
-import org.bukkit.event.Cancellable;
-
-/**
- * Not implemented yet
- */
-public class BlockPlacedEvent extends BlockEvent implements Cancellable {
-	private boolean cancel;
-	
-	/**
-	 * @param type
-	 * @param theBlock
-	 */
-	public BlockPlacedEvent(Type type, Block theBlock) {
-		super(type, theBlock);
-		cancel = false;
-	}
-
-	@Override
-	public boolean isCancelled() {
-		// TODO Auto-generated method stub
-		return cancel;
-	}
-
-	@Override
-	public void setCancelled(boolean cancel) {
-		this.cancel = cancel;
-	}
-
-}
+package org.bukkit.event.block;
+
+import org.bukkit.Block;
+import org.bukkit.event.Cancellable;
+
+/**
+ * Not implemented yet
+ */
+public class BlockPlacedEvent extends BlockEvent implements Cancellable {
+	private boolean cancel;
+	
+	/**
+	 * @param type
+	 * @param theBlock
+	 */
+	public BlockPlacedEvent(Type type, Block theBlock) {
+		super(type, theBlock);
+		cancel = false;
+	}
+
+	@Override
+	public boolean isCancelled() {
+		// TODO Auto-generated method stub
+		return cancel;
+	}
+
+	@Override
+	public void setCancelled(boolean cancel) {
+		this.cancel = cancel;
+	}
+
+}