Moved block stuff from org.bukkit to org.bukkit.block

src/main/java/org/bukkit/World.java

@@ -1,6 +1,7 @@
 
 package org.bukkit;
 
+import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.entity.ItemDrop;
 import org.bukkit.entity.PoweredMinecart;

src/main/java/org/bukkit/block/Biome.java

@@ -1,5 +1,5 @@
 
-package org.bukkit;
+package org.bukkit.block;
 
 /**
  * Holds all accepted Biomes in the default server

src/main/java/org/bukkit/block/Block.java

@@ -1,5 +1,8 @@
-package org.bukkit;
+package org.bukkit.block;
 
+import org.bukkit.Chunk;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.block.BlockState;
 
 /**

src/main/java/org/bukkit/block/BlockDamageLevel.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.block;
 
 public enum BlockDamageLevel {
     STARTED(0), DIGGING(1), BROKEN(3), STOPPED(2);

src/main/java/org/bukkit/block/BlockFace.java

@@ -1,4 +1,4 @@
-package org.bukkit;
+package org.bukkit.block;
 
 /**
  * Represents the face of a block

src/main/java/org/bukkit/block/BlockState.java

@@ -1,7 +1,6 @@
 
 package org.bukkit.block;
 
-import org.bukkit.Block;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;

src/main/java/org/bukkit/event/block/BlockCanBuildEvent.java

@@ -3,7 +3,7 @@
  */
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.Material;
 
 /**

src/main/java/org/bukkit/event/block/BlockDamageEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.BlockDamageLevel;
+import org.bukkit.block.BlockDamageLevel;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 

src/main/java/org/bukkit/event/block/BlockEvent.java

@@ -1,24 +1,24 @@
-package org.bukkit.event.block;
+package org.bukkit.event.block;
-
+
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.event.Event;
+import org.bukkit.event.Event;
-
+
-/**
+/**
- * Represents a block related event
+ * Represents a block related event
- */
+ */
-public class BlockEvent extends Event {
+public class BlockEvent extends Event {
-    protected Block block;
+    protected Block block;
-
+
-    public BlockEvent(final Event.Type type, final Block theBlock) {
+    public BlockEvent(final Event.Type type, final Block theBlock) {
-        super(type);
+        super(type);
-        block = theBlock;
+        block = theBlock;
-    }
+    }
-
+
-    /**
+    /**
-     * Returns the block involved in this event
+     * Returns the block involved in this event
-     * @return Block which block is involved in this event
+     * @return Block which block is involved in this event
-     */
+     */
-    public final Block getBlock() {
+    public final Block getBlock() {
-        return block;
+        return block;
-    }
+    }
-}
+}

src/main/java/org/bukkit/event/block/BlockFromToEvent.java

@@ -1,48 +1,48 @@
-package org.bukkit.event.block;
+package org.bukkit.event.block;
-
+
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
-import org.bukkit.event.Cancellable;
+import org.bukkit.event.Cancellable;
-import org.bukkit.event.Event;
+import org.bukkit.event.Event;
-
+
-/**
+/**
- * Holds information for events with a source block and a destination block
+ * Holds information for events with a source block and a destination block
- */
+ */
-public class BlockFromToEvent extends BlockEvent implements Cancellable {
+public class BlockFromToEvent extends BlockEvent implements Cancellable {
-    protected Block from;
+    protected Block from;
-    protected BlockFace face;
+    protected BlockFace face;
-    protected boolean cancel;
+    protected boolean cancel;
-
+
-    public BlockFromToEvent(final Event.Type type, final Block block, final BlockFace face) {
+    public BlockFromToEvent(final Event.Type type, final Block block, final BlockFace face) {
-        super(type, block);
+        super(type, block);
-        this.face = face;
+        this.face = face;
-        this.from = block.getRelative(face.getModX(), face.getModY(), face.getModZ());
+        this.from = block.getRelative(face.getModX(), face.getModY(), face.getModZ());
-        this.cancel = false;
+        this.cancel = false;
-    }
+    }
-
+
-    /**
+    /**
-     * Gets the location this player moved to
+     * Gets the location this player moved to
-     *
+     *
-     * @return Block the block is event originated from
+     * @return Block the block is event originated from
-     */
+     */
-    public BlockFace getFace() {
+    public BlockFace getFace() {
-        return face;
+        return face;
-    }
+    }
-
+
-    /**
+    /**
-     * Convenience method for getting the faced block
+     * Convenience method for getting the faced block
-     * 
+     * 
-     * @return Block the faced block
+     * @return Block the faced block
-     */
+     */
-    public Block getFromBlock() {
+    public Block getFromBlock() {
-        return from; 
+        return from; 
-    }
+    }
-
+
-    public boolean isCancelled() {
+    public boolean isCancelled() {
-        return cancel;
+        return cancel;
-    }
+    }
-
+
-    public void setCancelled(boolean cancel) {
+    public void setCancelled(boolean cancel) {
-        this.cancel = cancel;
+        this.cancel = cancel;
-    }
+    }
-}
+}

src/main/java/org/bukkit/event/block/BlockIgniteEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;

src/main/java/org/bukkit/event/block/BlockInteractEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;

src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.Material;
 import org.bukkit.event.Event;
 

src/main/java/org/bukkit/event/block/BlockPlaceEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;

src/main/java/org/bukkit/event/block/BlockRedstoneEvent.java

@@ -5,8 +5,8 @@
 
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 
 /**
  *

src/main/java/org/bukkit/event/block/BlockRightClickEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.entity.Player;
 

src/main/java/org/bukkit/event/block/LeavesDecayEvent.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.event.block;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.event.Cancellable;
 
 /**

src/main/java/org/bukkit/event/entity/EntityDamageByBlockEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.entity;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;

src/main/java/org/bukkit/event/player/PlayerItemEvent.java

@@ -1,7 +1,7 @@
 package org.bukkit.event.player;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;

src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java

@@ -1,6 +1,6 @@
 package org.bukkit.event.vehicle;
 
-import org.bukkit.Block;
+import org.bukkit.block.Block;
 import org.bukkit.entity.Vehicle;
 
 /**

src/main/java/org/bukkit/material/Attachable.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 
 /**
  * Indicates that a block can be attached to another block

src/main/java/org/bukkit/material/Button.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.Material;
 
 /**

src/main/java/org/bukkit/material/Ladder.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.Material;
 
 /**

src/main/java/org/bukkit/material/Lever.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.Material;
 
 /**

src/main/java/org/bukkit/material/Sign.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.Material;
 
 /**

src/main/java/org/bukkit/material/Torch.java

@@ -1,7 +1,7 @@
 
 package org.bukkit.material;
 
-import org.bukkit.BlockFace;
+import org.bukkit.block.BlockFace;
 import org.bukkit.Material;
 
 /**