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

Update to Minecraft 1.13-pre7

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2018-07-15 10:00:00 +10:00
parent debc7172fd
commit 767e4f6ccf
199 changed files with 8301 additions and 3637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
paper-api/src/main/java/org/bukkit/material/Mushroom.java
View File

@@ -12,8 +12,8 @@ import org.bukkit.material.types.MushroomBlockTexture;
* Represents a huge mushroom block with certain combinations of faces set to
* cap, pores or stem.
*
* @see Material#HUGE_MUSHROOM_1
* @see Material#HUGE_MUSHROOM_2
* @see Material#LEGACY_HUGE_MUSHROOM_1
* @see Material#LEGACY_HUGE_MUSHROOM_2
*/
public class Mushroom extends MaterialData {
private static final byte NORTH_LIMIT = 4;
@@ -29,12 +29,12 @@ public class Mushroom extends MaterialData {
*
* @param shroom A brown or red mushroom material type.
*
* @see Material#HUGE_MUSHROOM_1
* @see Material#HUGE_MUSHROOM_2
* @see Material#LEGACY_HUGE_MUSHROOM_1
* @see Material#LEGACY_HUGE_MUSHROOM_2
*/
public Mushroom(Material shroom) {
super(shroom);
Validate.isTrue(shroom == Material.HUGE_MUSHROOM_1 || shroom == Material.HUGE_MUSHROOM_2, "Not a mushroom!");
Validate.isTrue(shroom == Material.LEGACY_HUGE_MUSHROOM_1 || shroom == Material.LEGACY_HUGE_MUSHROOM_2, "Not a mushroom!");
}
/**
@@ -50,8 +50,8 @@ public class Mushroom extends MaterialData {
* @param shroom A brown or red mushroom material type.
* @param capFace The face or faces to set to mushroom cap texture.
*
* @see Material#HUGE_MUSHROOM_1
* @see Material#HUGE_MUSHROOM_2
* @see Material#LEGACY_HUGE_MUSHROOM_1
* @see Material#LEGACY_HUGE_MUSHROOM_2
* @see BlockFace
*/
public Mushroom(Material shroom, BlockFace capFace) {
@@ -64,8 +64,8 @@ public class Mushroom extends MaterialData {
* @param shroom A brown or red mushroom material type.
* @param texture The textured mushroom faces.
*
* @see Material#HUGE_MUSHROOM_1
* @see Material#HUGE_MUSHROOM_2
* @see Material#LEGACY_HUGE_MUSHROOM_1
* @see Material#LEGACY_HUGE_MUSHROOM_2
*/
public Mushroom(Material shroom, MushroomBlockTexture texture) {
this(shroom, texture.getData());
@@ -79,18 +79,7 @@ public class Mushroom extends MaterialData {
@Deprecated
public Mushroom(Material shroom, byte data) {
super(shroom, data);
Validate.isTrue(shroom == Material.HUGE_MUSHROOM_1 || shroom == Material.HUGE_MUSHROOM_2, "Not a mushroom!");
}
/**
* @param type the raw type id
* @param data the raw data value
* @deprecated Magic value
*/
@Deprecated
public Mushroom(int type, byte data) {
super(type, data);
Validate.isTrue(type == Material.HUGE_MUSHROOM_1.getId() || type == Material.HUGE_MUSHROOM_2.getId(), "Not a mushroom!");
Validate.isTrue(shroom == Material.LEGACY_HUGE_MUSHROOM_1 || shroom == Material.LEGACY_HUGE_MUSHROOM_2, "Not a mushroom!");
}
/**
@@ -284,7 +273,7 @@ public class Mushroom extends MaterialData {
@Override
public String toString() {
return Material.getMaterial(getItemTypeId()).toString() + (isStem() ? " STEM " : " CAP ") + getPaintedFaces();
return getItemType() + (isStem() ? " STEM " : " CAP ") + getPaintedFaces();
}
@Override