SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SPIGOT-2793: Revert Nameable changes

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2016-11-19 03:09:06 +11:00
parent 07f7249cf2
commit 0da3e1a443
10 changed files with 35 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
paper-api/src/main/java/org/bukkit/block/Beacon.java
View File

@@ -1,7 +1,6 @@
package org.bukkit.block;
import java.util.Collection;
import org.bukkit.Nameable;
import org.bukkit.entity.LivingEntity;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.potion.PotionEffect;
@@ -10,7 +9,7 @@ import org.bukkit.potion.PotionEffectType;
/**
* Represents a beacon.
*/
public interface Beacon extends BlockState, InventoryHolder, Lockable, Nameable {
public interface Beacon extends BlockState, InventoryHolder, Lockable {
/**
* Returns the list of players within the beacon's range of effect.

3
paper-api/src/main/java/org/bukkit/block/BrewingStand.java
View File

@@ -1,13 +1,12 @@
package org.bukkit.block;
import org.bukkit.Nameable;
import org.bukkit.inventory.BrewerInventory;
import org.bukkit.inventory.InventoryHolder;
/**
* Represents a brewing stand.
*/
public interface BrewingStand extends BlockState, InventoryHolder, Lockable, Nameable {
public interface BrewingStand extends BlockState, InventoryHolder, Lockable {
/**
* How much time is left in the brewing cycle

3
paper-api/src/main/java/org/bukkit/block/Chest.java
View File

@@ -1,13 +1,12 @@
package org.bukkit.block;
import org.bukkit.Nameable;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
/**
* Represents a chest.
*/
public interface Chest extends BlockState, InventoryHolder, Lockable, Nameable {
public interface Chest extends BlockState, InventoryHolder, Lockable {
/**
* Returns the chest's inventory. If this is a double chest, it returns

3
paper-api/src/main/java/org/bukkit/block/Dispenser.java
View File

@@ -1,13 +1,12 @@
package org.bukkit.block;
import org.bukkit.Nameable;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.projectiles.BlockProjectileSource;
/**
* Represents a dispenser.
*/
public interface Dispenser extends BlockState, InventoryHolder, Lockable, Nameable {
public interface Dispenser extends BlockState, InventoryHolder, Lockable {
/**
* Gets the BlockProjectileSource object for this dispenser.

4
paper-api/src/main/java/org/bukkit/block/Dropper.java
View File

@@ -1,13 +1,11 @@
package org.bukkit.block;
import org.bukkit.Nameable;
import org.bukkit.inventory.InventoryHolder;
/**
* Represents a dropper.
*/
public interface Dropper extends BlockState, InventoryHolder, Lockable, Nameable {
public interface Dropper extends BlockState, InventoryHolder, Lockable {
/**
* Tries to drop a randomly selected item from the Dropper's inventory,
* following the normal behavior of a Dropper.

3
paper-api/src/main/java/org/bukkit/block/Furnace.java
View File

@@ -1,13 +1,12 @@
package org.bukkit.block;
import org.bukkit.Nameable;
import org.bukkit.inventory.FurnaceInventory;
import org.bukkit.inventory.InventoryHolder;
/**
* Represents a furnace.
*/
public interface Furnace extends BlockState, InventoryHolder, Lockable, Nameable {
public interface Furnace extends BlockState, InventoryHolder, Lockable {
/**
* Get burn time.

5
paper-api/src/main/java/org/bukkit/block/Hopper.java
View File

@@ -1,9 +1,10 @@
package org.bukkit.block;
import org.bukkit.Nameable;
import org.bukkit.inventory.InventoryHolder;
/**
* Represents a hopper.
*/
public interface Hopper extends BlockState, InventoryHolder, Lockable, Nameable { }
public interface Hopper extends BlockState, InventoryHolder, Lockable {
}

12
paper-api/src/main/java/org/bukkit/block/ShulkerBox.java
View File

@@ -1,18 +1,8 @@
package org.bukkit.block;
import org.bukkit.DyeColor;
import org.bukkit.Nameable;
import org.bukkit.inventory.InventoryHolder;
/**
* Represents a ShulkerBox.
*/
public interface ShulkerBox extends BlockState, InventoryHolder, Lockable, Nameable {
/**
* Get the {@link DyeColor} corresponding to this ShulkerBox
*
* @return the {@link DyeColor} of this ShulkerBox
*/
public DyeColor getColor();
}
public interface ShulkerBox extends BlockState, InventoryHolder, Lockable { }