Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/

1 files changed, 53 insertions, 2 deletions

diff --git a/src/test/java/org/bukkit/support/AbstractTestingBase.java b/src/test/java/org/bukkit/support/AbstractTestingBase.java
index 7c4484f0..b280ebe4 100644
--- a/src/test/java/org/bukkit/support/AbstractTestingBase.java
+++ b/src/test/java/org/bukkit/support/AbstractTestingBase.java
@@ -15,11 +15,62 @@ import org.junit.BeforeClass;
  *  extend this class to solve it.
  */
 public abstract class AbstractTestingBase {
-    public static final List<Material> INVALIDATED_MATERIALS = ImmutableList.<Material>builder().add(Material.BREWING_STAND, Material.BED_BLOCK, Material.NETHER_WARTS, Material.CAULDRON, Material.FLOWER_POT, Material.CROPS, Material.SUGAR_CANE_BLOCK, Material.CAKE_BLOCK, Material.SKULL, Material.PISTON_EXTENSION, Material.PISTON_MOVING_PIECE, Material.GLOWING_REDSTONE_ORE, Material.DIODE_BLOCK_ON, Material.PUMPKIN_STEM, Material.SIGN_POST, Material.REDSTONE_COMPARATOR_ON, Material.TRIPWIRE, Material.REDSTONE_LAMP_ON, Material.MELON_STEM, Material.REDSTONE_TORCH_OFF, Material.REDSTONE_COMPARATOR_OFF, Material.REDSTONE_WIRE, Material.WALL_SIGN, Material.DIODE_BLOCK_OFF, Material.IRON_DOOR_BLOCK, Material.WOODEN_DOOR).add(Material.LOCKED_CHEST).build();
+    public static final List<Material> INVALIDATED_MATERIALS = ImmutableList.<Material>builder()
+            .add(
+                    Material.BREWING_STAND,
+                    Material.BED_BLOCK,
+                    Material.NETHER_WARTS,
+                    Material.CAULDRON,
+                    Material.FLOWER_POT,
+                    Material.CROPS,
+                    Material.SUGAR_CANE_BLOCK,
+                    Material.CAKE_BLOCK,
+                    Material.SKULL,
+                    Material.PISTON_EXTENSION,
+                    Material.PISTON_MOVING_PIECE,
+                    Material.GLOWING_REDSTONE_ORE,
+                    Material.DIODE_BLOCK_ON,
+                    Material.PUMPKIN_STEM,
+                    Material.SIGN_POST,
+                    Material.REDSTONE_COMPARATOR_ON,
+                    Material.TRIPWIRE,
+                    Material.REDSTONE_LAMP_ON,
+                    Material.MELON_STEM,
+                    Material.REDSTONE_TORCH_OFF,
+                    Material.REDSTONE_COMPARATOR_OFF,
+                    Material.REDSTONE_WIRE,
+                    Material.WALL_SIGN,
+                    Material.DIODE_BLOCK_OFF,
+                    Material.IRON_DOOR_BLOCK,
+                    Material.WOODEN_DOOR,
+                    Material.LOCKED_CHEST,
+                    Material.WATER,
+                    Material.STATIONARY_WATER,
+                    Material.LAVA,
+                    Material.STATIONARY_LAVA,
+                    Material.DOUBLE_STEP,
+                    Material.DOUBLE_STEP,
+                    Material.FIRE,
+                    Material.PORTAL,
+                    Material.ENDER_PORTAL,
+                    Material.WOOD_DOUBLE_STEP,
+                    Material.COCOA,
+                    Material.CARROT,
+                    Material.POTATO,
+                    Material.STANDING_BANNER,
+                    Material.WALL_BANNER,
+                    Material.DAYLIGHT_DETECTOR_INVERTED,
+                    Material.DOUBLE_STONE_SLAB2,
+                    Material.SPRUCE_DOOR,
+                    Material.BIRCH_DOOR,
+                    Material.JUNGLE_DOOR,
+                    Material.ACACIA_DOOR,
+                    Material.DARK_OAK_DOOR
+            ).build();
 
     @BeforeClass
     public static void setup() {
-        DispenserRegistry.b();
+        DispenserRegistry.c();
         DummyServer.setup();
         DummyPotions.setup();
         DummyEnchantments.setup();