PaperMC/Spigot-API-Patches/0005-Some-1.8-features.patch
2014-11-28 14:19:08 -06:00

174 lines
5.4 KiB
Diff

From a638c19165d7c6b06753762109c8ad69e76bef72 Mon Sep 17 00:00:00 2001
From: Zach Brown <Zbob750@live.com>
Date: Sun, 7 Sep 2014 14:56:25 -0500
Subject: [PATCH] Some 1.8 features
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index c45c180..5752c0f 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -229,12 +229,43 @@ public enum Material {
LOG_2(162),
ACACIA_STAIRS(163, Stairs.class),
DARK_OAK_STAIRS(164, Stairs.class),
+ // PaperSpigot start - Add new 1.8 blocks
+ SLIME_BLOCK(165),
+ BARRIER_BLOCK(166),
+ IRON_TRAPDOOR(167, TrapDoor.class),
+ PRISMARINE_BLOCK(168),
+ LANTERN_BLOCK(169),
+ // PaperSpigot end
HAY_BLOCK(170),
CARPET(171),
HARD_CLAY(172),
COAL_BLOCK(173),
PACKED_ICE(174),
DOUBLE_PLANT(175),
+ // PaperSpigot start - Add more new 1.8 blocks
+ STANDING_BANNER(176),
+ HANGING_BANNER(177),
+ NIGHTLIGHT_DETECTOR(178),
+ RED_SANDSTONE(179),
+ RED_SANDSTONE_STAIRS(180),
+ DOUBLE_STEP2(181, Step.class),
+ STEP2(182),
+ SPRUCE_FENCE_GATE(183, Gate.class),
+ BIRCH_FENCE_GATE(184, Gate.class),
+ JUNGLE_FENCE_GATE(185, Gate.class),
+ DARK_OAK_FENCE_GATE(186, Gate.class),
+ ACACIA_FENCE_GATE(187, Gate.class),
+ SPRUCE_FENCE(188),
+ BIRCH_FENCE(189),
+ JUNGLE_FENCE(190),
+ DARK_OAK_FENCE(191),
+ ACACIA_FENCE(192),
+ SPRUCE_DOOR_BLOCK(193),
+ BIRCH_DOOR_BLOCK(194),
+ JUNGLE_DOOR_BLOCK(195),
+ ACACIA_DOOR_BLOCK(196),
+ DARK_OAK_DOOR_BLOCK(197),
+ // PaperSpigot end
// ----- Item Separator -----
IRON_SPADE(256, 1, 250),
IRON_PICKAXE(257, 1, 250),
@@ -401,6 +432,15 @@ public enum Material {
LEASH(420),
NAME_TAG(421),
COMMAND_MINECART(422, 1),
+ // PaperSpigot start - Add new items
+ RAW_MUTTON(423),
+ COOKED_MUTTON(424),
+ SPRUCE_DOOR(427),
+ BIRCH_DOOR(428),
+ JUNGLE_DOOR(429),
+ ACACIA_DOOR(430),
+ DARK_OAK_DOOR(431),
+ // PaperSpigot end
GOLD_RECORD(2256, 1),
GREEN_RECORD(2257, 1),
RECORD_3(2258, 1),
@@ -558,6 +598,8 @@ public enum Material {
case GOLDEN_APPLE:
case ROTTEN_FLESH:
case SPIDER_EYE:
+ case RAW_MUTTON:
+ case COOKED_MUTTON:
return true;
default:
return false;
@@ -777,6 +819,29 @@ public enum Material {
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
case PACKED_ICE:
+ // PaperSpigot start - Add new block types
+ case PRISMARINE_BLOCK:
+ case NIGHTLIGHT_DETECTOR:
+ case RED_SANDSTONE:
+ case RED_SANDSTONE_STAIRS:
+ case DOUBLE_STEP2:
+ case STEP2:
+ case SPRUCE_FENCE_GATE:
+ case BIRCH_FENCE_GATE:
+ case JUNGLE_FENCE_GATE:
+ case DARK_OAK_FENCE_GATE:
+ case ACACIA_FENCE_GATE:
+ case SPRUCE_FENCE:
+ case BIRCH_FENCE:
+ case JUNGLE_FENCE:
+ case DARK_OAK_FENCE:
+ case ACACIA_FENCE:
+ case SPRUCE_DOOR_BLOCK:
+ case BIRCH_DOOR_BLOCK:
+ case JUNGLE_DOOR_BLOCK:
+ case ACACIA_DOOR_BLOCK:
+ case DARK_OAK_DOOR_BLOCK:
+ // PaperSpigot end
return true;
default:
return false;
@@ -837,6 +902,13 @@ public enum Material {
case ACTIVATOR_RAIL:
case CARPET:
case DOUBLE_PLANT:
+ // PaperSpigot start - Add new block types
+ case SLIME_BLOCK:
+ case BARRIER_BLOCK:
+ case LANTERN_BLOCK:
+ case STANDING_BANNER:
+ case HANGING_BANNER:
+ // PaperSpigot end
return true;
default:
return false;
@@ -889,6 +961,23 @@ public enum Material {
case LOG_2:
case ACACIA_STAIRS:
case DARK_OAK_STAIRS:
+ // PaperSpigot start - Add new blocks
+ case SPRUCE_FENCE_GATE:
+ case BIRCH_FENCE_GATE:
+ case JUNGLE_FENCE_GATE:
+ case DARK_OAK_FENCE_GATE:
+ case ACACIA_FENCE_GATE:
+ case SPRUCE_FENCE:
+ case BIRCH_FENCE:
+ case JUNGLE_FENCE:
+ case DARK_OAK_FENCE:
+ case ACACIA_FENCE:
+ case SPRUCE_DOOR_BLOCK:
+ case BIRCH_DOOR_BLOCK:
+ case JUNGLE_DOOR_BLOCK:
+ case ACACIA_DOOR_BLOCK:
+ case DARK_OAK_DOOR_BLOCK:
+ // PaperSpigot end
return true;
default:
return false;
@@ -928,6 +1017,13 @@ public enum Material {
case LOG_2:
case CARPET:
case DOUBLE_PLANT:
+ // PaperSpigot start - Add new block types
+ case SPRUCE_FENCE:
+ case BIRCH_FENCE:
+ case JUNGLE_FENCE:
+ case DARK_OAK_FENCE:
+ case ACACIA_FENCE:
+ // PaperSpigot end
return true;
default:
return false;
@@ -1009,6 +1105,9 @@ public enum Material {
case COAL_BLOCK:
case LOG_2:
case PACKED_ICE:
+ // PaperSpigot start - Add new blocks
+ case DOUBLE_STEP2:
+ // PaperSpigot end
return true;
default:
return false;
--
1.9.1