twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-08 08:02:13 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update to Minecraft 1.11

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2016-11-17 12:40:59 +11:00
parent 06e0085b98
commit f1fb3d9462
59 changed files with 646 additions and 682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
paper-api/src/main/java/org/bukkit/Material.java
View File

@@ -286,6 +286,23 @@ public enum Material {
RED_NETHER_BRICK(215),
BONE_BLOCK(216),
STRUCTURE_VOID(217),
OBSERVER(218),
WHITE_SHULKER_BOX(219, 1),
ORANGE_SHULKER_BOX(220, 1),
MAGENTA_SHULKER_BOX(221, 1),
LIGHT_BLUE_SHULKER_BOX(222, 1),
YELLOW_SHULKER_BOX(223, 1),
LIME_SHULKER_BOX(224, 1),
PINK_SHULKER_BOX(225, 1),
GRAY_SHULKER_BOX(226, 1),
SILVER_SHULKER_BOX(227, 1),
CYAN_SHULKER_BOX(228, 1),
PURPLE_SHULKER_BOX(229, 1),
BLUE_SHULKER_BOX(230, 1),
BROWN_SHULKER_BOX(231, 1),
GREEN_SHULKER_BOX(232, 1),
RED_SHULKER_BOX(233, 1),
BLACK_SHULKER_BOX(234, 1),
STRUCTURE_BLOCK(255),
// ----- Item Separator -----
IRON_SPADE(256, 1, 250),
@@ -484,6 +501,8 @@ public enum Material {
BOAT_JUNGLE(446, 1),
BOAT_ACACIA(447, 1),
BOAT_DARK_OAK(448, 1),
TOTEM(449, 1),
SHULKER_SHELL(450),
GOLD_RECORD(2256, 1),
GREEN_RECORD(2257, 1),
RECORD_3(2258, 1),
@@ -735,8 +754,7 @@ public enum Material {
}
/**
* Check if the material is a block and solid (cannot be passed through by
* a player)
* Check if the material is a block and solid (can be built upon)
*
* @return True if this material is a block and solid
*/
@@ -909,6 +927,23 @@ public enum Material {
case NETHER_WART_BLOCK:
case RED_NETHER_BRICK:
case BONE_BLOCK:
case OBSERVER:
case WHITE_SHULKER_BOX:
case ORANGE_SHULKER_BOX:
case MAGENTA_SHULKER_BOX:
case LIGHT_BLUE_SHULKER_BOX:
case YELLOW_SHULKER_BOX:
case LIME_SHULKER_BOX:
case PINK_SHULKER_BOX:
case GRAY_SHULKER_BOX:
case SILVER_SHULKER_BOX:
case CYAN_SHULKER_BOX:
case PURPLE_SHULKER_BOX:
case BLUE_SHULKER_BOX:
case BROWN_SHULKER_BOX:
case GREEN_SHULKER_BOX:
case RED_SHULKER_BOX:
case BLACK_SHULKER_BOX:
return true;
default:
return false;