diff options
author | Matt <mattbdev@outlook.com> | 2016-03-01 08:30:02 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-03-01 08:30:02 +1100 |
commit | ff2d64d2b948c960828f056b51c8a7ef33e491ff (patch) | |
tree | c0717b93cf7952f08e90da12fd80ade27af41b14 | |
parent | fbca9b6d9819d6145d09143da7ab96218bd89812 (diff) | |
download | bukkit-ff2d64d2b948c960828f056b51c8a7ef33e491ff.tar bukkit-ff2d64d2b948c960828f056b51c8a7ef33e491ff.tar.gz bukkit-ff2d64d2b948c960828f056b51c8a7ef33e491ff.tar.lz bukkit-ff2d64d2b948c960828f056b51c8a7ef33e491ff.tar.xz bukkit-ff2d64d2b948c960828f056b51c8a7ef33e491ff.zip |
Remove deprecated ContainerBlock
Replaced by InventoryHolder since March 2012.
-rw-r--r-- | src/main/java/org/bukkit/block/BrewingStand.java | 3 | ||||
-rw-r--r-- | src/main/java/org/bukkit/block/Chest.java | 3 | ||||
-rw-r--r-- | src/main/java/org/bukkit/block/ContainerBlock.java | 11 | ||||
-rw-r--r-- | src/main/java/org/bukkit/block/Dispenser.java | 3 | ||||
-rw-r--r-- | src/main/java/org/bukkit/block/Dropper.java | 10 | ||||
-rw-r--r-- | src/main/java/org/bukkit/block/Furnace.java | 3 |
6 files changed, 13 insertions, 20 deletions
diff --git a/src/main/java/org/bukkit/block/BrewingStand.java b/src/main/java/org/bukkit/block/BrewingStand.java index c66a51c1..ba4fe9f7 100644 --- a/src/main/java/org/bukkit/block/BrewingStand.java +++ b/src/main/java/org/bukkit/block/BrewingStand.java @@ -1,11 +1,12 @@ package org.bukkit.block; import org.bukkit.inventory.BrewerInventory; +import org.bukkit.inventory.InventoryHolder; /** * Represents a brewing stand. */ -public interface BrewingStand extends BlockState, ContainerBlock { +public interface BrewingStand extends BlockState, InventoryHolder { /** * How much time is left in the brewing cycle diff --git a/src/main/java/org/bukkit/block/Chest.java b/src/main/java/org/bukkit/block/Chest.java index 125d5e70..ee95841d 100644 --- a/src/main/java/org/bukkit/block/Chest.java +++ b/src/main/java/org/bukkit/block/Chest.java @@ -1,11 +1,12 @@ package org.bukkit.block; import org.bukkit.inventory.Inventory; +import org.bukkit.inventory.InventoryHolder; /** * Represents a chest. */ -public interface Chest extends BlockState, ContainerBlock { +public interface Chest extends BlockState, InventoryHolder { /** * Returns the chest's inventory. If this is a double chest, it returns diff --git a/src/main/java/org/bukkit/block/ContainerBlock.java b/src/main/java/org/bukkit/block/ContainerBlock.java deleted file mode 100644 index c69ac9e5..00000000 --- a/src/main/java/org/bukkit/block/ContainerBlock.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.bukkit.block; - -import org.bukkit.inventory.InventoryHolder; - -/** - * Indicates a block type that has inventory. - * - * @deprecated in favour of {@link InventoryHolder} - */ -@Deprecated -public interface ContainerBlock extends InventoryHolder {} diff --git a/src/main/java/org/bukkit/block/Dispenser.java b/src/main/java/org/bukkit/block/Dispenser.java index bba753ee..4e6b349d 100644 --- a/src/main/java/org/bukkit/block/Dispenser.java +++ b/src/main/java/org/bukkit/block/Dispenser.java @@ -1,11 +1,12 @@ package org.bukkit.block; +import org.bukkit.inventory.InventoryHolder; import org.bukkit.projectiles.BlockProjectileSource; /** * Represents a dispenser. */ -public interface Dispenser extends BlockState, ContainerBlock { +public interface Dispenser extends BlockState, InventoryHolder { /** * Gets the BlockProjectileSource object for this dispenser. diff --git a/src/main/java/org/bukkit/block/Dropper.java b/src/main/java/org/bukkit/block/Dropper.java index 21fbedce..a04fa96a 100644 --- a/src/main/java/org/bukkit/block/Dropper.java +++ b/src/main/java/org/bukkit/block/Dropper.java @@ -12,14 +12,14 @@ public interface Dropper extends BlockState, InventoryHolder { * <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 + * If the block that the Dropper is facing is an InventoryHolder, + * 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 + * If the block that the Dropper is facing is not an InventoryHolder, + * the randomly selected ItemStack is dropped on * the ground in the form of an {@link org.bukkit.entity.Item Item}. */ - public void drop(); + public void drop(); } diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java index 94af85e1..9c8cd334 100644 --- a/src/main/java/org/bukkit/block/Furnace.java +++ b/src/main/java/org/bukkit/block/Furnace.java @@ -1,11 +1,12 @@ package org.bukkit.block; import org.bukkit.inventory.FurnaceInventory; +import org.bukkit.inventory.InventoryHolder; /** * Represents a furnace. */ -public interface Furnace extends BlockState, ContainerBlock { +public interface Furnace extends BlockState, InventoryHolder { /** * Get burn time. |