Add Override annotations where appropriate

By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2019-04-28 11:37:52 +10:00
parent d66310a2f1
commit 82854b7bd7
176 changed files with 503 additions and 0 deletions

View File

@@ -28,6 +28,7 @@ public class Banner extends MaterialData implements Attachable {
return getItemType() == Material.LEGACY_WALL_BANNER;
}
@Override
public BlockFace getAttachedFace() {
if (isWallBanner()) {
byte data = getData();
@@ -52,6 +53,7 @@ public class Banner extends MaterialData implements Attachable {
}
}
@Override
public BlockFace getFacing() {
byte data = getData();
@@ -112,6 +114,7 @@ public class Banner extends MaterialData implements Attachable {
}
}
@Override
public void setFacingDirection(BlockFace face) {
byte data;

View File

@@ -61,6 +61,7 @@ public class Bed extends MaterialData implements Directional {
* Set which direction the head of the bed is facing. Note that this will
* only affect one of the two blocks the bed is made of.
*/
@Override
public void setFacingDirection(BlockFace face) {
byte data;
@@ -94,6 +95,7 @@ public class Bed extends MaterialData implements Directional {
*
* @return the direction the head of the bed is facing
*/
@Override
public BlockFace getFacing() {
byte data = (byte) (getData() & 0x7);

View File

@@ -31,6 +31,7 @@ public class Button extends SimpleAttachableMaterialData implements Redstone {
*
* @return true if powered, otherwise false
*/
@Override
public boolean isPowered() {
return (getData() & 0x8) == 0x8;
}
@@ -50,6 +51,7 @@ public class Button extends SimpleAttachableMaterialData implements Redstone {
*
* @return BlockFace attached to
*/
@Override
public BlockFace getAttachedFace() {
byte data = (byte) (getData() & 0x7);
@@ -79,6 +81,7 @@ public class Button extends SimpleAttachableMaterialData implements Redstone {
/**
* Sets the direction this button is pointing toward
*/
@Override
public void setFacingDirection(BlockFace face) {
byte data = (byte) (getData() & 0x8);

View File

@@ -75,10 +75,12 @@ public class CocoaPlant extends MaterialData implements Directional, Attachable
setData((byte) dat);
}
@Override
public BlockFace getAttachedFace() {
return getFacing().getOppositeFace();
}
@Override
public void setFacingDirection(BlockFace face) {
int dat = getData() & 0xC;
switch (face) {
@@ -98,6 +100,7 @@ public class CocoaPlant extends MaterialData implements Directional, Attachable
setData((byte) dat);
}
@Override
public BlockFace getFacing() {
switch (getData() & 0x3) {
case 0:

View File

@@ -30,6 +30,7 @@ public class Command extends MaterialData implements Redstone {
*
* @return true if powered, otherwise false
*/
@Override
public boolean isPowered() {
return (getData() & 1) != 0;
}

View File

@@ -24,6 +24,7 @@ public class DetectorRail extends ExtendedRails implements PressureSensor {
super(type, data);
}
@Override
public boolean isPressed() {
return (getData() & 0x8) == 0x8;
}

View File

@@ -22,6 +22,7 @@ public class DirectionalContainer extends MaterialData implements Directional {
super(type, data);
}
@Override
public void setFacingDirection(BlockFace face) {
byte data;
@@ -46,6 +47,7 @@ public class DirectionalContainer extends MaterialData implements Directional {
setData(data);
}
@Override
public BlockFace getFacing() {
byte data = getData();

View File

@@ -31,6 +31,7 @@ public class Dispenser extends FurnaceAndDispenser {
super(type, data);
}
@Override
public void setFacingDirection(BlockFace face) {
byte data;
@@ -63,6 +64,7 @@ public class Dispenser extends FurnaceAndDispenser {
setData(data);
}
@Override
public BlockFace getFacing() {
int data = getData() & 0x7;

View File

@@ -200,6 +200,7 @@ public class Door extends MaterialData implements Directional, Openable {
/**
* Result is undefined if <code>isTopHalf()</code> is true.
*/
@Override
public boolean isOpen() {
return ((getData() & 0x4) == 0x4);
}
@@ -207,6 +208,7 @@ public class Door extends MaterialData implements Directional, Openable {
/**
* Set whether the door is open. Undefined if <code>isTopHalf()</code> is true.
*/
@Override
public void setOpen(boolean isOpen) {
setData((byte) (isOpen ? (getData() | 0x4) : (getData() & ~0x4)));
}
@@ -248,6 +250,7 @@ public class Door extends MaterialData implements Directional, Openable {
*
* @param face the direction
*/
@Override
public void setFacingDirection(BlockFace face) {
byte data = (byte) (getData() & 0xC);
switch (face) {
@@ -274,6 +277,7 @@ public class Door extends MaterialData implements Directional, Openable {
*
* @return the direction
*/
@Override
public BlockFace getFacing() {
byte data = (byte) (getData() & 0x3);
switch (data) {

View File

@@ -37,6 +37,7 @@ public class Dye extends MaterialData implements Colorable {
*
* @return DyeColor of this dye
*/
@Override
public DyeColor getColor() {
return DyeColor.getByDyeData(getData());
}
@@ -46,6 +47,7 @@ public class Dye extends MaterialData implements Colorable {
*
* @param color New color of this dye
*/
@Override
public void setColor(DyeColor color) {
setData(color.getDyeData());
}

View File

@@ -32,6 +32,7 @@ public class Gate extends MaterialData implements Directional, Openable {
super(Material.LEGACY_FENCE_GATE, data);
}
@Override
public void setFacingDirection(BlockFace face) {
byte data = (byte) (getData() & ~DIR_BIT);
@@ -54,6 +55,7 @@ public class Gate extends MaterialData implements Directional, Openable {
setData(data);
}
@Override
public BlockFace getFacing() {
switch (getData() & DIR_BIT) {
case GATE_SOUTH:
@@ -69,10 +71,12 @@ public class Gate extends MaterialData implements Directional, Openable {
return BlockFace.EAST;
}
@Override
public boolean isOpen() {
return (getData() & OPEN_BIT) > 0;
}
@Override
public void setOpen(boolean isOpen) {
byte data = getData();

View File

@@ -30,6 +30,7 @@ public class Ladder extends SimpleAttachableMaterialData {
*
* @return BlockFace attached to
*/
@Override
public BlockFace getAttachedFace() {
byte data = getData();
@@ -53,6 +54,7 @@ public class Ladder extends SimpleAttachableMaterialData {
/**
* Sets the direction this ladder is facing
*/
@Override
public void setFacingDirection(BlockFace face) {
byte data = (byte) 0x0;

View File

@@ -31,6 +31,7 @@ public class Lever extends SimpleAttachableMaterialData implements Redstone {
*
* @return true if powered, otherwise false
*/
@Override
public boolean isPowered() {
return (getData() & 0x8) == 0x8;
}
@@ -49,6 +50,7 @@ public class Lever extends SimpleAttachableMaterialData implements Redstone {
*
* @return BlockFace attached to
*/
@Override
public BlockFace getAttachedFace() {
byte data = (byte) (getData() & 0x7);
@@ -81,6 +83,7 @@ public class Lever extends SimpleAttachableMaterialData implements Redstone {
/**
* Sets the direction this lever is pointing in
*/
@Override
public void setFacingDirection(BlockFace face) {
byte data = (byte) (getData() & 0x8);
BlockFace attach = getAttachedFace();

View File

@@ -22,6 +22,7 @@ public class PistonExtensionMaterial extends MaterialData implements Attachable
super(type, data);
}
@Override
public void setFacingDirection(BlockFace face) {
byte data = (byte) (getData() & 0x8);
@@ -45,6 +46,7 @@ public class PistonExtensionMaterial extends MaterialData implements Attachable
setData(data);
}
@Override
public BlockFace getFacing() {
byte dir = (byte) (getData() & 7);
@@ -84,6 +86,7 @@ public class PistonExtensionMaterial extends MaterialData implements Attachable
setData((byte) (sticky ? (getData() | 0x8) : (getData() & ~0x8)));
}
@Override
public BlockFace getAttachedFace() {
return getFacing().getOppositeFace();
}

View File

@@ -24,6 +24,7 @@ public class PoweredRail extends ExtendedRails implements Redstone {
super(type, data);
}
@Override
public boolean isPowered() {
return (getData() & 0x8) == 0x8;
}

View File

@@ -24,6 +24,7 @@ public class PressurePlate extends MaterialData implements PressureSensor {
super(type, data);
}
@Override
public boolean isPressed() {
return getData() == 0x1;
}

View File

@@ -40,6 +40,7 @@ public class Pumpkin extends MaterialData implements Directional {
return getItemType() == Material.LEGACY_JACK_O_LANTERN;
}
@Override
public void setFacingDirection(BlockFace face) {
byte data;
@@ -64,6 +65,7 @@ public class Pumpkin extends MaterialData implements Directional {
setData(data);
}
@Override
public BlockFace getFacing() {
byte data = getData();

View File

@@ -30,6 +30,7 @@ public class RedstoneTorch extends Torch implements Redstone {
*
* @return true if powered, otherwise false
*/
@Override
public boolean isPowered() {
return getItemType() == Material.LEGACY_REDSTONE_TORCH_ON;
}

View File

@@ -30,6 +30,7 @@ public class RedstoneWire extends MaterialData implements Redstone {
*
* @return true if powered, otherwise false
*/
@Override
public boolean isPowered() {
return getData() > 0;
}

View File

@@ -40,6 +40,7 @@ public class Sign extends MaterialData implements Attachable {
*
* @return BlockFace attached to
*/
@Override
public BlockFace getAttachedFace() {
if (isWallSign()) {
byte data = getData();
@@ -69,6 +70,7 @@ public class Sign extends MaterialData implements Attachable {
*
* @return BlockFace indicating where this sign is facing
*/
@Override
public BlockFace getFacing() {
byte data = getData();
@@ -129,6 +131,7 @@ public class Sign extends MaterialData implements Attachable {
}
}
@Override
public void setFacingDirection(BlockFace face) {
byte data;

View File

@@ -27,6 +27,7 @@ public abstract class SimpleAttachableMaterialData extends MaterialData implemen
super(type, data);
}
@Override
public BlockFace getFacing() {
BlockFace attachedFace = getAttachedFace();
return attachedFace == null ? null : attachedFace.getOppositeFace();

View File

@@ -35,6 +35,7 @@ public class Skull extends MaterialData implements Directional {
super(type, data);
}
@Override
public void setFacingDirection(BlockFace face) {
int data;
@@ -63,6 +64,7 @@ public class Skull extends MaterialData implements Directional {
setData((byte) data);
}
@Override
public BlockFace getFacing() {
int data = getData();

View File

@@ -54,6 +54,7 @@ public class Stairs extends MaterialData implements Directional {
/**
* Set the direction the stair part of the block is facing
*/
@Override
public void setFacingDirection(BlockFace face) {
byte data;
@@ -82,6 +83,7 @@ public class Stairs extends MaterialData implements Directional {
/**
* @return the direction the stair part of the block is facing
*/
@Override
public BlockFace getFacing() {
return getDescendingDirection();
}

View File

@@ -30,6 +30,7 @@ public class Torch extends SimpleAttachableMaterialData {
*
* @return BlockFace attached to
*/
@Override
public BlockFace getAttachedFace() {
byte data = getData();
@@ -52,6 +53,7 @@ public class Torch extends SimpleAttachableMaterialData {
}
}
@Override
public void setFacingDirection(BlockFace face) {
byte data;

View File

@@ -25,10 +25,12 @@ public class TrapDoor extends SimpleAttachableMaterialData implements Openable {
super(type, data);
}
@Override
public boolean isOpen() {
return ((getData() & 0x4) == 0x4);
}
@Override
public void setOpen(boolean isOpen) {
byte data = getData();
@@ -63,6 +65,7 @@ public class TrapDoor extends SimpleAttachableMaterialData implements Openable {
setData((byte) dat);
}
@Override
public BlockFace getAttachedFace() {
byte data = (byte) (getData() & 0x3);
@@ -84,6 +87,7 @@ public class TrapDoor extends SimpleAttachableMaterialData implements Openable {
}
@Override
public void setFacingDirection(BlockFace face) {
byte data = (byte) (getData() & 0xC);

View File

@@ -71,6 +71,7 @@ public class TripwireHook extends SimpleAttachableMaterialData implements Redsto
setData((byte) dat);
}
@Override
public void setFacingDirection(BlockFace face) {
int dat = getData() & 0xC;
switch (face) {
@@ -90,6 +91,7 @@ public class TripwireHook extends SimpleAttachableMaterialData implements Redsto
setData((byte) dat);
}
@Override
public BlockFace getAttachedFace() {
switch (getData() & 0x3) {
case 0:
@@ -104,6 +106,7 @@ public class TripwireHook extends SimpleAttachableMaterialData implements Redsto
return null;
}
@Override
public boolean isPowered() {
return isActivated();
}

View File

@@ -35,6 +35,7 @@ public class Wool extends MaterialData implements Colorable {
*
* @return DyeColor of this dye
*/
@Override
public DyeColor getColor() {
return DyeColor.getByWoolData(getData());
}
@@ -44,6 +45,7 @@ public class Wool extends MaterialData implements Colorable {
*
* @param color New color of this dye
*/
@Override
public void setColor(DyeColor color) {
setData(color.getWoolData());
}