From c967633d0ae42f3ffa02d2b31ab723db7ab2c6c8 Mon Sep 17 00:00:00 2001 From: Masy98 Date: Wed, 10 Sep 2014 21:02:15 +0200 Subject: Added 1.8 Blocks and Items --- src/BlockID.h | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'src/BlockID.h') diff --git a/src/BlockID.h b/src/BlockID.h index d835f9518..d6712a588 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -175,12 +175,35 @@ enum ENUM_BLOCK_ID E_BLOCK_NEW_LOG = 162, E_BLOCK_ACACIA_WOOD_STAIRS = 163, E_BLOCK_DARK_OAK_WOOD_STAIRS = 164, + E_BLOCK_SLIME_BLOCK = 165, + E_BLOCK_IRON_TRAPDOOR = 167, + E_BLOCK_PRISMARINE_BLOCK = 168, + E_BLOCK_SEA_LANTERN = 169, E_BLOCK_HAY_BALE = 170, E_BLOCK_CARPET = 171, E_BLOCK_HARDENED_CLAY = 172, E_BLOCK_BLOCK_OF_COAL = 173, E_BLOCK_PACKED_ICE = 174, E_BLOCK_BIG_FLOWER = 175, + E_BLOCK_RED_SANDSTONE = 179, + E_BLOCK_RED_SANDSTONE_STAIRS = 180, + E_BLOCK_NEW_STONE_SLAB = 181, + E_BLOCK_SPRUCE_FENCE_GATE = 182, + E_BLOCK_BIRCH_FENCE_GATE = 183, + E_BLOCK_JUNGLE_FENCE_GATE = 184, + E_BLOCK_DARK_OAK_FENCE_GATE = 185, + E_BLOCK_ACACIA_FENCE_GATE = 186, + E_BLOCK_SPRUCE_FENCE = 187, + E_BLOCK_BIRCH_FENCE = 188, + E_BLOCK_JUNGLE_FENCE = 189, + E_BLOCK_DARK_OAK_FENCE = 190, + E_BLOCK_ACACIA_FENCE = 191, + // I don't know which block has the ID 192, maybe there is no block but we have to wait for mcp + E_BLOCK_SPRUCE_DOOR = 193, + E_BLOCK_BIRCH_DOOR = 194, + E_BLOCK_JUNGLE_DOOR = 195, + E_BLOCK_ACACIA_DOOR = 196, + E_BLOCK_DARK_OAK_DOOR = 197, // Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++ // IsValidBlock() depends on this @@ -356,6 +379,14 @@ enum ENUM_ITEM_ID E_ITEM_NETHER_QUARTZ = 406, E_ITEM_MINECART_WITH_TNT = 407, E_ITEM_MINECART_WITH_HOPPER = 408, + E_ITEM_PRISMARINE_SHARD = 409, + E_ITEM_PRISMARINE_CRYSTALS = 410, + E_ITEM_RAW_RABBIT = 411, + E_ITEM_COOKED_RABBIT = 412, + E_ITEM_RABBIT_STEW = 413, + E_ITEM_RABBITS_FOOD = 414, + E_ITEM_RABBIT_HIDE = 415, + E_ITEM_ARMOR_STAND = 416, E_ITEM_IRON_HORSE_ARMOR = 417, E_ITEM_GOLD_HORSE_ARMOR = 418, E_ITEM_DIAMOND_HORSE_ARMOR = 419, @@ -364,6 +395,12 @@ enum ENUM_ITEM_ID E_ITEM_MINECART_WITH_COMMAND_BLOCK = 422, E_ITEM_RAW_MUTTON = 423, E_ITEM_MUTTON = 424, + E_ITEM_BANNER = 425, + E_ITEM_SPRUCE_DOOR = 427, + E_ITEM_BIRCH_DOOR = 428, + E_ITEM_JUNGLE_DOOR = 429, + E_ITEM_ACACIA_DOOR = 430, + E_ITEM_DARK_OAK_DOOR = 431, // Keep these two as the last values of the consecutive list, without a number - they will get their correct number assigned automagically by C++ // IsValidItem() depends on this! -- cgit v1.2.3 From a9b4b60c80f4c23e58adb05622d4a1ff41277d57 Mon Sep 17 00:00:00 2001 From: Masy98 Date: Wed, 10 Sep 2014 21:44:04 +0200 Subject: Added new blocks to the BlockInfo --- src/BlockID.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/BlockID.h') diff --git a/src/BlockID.h b/src/BlockID.h index d6712a588..e7838da27 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -187,18 +187,18 @@ enum ENUM_BLOCK_ID E_BLOCK_BIG_FLOWER = 175, E_BLOCK_RED_SANDSTONE = 179, E_BLOCK_RED_SANDSTONE_STAIRS = 180, - E_BLOCK_NEW_STONE_SLAB = 181, - E_BLOCK_SPRUCE_FENCE_GATE = 182, - E_BLOCK_BIRCH_FENCE_GATE = 183, - E_BLOCK_JUNGLE_FENCE_GATE = 184, - E_BLOCK_DARK_OAK_FENCE_GATE = 185, - E_BLOCK_ACACIA_FENCE_GATE = 186, - E_BLOCK_SPRUCE_FENCE = 187, - E_BLOCK_BIRCH_FENCE = 188, - E_BLOCK_JUNGLE_FENCE = 189, - E_BLOCK_DARK_OAK_FENCE = 190, - E_BLOCK_ACACIA_FENCE = 191, - // I don't know which block has the ID 192, maybe there is no block but we have to wait for mcp + E_BLOCK_DOUBLE_NEW_STONE_SLAB= 181, + E_BLOCK_NEW_STONE_SLAB = 182, + E_BLOCK_SPRUCE_FENCE_GATE = 183, + E_BLOCK_BIRCH_FENCE_GATE = 184, + E_BLOCK_JUNGLE_FENCE_GATE = 185, + E_BLOCK_DARK_OAK_FENCE_GATE = 186, + E_BLOCK_ACACIA_FENCE_GATE = 187, + E_BLOCK_SPRUCE_FENCE = 188, + E_BLOCK_BIRCH_FENCE = 189, + E_BLOCK_JUNGLE_FENCE = 190, + E_BLOCK_DARK_OAK_FENCE = 191, + E_BLOCK_ACACIA_FENCE = 192, E_BLOCK_SPRUCE_DOOR = 193, E_BLOCK_BIRCH_DOOR = 194, E_BLOCK_JUNGLE_DOOR = 195, -- cgit v1.2.3 From 8c3cd18cdd175ea1ca06916e557fdf42d6232d71 Mon Sep 17 00:00:00 2001 From: Masy98 Date: Thu, 11 Sep 2014 15:57:36 +0200 Subject: Added 1.8 food to the food list --- src/BlockID.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/BlockID.h') diff --git a/src/BlockID.h b/src/BlockID.h index e7838da27..623b40b13 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -394,7 +394,7 @@ enum ENUM_ITEM_ID E_ITEM_NAME_TAG = 421, E_ITEM_MINECART_WITH_COMMAND_BLOCK = 422, E_ITEM_RAW_MUTTON = 423, - E_ITEM_MUTTON = 424, + E_ITEM_COOKED_MUTTON = 424, E_ITEM_BANNER = 425, E_ITEM_SPRUCE_DOOR = 427, E_ITEM_BIRCH_DOOR = 428, -- cgit v1.2.3 From 741791ecfc784d5aa0c4e8de11a6f3e99d6cc39d Mon Sep 17 00:00:00 2001 From: Masy98 Date: Thu, 11 Sep 2014 16:07:54 +0200 Subject: Added barrier block --- src/BlockID.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/BlockID.h') diff --git a/src/BlockID.h b/src/BlockID.h index 623b40b13..5f2ff15cc 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -176,6 +176,7 @@ enum ENUM_BLOCK_ID E_BLOCK_ACACIA_WOOD_STAIRS = 163, E_BLOCK_DARK_OAK_WOOD_STAIRS = 164, E_BLOCK_SLIME_BLOCK = 165, + E_BLOCK_BARRIER = 166, E_BLOCK_IRON_TRAPDOOR = 167, E_BLOCK_PRISMARINE_BLOCK = 168, E_BLOCK_SEA_LANTERN = 169, -- cgit v1.2.3 From 7f42ba9fc117674635a840b860f0d3a6de818b99 Mon Sep 17 00:00:00 2001 From: Masy98 Date: Fri, 12 Sep 2014 16:48:37 +0200 Subject: Fixed 1.8 Item stacking and block harvesting --- src/BlockID.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/BlockID.h') diff --git a/src/BlockID.h b/src/BlockID.h index 5f2ff15cc..45e71d85d 100644 --- a/src/BlockID.h +++ b/src/BlockID.h @@ -385,7 +385,7 @@ enum ENUM_ITEM_ID E_ITEM_RAW_RABBIT = 411, E_ITEM_COOKED_RABBIT = 412, E_ITEM_RABBIT_STEW = 413, - E_ITEM_RABBITS_FOOD = 414, + E_ITEM_RABBITS_FOOT = 414, E_ITEM_RABBIT_HIDE = 415, E_ITEM_ARMOR_STAND = 416, E_ITEM_IRON_HORSE_ARMOR = 417, -- cgit v1.2.3