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

Add Override annotations where appropriate

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-04-28 11:38:01 +10:00
parent c7281b2159
commit bfea9a3269
140 changed files with 1021 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
View File

@@ -73,6 +73,7 @@ public class CraftBlock implements Block {
return position;
}
@Override
public World getWorld() {
return world.getMinecraftWorld().getWorld();
}
@@ -81,10 +82,12 @@ public class CraftBlock implements Block {
return (CraftWorld) getWorld();
}
@Override
public Location getLocation() {
return new Location(getWorld(), position.getX(), position.getY(), position.getZ());
}
@Override
public Location getLocation(Location loc) {
if (loc != null) {
loc.setWorld(getWorld());
@@ -102,18 +105,22 @@ public class CraftBlock implements Block {
return new BlockVector(getX(), getY(), getZ());
}
@Override
public int getX() {
return position.getX();
}
@Override
public int getY() {
return position.getY();
}
@Override
public int getZ() {
return position.getZ();
}
@Override
public Chunk getChunk() {
return getWorld().getChunkAt(this);
}
@@ -138,6 +145,7 @@ public class CraftBlock implements Block {
return world.getType(position);
}
@Override
public byte getData() {
IBlockData blockData = world.getType(position);
return CraftMagicNumbers.toLegacyData(blockData);
@@ -148,6 +156,7 @@ public class CraftBlock implements Block {
return CraftBlockData.fromData(getData0());
}
@Override
public void setType(final Material type) {
setType(type, true);
}
@@ -197,18 +206,22 @@ public class CraftBlock implements Block {
}
}
@Override
public Material getType() {
return CraftMagicNumbers.getMaterial(world.getType(position).getBlock());
}
@Override
public byte getLightLevel() {
return (byte) world.getMinecraftWorld().getLightLevel(position);
}
@Override
public byte getLightFromSky() {
return (byte) world.getBrightness(EnumSkyBlock.SKY, position);
}
@Override
public byte getLightFromBlocks() {
return (byte) world.getBrightness(EnumSkyBlock.BLOCK, position);
}
@@ -222,18 +235,22 @@ public class CraftBlock implements Block {
return getRelative(face, distance);
}
@Override
public Block getRelative(final int modX, final int modY, final int modZ) {
return getWorld().getBlockAt(getX() + modX, getY() + modY, getZ() + modZ);
}
@Override
public Block getRelative(BlockFace face) {
return getRelative(face, 1);
}
@Override
public Block getRelative(BlockFace face, int distance) {
return getRelative(face.getModX() * distance, face.getModY() * distance, face.getModZ() * distance);
}
@Override
public BlockFace getFace(final Block block) {
BlockFace[] values = BlockFace.values();
@@ -293,6 +310,7 @@ public class CraftBlock implements Block {
}
}
@Override
public BlockState getState() {
Material material = getType();
@@ -456,10 +474,12 @@ public class CraftBlock implements Block {
}
}
@Override
public Biome getBiome() {
return getWorld().getBiome(getX(), getZ());
}
@Override
public void setBiome(Biome bio) {
getWorld().setBiome(getX(), getZ(), bio);
}
@@ -480,18 +500,22 @@ public class CraftBlock implements Block {
return IRegistry.BIOME.get(new MinecraftKey(bio.name().toLowerCase(java.util.Locale.ENGLISH)));
}
@Override
public double getTemperature() {
return world.getBiome(position).getAdjustedTemperature(position);
}
@Override
public double getHumidity() {
return getWorld().getHumidity(getX(), getZ());
}
@Override
public boolean isBlockPowered() {
return world.getMinecraftWorld().getBlockPower(position) > 0;
}
@Override
public boolean isBlockIndirectlyPowered() {
return world.getMinecraftWorld().isBlockIndirectlyPowered(position);
}
@@ -510,10 +534,12 @@ public class CraftBlock implements Block {
return this.position.hashCode() ^ this.getWorld().hashCode();
}
@Override
public boolean isBlockFacePowered(BlockFace face) {
return world.getMinecraftWorld().isBlockFacePowered(position, blockFaceToNotch(face));
}
@Override
public boolean isBlockFaceIndirectlyPowered(BlockFace face) {
int power = world.getMinecraftWorld().getBlockFacePower(position, blockFaceToNotch(face));
@@ -525,6 +551,7 @@ public class CraftBlock implements Block {
return power > 0;
}
@Override
public int getBlockPower(BlockFace face) {
int power = 0;
BlockRedstoneWire wire = (BlockRedstoneWire) Blocks.REDSTONE_WIRE;
@@ -541,26 +568,32 @@ public class CraftBlock implements Block {
return power > 0 ? power : (face == BlockFace.SELF ? isBlockIndirectlyPowered() : isBlockFaceIndirectlyPowered(face)) ? 15 : 0;
}
@Override
public int getBlockPower() {
return getBlockPower(BlockFace.SELF);
}
@Override
public boolean isEmpty() {
return getNMS().isAir();
}
@Override
public boolean isLiquid() {
return (getType() == Material.WATER) || (getType() == Material.LAVA);
}
@Override
public PistonMoveReaction getPistonMoveReaction() {
return PistonMoveReaction.getById(getNMS().getPushReaction().ordinal());
}
@Override
public boolean breakNaturally() {
return breakNaturally(new ItemStack(Material.AIR));
}
@Override
public boolean breakNaturally(ItemStack item) {
// Order matters here, need to drop before setting to air so skulls can get their data
net.minecraft.server.Block block = this.getNMSBlock();
@@ -574,27 +607,33 @@ public class CraftBlock implements Block {
return setTypeAndData(Blocks.AIR.getBlockData(), true) && result;
}
@Override
public Collection<ItemStack> getDrops() {
return getDrops(new ItemStack(Material.AIR));
}
@Override
public Collection<ItemStack> getDrops(ItemStack item) {
return net.minecraft.server.Block.getDrops(getNMS(), (WorldServer) world.getMinecraftWorld(), position, world.getTileEntity(position), null, CraftItemStack.asNMSCopy(item))
.stream().map(CraftItemStack::asBukkitCopy).collect(Collectors.toList());
}
@Override
public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
getCraftWorld().getBlockMetadata().setMetadata(this, metadataKey, newMetadataValue);
}
@Override
public List<MetadataValue> getMetadata(String metadataKey) {
return getCraftWorld().getBlockMetadata().getMetadata(this, metadataKey);
}
@Override
public boolean hasMetadata(String metadataKey) {
return getCraftWorld().getBlockMetadata().hasMetadata(this, metadataKey);
}
@Override
public void removeMetadata(String metadataKey, Plugin owningPlugin) {
getCraftWorld().getBlockMetadata().removeMetadata(this, metadataKey, owningPlugin);
}

22
paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
View File

@@ -56,23 +56,28 @@ public class CraftBlockState implements BlockState {
return new CraftBlockState(world.getWorld().getBlockAt(pos.getX(), pos.getY(), pos.getZ()), flag);
}
@Override
public World getWorld() {
requirePlaced();
return world;
}
@Override
public int getX() {
return position.getX();
}
@Override
public int getY() {
return position.getY();
}
@Override
public int getZ() {
return position.getZ();
}
@Override
public Chunk getChunk() {
requirePlaced();
return chunk;
@@ -101,6 +106,7 @@ public class CraftBlockState implements BlockState {
this.data = ((CraftBlockData) data).getState();
}
@Override
public void setData(final MaterialData data) {
Material mat = CraftMagicNumbers.getMaterial(this.data).getItemType();
@@ -116,10 +122,12 @@ public class CraftBlockState implements BlockState {
}
}
@Override
public MaterialData getData() {
return CraftMagicNumbers.getMaterial(data);
}
@Override
public void setType(final Material type) {
Preconditions.checkArgument(type != null, "Material cannot be null");
Preconditions.checkArgument(type.isBlock(), "Material must be a block!");
@@ -129,6 +137,7 @@ public class CraftBlockState implements BlockState {
}
}
@Override
public Material getType() {
return CraftMagicNumbers.getMaterial(data.getBlock());
}
@@ -141,23 +150,28 @@ public class CraftBlockState implements BlockState {
return flag;
}
@Override
public byte getLightLevel() {
return getBlock().getLightLevel();
}
@Override
public CraftBlock getBlock() {
requirePlaced();
return CraftBlock.at(world.getHandle(), position);
}
@Override
public boolean update() {
return update(false);
}
@Override
public boolean update(boolean force) {
return update(force, true);
}
@Override
public boolean update(boolean force, boolean applyPhysics) {
if (!isPlaced()) {
return true;
@@ -187,14 +201,17 @@ public class CraftBlockState implements BlockState {
return true;
}
@Override
public byte getRawData() {
return CraftMagicNumbers.toLegacyData(data);
}
@Override
public Location getLocation() {
return new Location(world, getX(), getY(), getZ());
}
@Override
public Location getLocation(Location loc) {
if (loc != null) {
loc.setWorld(world);
@@ -208,6 +225,7 @@ public class CraftBlockState implements BlockState {
return loc;
}
@Override
public void setRawData(byte data) {
this.data = CraftMagicNumbers.getBlock(getType(), data);
}
@@ -242,21 +260,25 @@ public class CraftBlockState implements BlockState {
return hash;
}
@Override
public void setMetadata(String metadataKey, MetadataValue newMetadataValue) {
requirePlaced();
chunk.getCraftWorld().getBlockMetadata().setMetadata(getBlock(), metadataKey, newMetadataValue);
}
@Override
public List<MetadataValue> getMetadata(String metadataKey) {
requirePlaced();
return chunk.getCraftWorld().getBlockMetadata().getMetadata(getBlock(), metadataKey);
}
@Override
public boolean hasMetadata(String metadataKey) {
requirePlaced();
return chunk.getCraftWorld().getBlockMetadata().hasMetadata(getBlock(), metadataKey);
}
@Override
public void removeMetadata(String metadataKey, Plugin owningPlugin) {
requirePlaced();
chunk.getCraftWorld().getBlockMetadata().removeMetadata(getBlock(), metadataKey, owningPlugin);