Get Colors from ShulkerBox; Implement CustomName for Tiles.

By: Senmori <thesenmori@gmail.com>
This commit is contained in:
Bukkit/Spigot
2016-11-18 11:24:16 +11:00
parent 77cd4eb79a
commit 07f7249cf2
10 changed files with 56 additions and 35 deletions

View File

@@ -0,0 +1,28 @@
package org.bukkit;
public interface Nameable {
/**
* Gets the custom name on a mob or block. If there is no name this method
* will return null.
* <p>
* This value has no effect on players, they will always use their real
* name.
*
* @return name of the mob/block or null
*/
public String getCustomName();
/**
* Sets a custom name on a mob or block. This name will be used in death
* messages and can be sent to the client as a nameplate over the mob.
* <p>
* Setting the name to null or an empty string will clear it.
* <p>
* This value has no effect on players, they will always use their real
* name.
*
* @param name the name to set
*/
public void setCustomName(String name);
}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,8 +1,18 @@
package org.bukkit.block; package org.bukkit.block;
import org.bukkit.DyeColor;
import org.bukkit.Nameable;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
/** /**
* Represents a ShulkerBox. * Represents a ShulkerBox.
*/ */
public interface ShulkerBox extends BlockState, InventoryHolder, Lockable { } 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();
}

View File

@@ -2,6 +2,7 @@ package org.bukkit.entity;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.EntityEffect; import org.bukkit.EntityEffect;
import org.bukkit.Nameable;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent;
@@ -17,7 +18,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
/** /**
* Represents a base entity in the world * Represents a base entity in the world
*/ */
public interface Entity extends Metadatable, CommandSender { public interface Entity extends Metadatable, CommandSender, Nameable {
/** /**
* Gets the entity's current position * Gets the entity's current position
@@ -299,30 +300,6 @@ public interface Entity extends Metadatable, CommandSender {
*/ */
public Entity getVehicle(); public Entity getVehicle();
/**
* Sets a custom name on a mob. This name will be used in death messages
* and can be sent to the client as a nameplate over the mob.
* <p>
* Setting the name to null or an empty string will clear it.
* <p>
* This value has no effect on players, they will always use their real
* name.
*
* @param name the name to set
*/
public void setCustomName(String name);
/**
* Gets the custom name on a mob. If there is no name this method will
* return null.
* <p>
* This value has no effect on players, they will always use their real
* name.
*
* @return name of the mob or null
*/
public String getCustomName();
/** /**
* Sets whether or not to display the mob's custom name client side. The * Sets whether or not to display the mob's custom name client side. The
* name will be displayed above the mob similarly to a player. * name will be displayed above the mob similarly to a player.