diff options
| author | Xephi <xephirot59@gmail.com> | 2013-03-21 13:44:20 +0100 |
|---|---|---|
| committer | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2013-03-21 21:43:28 -0600 |
| commit | 6b648d14edc660419d52bd1977567ef81bd6af96 (patch) | |
| tree | 76a58d5e2be6b70eef75ccf92625697d7f55119a /src/main/java/org | |
| parent | 3a0c2f2e0304b8a587b87f984792136ec6a33496 (diff) | |
| download | bukkit-6b648d14edc660419d52bd1977567ef81bd6af96.tar bukkit-6b648d14edc660419d52bd1977567ef81bd6af96.tar.gz bukkit-6b648d14edc660419d52bd1977567ef81bd6af96.tar.lz bukkit-6b648d14edc660419d52bd1977567ef81bd6af96.tar.xz bukkit-6b648d14edc660419d52bd1977567ef81bd6af96.zip | |
Add Dropper BlockState. Adds BUKKIT-3750
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/bukkit/Material.java | 3 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/block/Dropper.java | 25 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/event/inventory/InventoryType.java | 4 |
3 files changed, 31 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java index 9488dfda..b2d13ec7 100644 --- a/src/main/java/org/bukkit/Material.java +++ b/src/main/java/org/bukkit/Material.java @@ -16,6 +16,7 @@ import org.bukkit.material.Command; import org.bukkit.material.Crops; import org.bukkit.material.DetectorRail; import org.bukkit.material.Diode; +import org.bukkit.material.DirectionalContainer; import org.bukkit.material.Dispenser; import org.bukkit.material.Door; import org.bukkit.material.Dye; @@ -220,7 +221,7 @@ public enum Material { QUARTZ_BLOCK(155), QUARTZ_STAIRS(156, Stairs.class), ACTIVATOR_RAIL(157), - DROPPER(158), + DROPPER(158, DirectionalContainer.class), // ----- Item Separator ----- IRON_SPADE(256, 1, 250), IRON_PICKAXE(257, 1, 250), diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java new file mode 100644 index 00000000..3cf73ab4 --- /dev/null +++ b/src/main/java/org/bukkit/block/Dropper.java @@ -0,0 +1,25 @@ +package org.bukkit.block; + +import org.bukkit.inventory.InventoryHolder; + +/** + * Represents a dropper. + */ +public interface Dropper extends BlockState, InventoryHolder { + /** + * Tries to drop a randomly selected item from the Dropper's inventory, + * following the normal behavior of a Dropper. + * <p /> + * Normal behavior of a Dropper is as follows: + * <p /> + * If the block that the Dropper is facing is an InventoryHolder or + * ContainerBlock the randomly selected ItemStack is placed within that + * Inventory in the first slot that's available, starting with 0 and + * counting up. If the inventory is full, nothing happens. + * <p /> + * If the block that the Dropper is facing is not an InventoryHolder or + * ContainerBlock, the randomly selected ItemStack is dropped on + * the ground in the form of an {@link org.bukkit.entity.Item Item}. + */ + public void drop(); +} diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java index 7820a36a..87edc427 100644 --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java @@ -10,6 +10,10 @@ public enum InventoryType { */ DISPENSER(9,"Dispenser"), /** + * A dropper inventory, with 9 slots of type CONTAINER. + */ + DROPPER(9, "Dropper"), + /** * A furnace inventory, with a RESULT slot, a CRAFTING slot, and a FUEL slot. */ FURNACE(3,"Furnace"), |