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

SPIGOT-1389: Fixed issues with setting tree species by expanding API

Browse Source 
By: ryanbennitt <ryanbennitt@googlemail.com>
This commit is contained in:
Bukkit/Spigot
2016-03-01 08:30:03 +11:00
parent 96968d5bb4
commit f2fcb9f8bd
7 changed files with 697 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
paper-api/src/main/java/org/bukkit/material/Leaves.java
View File

@@ -4,16 +4,41 @@ import org.bukkit.Material;
import org.bukkit.TreeSpecies;
/**
* Represents the different types of leaves.
* Represents the different types of leaf block that may be permanent or can
* decay when too far from a log.
*
* @see Material.LEAVES
* @see Material.LEAVES_2
*/
public class Leaves extends MaterialData {
public class Leaves extends Wood {
protected static final Material DEFAULT_TYPE = Material.LEAVES;
protected static final boolean DEFAULT_DECAYABLE = true;
/**
* Constructs a leaf block.
*/
public Leaves() {
super(Material.LEAVES);
this(DEFAULT_TYPE, DEFAULT_SPECIES, DEFAULT_DECAYABLE);
}
/**
* Constructs a leaf block of the given tree species.
*
* @param species the species of the wood block
*/
public Leaves(TreeSpecies species) {
this();
setSpecies(species);
this(DEFAULT_TYPE, species, DEFAULT_DECAYABLE);
}
/**
* Constructs a leaf block of the given tree species and flag for whether
* this leaf block will disappear when too far from a log.
*
* @param species the species of the wood block
* @param isDecayable whether the block is permanent or can disappear
*/
public Leaves(TreeSpecies species, boolean isDecayable) {
this(DEFAULT_TYPE, species, isDecayable);
}
/**
@@ -25,8 +50,36 @@ public class Leaves extends MaterialData {
super(type);
}
/**
* Constructs a leaf block of the given type.
*
* @param type the type of leaf block
*/
public Leaves(final Material type) {
super(type);
this(type, DEFAULT_SPECIES, DEFAULT_DECAYABLE);
}
/**
* Constructs a leaf block of the given type and tree species.
*
* @param type the type of leaf block
* @param species the species of the wood block
*/
public Leaves(final Material type, TreeSpecies species) {
this(type, species, DEFAULT_DECAYABLE);
}
/**
* Constructs a leaf block of the given type and tree species and flag for
* whether this leaf block will disappear when too far from a log.
*
* @param type the type of leaf block
* @param species the species of the wood block
* @param isDecayable whether the block is permanent or can disappear
*/
public Leaves(final Material type, TreeSpecies species, boolean isDecayable) {
super(type, species);
setDecayable(isDecayable);
}
/**
@@ -50,26 +103,50 @@ public class Leaves extends MaterialData {
}
/**
* Gets the current species of this leave
* Checks if this leaf block is in the process of decaying
*
* @return TreeSpecies of this leave
* @return true if the leaf block is in the process of decaying
*/
public TreeSpecies getSpecies() {
return TreeSpecies.getByData((byte) (getData() & 3));
public boolean isDecaying() {
return (getData() & 0x8) != 0;
}
/**
* Sets the species of this leave
* Set whether this leaf block is in the process of decaying
*
* @param species New species of this leave
* @param isDecaying whether the block is decaying or not
*/
public void setSpecies(TreeSpecies species) {
setData(species.getData());
public void setDecaying(boolean isDecaying) {
setData((byte) ((getData() & 0x3) | (isDecaying
? 0x8 // Clear the permanent flag to make this a decayable flag and set the decaying flag
: (getData() & 0x4)))); // Only persist the decayable flag if this is not a decaying block
}
/**
* Checks if this leaf block is permanent or can decay when too far from a
* log
*
* @return true if the leaf block is permanent or can decay when too far
* from a log
*/
public boolean isDecayable() {
return (getData() & 0x4) == 0;
}
/**
* Set whether this leaf block will disappear when too far from a log
*
* @param isDecayable whether the block is permanent or can disappear
*/
public void setDecayable(boolean isDecayable) {
setData((byte) ((getData() & 0x3) | (isDecayable
? (getData() & 0x8) // Only persist the decaying flag if this is a decayable block
: 0x4)));
}
@Override
public String toString() {
return getSpecies() + " " + super.toString();
return getSpecies() + (isDecayable() ? " DECAYABLE " : " PERMANENT ") + (isDecaying() ? " DECAYING " : " ") + super.toString();
}
@Override