From 0d88d69fd9a83c724933c5359b41c73e07db4548 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Thu, 1 Mar 2012 10:48:44 +0000 Subject: [PATCH] Updated Bukkit API for 1.2 By: Nathan Adams --- paper-api/pom.xml | 2 +- paper-api/src/main/java/org/bukkit/Material.java | 6 +++++- paper-api/src/main/java/org/bukkit/block/Biome.java | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/paper-api/pom.xml b/paper-api/pom.xml index 8f261d9eb8..615a33a724 100644 --- a/paper-api/pom.xml +++ b/paper-api/pom.xml @@ -2,7 +2,7 @@ 4.0.0 org.bukkit bukkit - 1.1-R6 + 1.2.2-R0-SNAPSHOT Bukkit http://www.bukkit.org diff --git a/paper-api/src/main/java/org/bukkit/Material.java b/paper-api/src/main/java/org/bukkit/Material.java index 942957c7d0..b184079ee2 100644 --- a/paper-api/src/main/java/org/bukkit/Material.java +++ b/paper-api/src/main/java/org/bukkit/Material.java @@ -141,6 +141,8 @@ public enum Material { ENDER_PORTAL_FRAME(120), ENDER_STONE(121), DRAGON_EGG(122), + REDSTONE_LAMP_OFF(123), + REDSTONE_LAMP_ON(124), // ----- Item Separator ----- IRON_SPADE(256, 1, 250), IRON_PICKAXE(257, 1, 250), @@ -275,7 +277,9 @@ public enum Material { CAULDRON_ITEM(380), EYE_OF_ENDER(381), SPECKLED_MELON(382), - MONSTER_EGG(383, 1, SpawnEgg.class), + MONSTER_EGG(383, 64, SpawnEgg.class), + EXP_BOTTLE(384, 64), + FIREBALL(385, 64), GOLD_RECORD(2256, 1), GREEN_RECORD(2257, 1), RECORD_3(2258, 1), diff --git a/paper-api/src/main/java/org/bukkit/block/Biome.java b/paper-api/src/main/java/org/bukkit/block/Biome.java index 93cdbe0bee..3c95e46941 100644 --- a/paper-api/src/main/java/org/bukkit/block/Biome.java +++ b/paper-api/src/main/java/org/bukkit/block/Biome.java @@ -30,5 +30,7 @@ public enum Biome { DESERT_HILLS, FOREST_HILLS, TAIGA_HILLS, - SMALL_MOUNTAINS + SMALL_MOUNTAINS, + JUNGLE, + JUNGLE_HILLS }