From fd901e3d7cd87f61bb47349cf6415637a461d2ba Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 13:37:39 +0100 Subject: [PATCH 01/19] Added the new enchantments of Minecraft 1.7 Added the following enchantments : Luck of the Sea : ID = 61 Lure : ID = 62 --- source/Enchantments.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/Enchantments.h b/source/Enchantments.h index cda743daf..a6b4a53cd 100644 --- a/source/Enchantments.h +++ b/source/Enchantments.h @@ -1,4 +1,3 @@ - // Enchantments.h // Declares the cEnchantments class representing a storage for item enchantments and stored-enchantments @@ -58,6 +57,8 @@ public: enchPunch = 49, enchFlame = 50, enchInfinity = 51, + enchLuckOfTheSea = 61, + enchLure = 62, } ; /// Creates an empty enchantments container From 047995ef25f90f84d7a38c228fdcbbbb683623e4 Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 13:41:39 +0100 Subject: [PATCH 02/19] Added the new enchantments of Minecraft 1.7 -Luck of the sea -Lure --- source/Enchantments.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/Enchantments.cpp b/source/Enchantments.cpp index 0caf4eb11..c74969802 100644 --- a/source/Enchantments.cpp +++ b/source/Enchantments.cpp @@ -1,4 +1,3 @@ - // Enchantments.cpp // Implements the cEnchantments class representing a storage for item enchantments and stored-enchantments @@ -179,6 +178,8 @@ int cEnchantments::StringToEnchantmentID(const AString & a_EnchantmentName) { enchPunch, "Punch"}, { enchFlame, "Flame"}, { enchInfinity, "Infinity"}, + { enchLuckOfTheSea "LuckOfTheSea"}, + { enchLure "Lure"}, } ; for (int i = 0; i < ARRAYCOUNT(EnchantmentNames); i++) { From 6cbf205b9444e1606396f81e2a7bc4952de930e6 Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 14:32:23 +0100 Subject: [PATCH 03/19] Update in progress to minecraft 1.7 --- source/BlockID.h | 86 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 82 insertions(+), 4 deletions(-) diff --git a/source/BlockID.h b/source/BlockID.h index 28725406d..1ac3ee657 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -40,8 +40,8 @@ enum ENUM_BLOCK_ID E_BLOCK_PISTON_EXTENSION = 34, E_BLOCK_WOOL = 35, E_BLOCK_PISTON_MOVED_BLOCK = 36, - E_BLOCK_YELLOW_FLOWER = 37, - E_BLOCK_RED_ROSE = 38, + E_BLOCK_DANDELION = 37, + E_BLOCK_FLOWER = 38, E_BLOCK_BROWN_MUSHROOM = 39, E_BLOCK_RED_MUSHROOM = 40, E_BLOCK_GOLD_BLOCK = 41, @@ -102,7 +102,7 @@ enum ENUM_BLOCK_ID E_BLOCK_CAKE = 92, E_BLOCK_REDSTONE_REPEATER_OFF = 93, E_BLOCK_REDSTONE_REPEATER_ON = 94, - E_BLOCK_LOCKED_CHEST = 95, + E_BLOCK_STAINED_GLASS = 95, E_BLOCK_TRAPDOOR = 96, E_BLOCK_SILVERFISH_EGG = 97, E_BLOCK_STONE_BRICKS = 98, @@ -170,10 +170,17 @@ enum ENUM_BLOCK_ID E_BLOCK_DROPPER = 158, E_BLOCK_STAINED_CLAY = 159, + E_BLOCK_STAINED_GLASS_PANE = 160, + E_BLOCK_NEW_LEAVES = 161, // Acacia and Dark Oak IDs in Minecraft 1.7.x + E_BLOCK_NEW_LOG = 162, + E_BLOCK_ACACIA_WOOD_STAIRS = 163, + E_BLOCK_DARK_OAK_WOOD_STAIRS = 164, ///////////////////////////////// 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, // Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++ // IsValidBlock() depends on this @@ -343,7 +350,12 @@ enum ENUM_ITEM_ID E_ITEM_NETHER_QUARTZ = 406, E_ITEM_MINECART_WITH_TNT = 407, E_ITEM_MINECART_WITH_HOPPER = 408, - // TODO: Add horse armour/horse paraphernalia + E_ITEM_IRON_HORSE_ARMOR = 417, + E_ITEM_GOLD_HORSE_ARMOR = 418, + E_ITEM_DIAMOND_HORSE_ARMOR = 419, + E_ITEM_LEAD = 420, + E_ITEM_NAME_TAG = 421, + E_ITEM_MINECART_WITH_COMMAND_BLOCK = 422, // 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! @@ -489,12 +501,16 @@ enum E_META_WOODEN_DOUBLE_SLAB_CONIFER = 1, E_META_WOODEN_DOUBLE_SLAB_BIRCH = 2, E_META_WOODEN_DOUBLE_SLAB_JUNGLE = 3, + E_META_WOODEN_DOUBLE_SLAB_ACACIA = 4, + E_META_WOODEN_DOUBLE_SLAB_DARK_OAK = 5, // E_BLOCK_WOODEN_SLAB metas: E_META_WOODEN_SLAB_APPLE = 0, E_META_WOODEN_SLAB_CONIFER = 1, E_META_WOODEN_SLAB_BIRCH = 2, E_META_WOODEN_SLAB_JUNGLE = 3, + E_META_WOODEN_SLAB_ACACIA = 4, + E_META_WOODEN_SLAB_DARK_OAK = 5, // E_BLOCK_WOOL metas: E_META_WOOL_WHITE = 0, @@ -549,6 +565,42 @@ enum E_META_STAINED_CLAY_GREEN = 13, E_META_STAINED_CLAY_RED = 14, E_META_STAINED_CLAY_BLACK = 15, + + // E_BLOCK_STAINED_GLASS metas + E_META_STAINED_GLASS_WHITE = 0, + E_META_STAINED_GLASS_ORANGE = 1, + E_META_STAINED_GLASS_MAGENTA = 2, + E_META_STAINED_GLASS_LIGHTBLUE = 3, + E_META_STAINED_GLASS_YELLOW = 4, + E_META_STAINED_GLASS_LIGHTGREEN = 5, + E_META_STAINED_GLASS_PINK = 6, + E_META_STAINED_GLASS_GRAY = 7, + E_META_STAINED_GLASS_LIGHTGRAY = 8, + E_META_STAINED_GLASS_CYAN = 9, + E_META_STAINED_GLASS_PURPLE = 10, + E_META_STAINED_GLASS_BLUE = 11, + E_META_STAINED_GLASS_BROWN = 12, + E_META_STAINED_GLASS_GREEN = 13, + E_META_STAINED_GLASS_RED = 14, + E_META_STAINED_GLASS_BLACK = 15, + + // E_BLOCK_STAINED_GLASS_PANE metas + E_META_STAINED_GLASS_PANE_WHITE = 0, + E_META_STAINED_GLASS_PANE_ORANGE = 1, + E_META_STAINED_GLASS_PANE_MAGENTA = 2, + E_META_STAINED_GLASS_PANE_LIGHTBLUE = 3, + E_META_STAINED_GLASS_PANE_YELLOW = 4, + E_META_STAINED_GLASS_PANE_LIGHTGREEN = 5, + E_META_STAINED_GLASS_PANE_PINK = 6, + E_META_STAINED_GLASS_PANE_GRAY = 7, + E_META_STAINED_GLASS_PANE_LIGHTGRAY = 8, + E_META_STAINED_GLASS_PANE_CYAN = 9, + E_META_STAINED_GLASS_PANE_PURPLE = 10, + E_META_STAINED_GLASS_PANE_BLUE = 11, + E_META_STAINED_GLASS_PANE_BROWN = 12, + E_META_STAINED_GLASS_PANE_GREEN = 13, + E_META_STAINED_GLASS_PANE_RED = 14, + E_META_STAINED_GLASS_PANE_BLACK = 15, // E_BLOCK_SNOW metas: E_META_SNOW_LAYER_ONE = 0, @@ -571,6 +623,32 @@ enum E_META_RAIL_CURVED_ZP_XM = 7, E_META_RAIL_CURVED_ZM_XM = 8, E_META_RAIL_CURVED_ZM_XP = 9, + + //E_BLOCK_NEW_LEAVES metas + E_META_NEW_LEAVES_ACACIA_WOOD = 0, + E_META_NEW_LEAVES_DARK_OAK_WOOD = 1, + + //E_BLOCK_NEW_LOG metas + E_META_NEW_LOG_ACACIA_WOOD = 0, + E_META_NEW_LOG_DARK_OAK_WOOD = 1, + + //E_BLOCK_FLOWER metas + E_META_FLOWER_POPPY = 0, + E_META_FLOWER_BLUE_ORCHID = 1, + E_META_FLOWER_ALLIUM = 2, + E_META_FLOWER_RED_TULIP = 4, + E_META_FLOWER_ORANGE_TULIP = 5, + E_META_FLOWER_WHITE_TULIP = 6, + E_META_FLOWER_PINK_TULIP = 7, + E_META_FLOWER_OXEYE_DAISY = 8, + + //E_BLOCK_BIG_FLOWER metas + E_META_BIG_FLOWER_SUNFLOWER = 0, + E_META_BIG_FLOWER_LILAC = 1, + E_META_BIG_FLOWER_DOUBLE_TALL_GRASS = 2, + E_META_BIG_FLOWER_LARGE_FERN = 3, + E_META_BIG_FLOWER_ROSE_BUSH = 4, + E_META_BIG_FLOWER_PEONY = 5, /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Item metas: From ca7b3c72ad6bb614eefe4506cfd040d8c6723222 Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 14:47:34 +0100 Subject: [PATCH 04/19] Update BlockID.h --- source/BlockID.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/source/BlockID.h b/source/BlockID.h index 1ac3ee657..b105ecc85 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -678,6 +678,18 @@ enum // E_ITEM_GOLDEN_APPLE metas: E_META_GOLDEN_APPLE_NORMAL = 0, E_META_GOLDEN_APPLE_ENCHANTED = 1, + + // E_ITEM_RAW_FISH metas: + E_META_RAW_FISH_FISH = 0, + E_META_RAW_FISH_SALMON = 1, + E_META_RAW_FISH_CLOWNFISH = 2, + E_META_RAW_FISH_PUFFERFISH = 3, + + // E_ITEM_COOKED_FISH metas: + E_META_COOKED_FISH_FISH = 0, + E_META_COOKED_FISH_SALMON = 1, + E_META_COOKED_FISH_CLOWNFISH = 2, + E_META_COOKED_FISH_PUFFERFISH = 3, // E_ITEM_MINECART_TRACKS metas: E_META_TRACKS_X = 1, From 2026c8c2a694c7e96bd63fa3cda4fc60754246ad Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 18:53:53 +0100 Subject: [PATCH 05/19] Replace tabs by spaces --- source/BlockID.h | 70 ++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/source/BlockID.h b/source/BlockID.h index b105ecc85..f4e7b412d 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -3,7 +3,7 @@ // tolua_begin enum ENUM_BLOCK_ID { - E_BLOCK_AIR = 0, + E_BLOCK_AIR = 0, E_BLOCK_STONE = 1, E_BLOCK_GRASS = 2, E_BLOCK_DIRT = 3, @@ -14,7 +14,7 @@ enum ENUM_BLOCK_ID E_BLOCK_WATER = 8, E_BLOCK_STATIONARY_WATER = 9, E_BLOCK_LAVA = 10, - E_BLOCK_STATIONARY_LAVA = 11, + E_BLOCK_STATIONARY_LAVA = 11, E_BLOCK_SAND = 12, E_BLOCK_GRAVEL = 13, E_BLOCK_GOLD_ORE = 14, @@ -192,7 +192,7 @@ enum ENUM_BLOCK_ID // tolua_begin enum ENUM_ITEM_ID { - E_ITEM_EMPTY = -1, + E_ITEM_EMPTY = -1, E_ITEM_FIRST = 256, // First true item type @@ -411,12 +411,12 @@ enum E_META_DROPSPENSER_FACING_XP = 5, // E_BLOCK_DOUBLE_STONE_SLAB metas: - E_META_DOUBLE_STONE_SLAB_STONE = 0, - E_META_DOUBLE_STONE_SLAB_SANDSTONE = 1, - E_META_DOUBLE_STONE_SLAB_WOODEN = 2, - E_META_DOUBLE_STONE_SLAB_COBBLESTONE = 3, - E_META_DOUBLE_STONE_SLAB_BRICK = 4, - E_META_DOUBLE_STONE_SLAB_STONE_BRICK = 5, + E_META_DOUBLE_STONE_SLAB_STONE = 0, + E_META_DOUBLE_STONE_SLAB_SANDSTONE = 1, + E_META_DOUBLE_STONE_SLAB_WOODEN = 2, + E_META_DOUBLE_STONE_SLAB_COBBLESTONE = 3, + E_META_DOUBLE_STONE_SLAB_BRICK = 4, + E_META_DOUBLE_STONE_SLAB_STONE_BRICK = 5, E_META_DOUBLE_STONE_SLAB_NETHER_BRICK = 6, E_META_DOUBLE_STONE_SLAB_STONE_SECRET = 7, @@ -460,25 +460,25 @@ enum E_META_SAPLING_JUNGLE = 3, // E_BLOCK_SILVERFISH_EGG metas: - E_META_SILVERFISH_EGG_STONE = 0, + E_META_SILVERFISH_EGG_STONE = 0, E_META_SILVERFISH_EGG_COBBLESTONE = 1, E_META_SILVERFISH_EGG_STONE_BRICK = 2, // E_BLOCK_STONE_SLAB metas: - E_META_STONE_SLAB_STONE = 0, - E_META_STONE_SLAB_SANDSTONE = 1, - E_META_STONE_SLAB_PLANKS = 2, - E_META_STONE_SLAB_COBBLESTONE = 3, - E_META_STONE_SLAB_BRICK = 4, - E_META_STONE_SLAB_STONE_BRICK = 5, + E_META_STONE_SLAB_STONE = 0, + E_META_STONE_SLAB_SANDSTONE = 1, + E_META_STONE_SLAB_PLANKS = 2, + E_META_STONE_SLAB_COBBLESTONE = 3, + E_META_STONE_SLAB_BRICK = 4, + E_META_STONE_SLAB_STONE_BRICK = 5, E_META_STONE_SLAB_NETHER_BRICK = 6, E_META_STONE_SLAB_STONE_SECRET = 7, // E_BLOCK_STONE_BRICKS metas: - E_META_STONE_BRICK_NORMAL = 0, - E_META_STONE_BRICK_MOSSY = 1, - E_META_STONE_BRICK_CRACKED = 2, - E_META_STONE_BRICK_ORNAMENT = 3, + E_META_STONE_BRICK_NORMAL = 0, + E_META_STONE_BRICK_MOSSY = 1, + E_META_STONE_BRICK_CRACKED = 2, + E_META_STONE_BRICK_ORNAMENT = 3, // E_BLOCK_TALL_GRASS metas: E_META_TALL_GRASS_DEAD_SHRUB = 0, @@ -497,19 +497,19 @@ enum E_META_TORCH_ZP = 4, // Torch attached to the ZP side of its block // E_BLOCK_WOODEN_DOUBLE_SLAB metas: - E_META_WOODEN_DOUBLE_SLAB_APPLE = 0, - E_META_WOODEN_DOUBLE_SLAB_CONIFER = 1, - E_META_WOODEN_DOUBLE_SLAB_BIRCH = 2, - E_META_WOODEN_DOUBLE_SLAB_JUNGLE = 3, - E_META_WOODEN_DOUBLE_SLAB_ACACIA = 4, - E_META_WOODEN_DOUBLE_SLAB_DARK_OAK = 5, + E_META_WOODEN_DOUBLE_SLAB_APPLE = 0, + E_META_WOODEN_DOUBLE_SLAB_CONIFER = 1, + E_META_WOODEN_DOUBLE_SLAB_BIRCH = 2, + E_META_WOODEN_DOUBLE_SLAB_JUNGLE = 3, + E_META_WOODEN_DOUBLE_SLAB_ACACIA = 4, + E_META_WOODEN_DOUBLE_SLAB_DARK_OAK = 5, // E_BLOCK_WOODEN_SLAB metas: - E_META_WOODEN_SLAB_APPLE = 0, - E_META_WOODEN_SLAB_CONIFER = 1, - E_META_WOODEN_SLAB_BIRCH = 2, - E_META_WOODEN_SLAB_JUNGLE = 3, - E_META_WOODEN_SLAB_ACACIA = 4, + E_META_WOODEN_SLAB_APPLE = 0, + E_META_WOODEN_SLAB_CONIFER = 1, + E_META_WOODEN_SLAB_BIRCH = 2, + E_META_WOODEN_SLAB_JUNGLE = 3, + E_META_WOODEN_SLAB_ACACIA = 4, E_META_WOODEN_SLAB_DARK_OAK = 5, // E_BLOCK_WOOL metas: @@ -635,7 +635,7 @@ enum //E_BLOCK_FLOWER metas E_META_FLOWER_POPPY = 0, E_META_FLOWER_BLUE_ORCHID = 1, - E_META_FLOWER_ALLIUM = 2, + E_META_FLOWER_ALLIUM = 2, E_META_FLOWER_RED_TULIP = 4, E_META_FLOWER_ORANGE_TULIP = 5, E_META_FLOWER_WHITE_TULIP = 6, @@ -644,10 +644,10 @@ enum //E_BLOCK_BIG_FLOWER metas E_META_BIG_FLOWER_SUNFLOWER = 0, - E_META_BIG_FLOWER_LILAC = 1, + E_META_BIG_FLOWER_LILAC = 1, E_META_BIG_FLOWER_DOUBLE_TALL_GRASS = 2, - E_META_BIG_FLOWER_LARGE_FERN = 3, - E_META_BIG_FLOWER_ROSE_BUSH = 4, + E_META_BIG_FLOWER_LARGE_FERN = 3, + E_META_BIG_FLOWER_ROSE_BUSH = 4, E_META_BIG_FLOWER_PEONY = 5, /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// From 8bdb963be44ec80831c3ee45e0b3f47788aa204f Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 18:54:56 +0100 Subject: [PATCH 06/19] Update BlockID.h --- source/BlockID.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/BlockID.h b/source/BlockID.h index f4e7b412d..a8ff7323a 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -654,8 +654,8 @@ enum // Item metas: // E_ITEM_COAL metas: - E_META_COAL_NORMAL = 0, - E_META_COAL_CHARCOAL = 1, + E_META_COAL_NORMAL = 0, + E_META_COAL_CHARCOAL = 1, // E_ITEM_DYE metas: E_META_DYE_BLACK = 0, From 5c8017e629b0d8ecf555296bbc31f54e9642179c Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 19:12:26 +0100 Subject: [PATCH 07/19] Assigning properties to the blocks recently added. --- source/BlockID.cpp | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/source/BlockID.cpp b/source/BlockID.cpp index 7193094d8..995aede0a 100644 --- a/source/BlockID.cpp +++ b/source/BlockID.cpp @@ -663,10 +663,13 @@ public: g_BlockTransparent[E_BLOCK_FLOWER_POT] = true; g_BlockTransparent[E_BLOCK_GLASS] = true; g_BlockTransparent[E_BLOCK_GLASS_PANE] = true; + g_BlockTransparent[E_BLOCK_STAINED_GLASS] = true; + g_BlockTransparent[E_BLOCK_STAINED_GLASS_PANE] = true; g_BlockTransparent[E_BLOCK_ICE] = true; g_BlockTransparent[E_BLOCK_IRON_DOOR] = true; g_BlockTransparent[E_BLOCK_LAVA] = true; g_BlockTransparent[E_BLOCK_LEAVES] = true; + g_BlockTransparent[E_BLOCK_NEW_LEAVES] = true; g_BlockTransparent[E_BLOCK_LEVER] = true; g_BlockTransparent[E_BLOCK_MELON_STEM] = true; g_BlockTransparent[E_BLOCK_NETHER_BRICK_FENCE] = true; @@ -676,7 +679,6 @@ public: g_BlockTransparent[E_BLOCK_PUMPKIN_STEM] = true; g_BlockTransparent[E_BLOCK_RAIL] = true; g_BlockTransparent[E_BLOCK_RED_MUSHROOM] = true; - g_BlockTransparent[E_BLOCK_RED_ROSE] = true; g_BlockTransparent[E_BLOCK_SIGN_POST] = true; g_BlockTransparent[E_BLOCK_STATIONARY_LAVA] = true; g_BlockTransparent[E_BLOCK_STATIONARY_WATER] = true; @@ -689,16 +691,21 @@ public: g_BlockTransparent[E_BLOCK_WALLSIGN] = true; g_BlockTransparent[E_BLOCK_WOODEN_DOOR] = true; g_BlockTransparent[E_BLOCK_WOODEN_PRESSURE_PLATE] = true; - g_BlockTransparent[E_BLOCK_YELLOW_FLOWER] = true; + g_BlockTransparent[E_BLOCK_DANDELION] = true; + g_BlockTransparent[E_BLOCK_FLOWER] = true; + g_BlockTransparent[E_BLOCK_BIG_FLOWER] = true; // TODO: Any other transparent blocks? // One hit break blocks g_BlockOneHitDig[E_BLOCK_ACTIVE_COMPARATOR] = true; + g_BlockOneHitDig[E_BLOCK_BIG_FLOWER] = true; g_BlockOneHitDig[E_BLOCK_BROWN_MUSHROOM] = true; g_BlockOneHitDig[E_BLOCK_CARROTS] = true; g_BlockOneHitDig[E_BLOCK_CROPS] = true; + g_BlockOneHitDig[E_BLOCK_DANDELION] = true; g_BlockOneHitDig[E_BLOCK_FIRE] = true; + g_BlockOneHitDig[E_BLOCK_FLOWER] = true; g_BlockOneHitDig[E_BLOCK_FLOWER_POT] = true; g_BlockOneHitDig[E_BLOCK_INACTIVE_COMPARATOR] = true; g_BlockOneHitDig[E_BLOCK_LOCKED_CHEST] = true; @@ -711,23 +718,24 @@ public: g_BlockOneHitDig[E_BLOCK_REDSTONE_TORCH_ON] = true; g_BlockOneHitDig[E_BLOCK_REDSTONE_WIRE] = true; g_BlockOneHitDig[E_BLOCK_RED_MUSHROOM] = true; - g_BlockOneHitDig[E_BLOCK_RED_ROSE] = true; g_BlockOneHitDig[E_BLOCK_REEDS] = true; g_BlockOneHitDig[E_BLOCK_SAPLING] = true; g_BlockOneHitDig[E_BLOCK_TNT] = true; g_BlockOneHitDig[E_BLOCK_TALL_GRASS] = true; g_BlockOneHitDig[E_BLOCK_TORCH] = true; - g_BlockOneHitDig[E_BLOCK_YELLOW_FLOWER] = true; // Blocks that breaks when pushed by piston g_BlockPistonBreakable[E_BLOCK_ACTIVE_COMPARATOR] = true; g_BlockPistonBreakable[E_BLOCK_AIR] = true; g_BlockPistonBreakable[E_BLOCK_BED] = true; + g_BlockPistonBreakable[E_BLOCK_BIG_FLOWER] = true; g_BlockPistonBreakable[E_BLOCK_BROWN_MUSHROOM] = true; g_BlockPistonBreakable[E_BLOCK_COBWEB] = true; g_BlockPistonBreakable[E_BLOCK_CROPS] = true; + g_BlockPistonBreakable[E_BLOCK_DANDELION] = true; g_BlockPistonBreakable[E_BLOCK_DEAD_BUSH] = true; g_BlockPistonBreakable[E_BLOCK_FIRE] = true; + g_BlockPistonBreakable[E_BLOCK_FLOWER] = true; g_BlockPistonBreakable[E_BLOCK_INACTIVE_COMPARATOR] = true; g_BlockPistonBreakable[E_BLOCK_IRON_DOOR] = true; g_BlockPistonBreakable[E_BLOCK_JACK_O_LANTERN] = true; @@ -744,7 +752,6 @@ public: g_BlockPistonBreakable[E_BLOCK_REDSTONE_TORCH_ON] = true; g_BlockPistonBreakable[E_BLOCK_REDSTONE_WIRE] = true; g_BlockPistonBreakable[E_BLOCK_RED_MUSHROOM] = true; - g_BlockPistonBreakable[E_BLOCK_RED_ROSE] = true; g_BlockPistonBreakable[E_BLOCK_REEDS] = true; g_BlockPistonBreakable[E_BLOCK_SNOW] = true; g_BlockPistonBreakable[E_BLOCK_STATIONARY_LAVA] = true; @@ -757,17 +764,19 @@ public: g_BlockPistonBreakable[E_BLOCK_WATER] = true; g_BlockPistonBreakable[E_BLOCK_WOODEN_DOOR] = true; g_BlockPistonBreakable[E_BLOCK_WOODEN_PRESSURE_PLATE] = true; - g_BlockPistonBreakable[E_BLOCK_YELLOW_FLOWER] = true; // Blocks that can be snowed over: g_BlockIsSnowable[E_BLOCK_ACTIVE_COMPARATOR] = false; g_BlockIsSnowable[E_BLOCK_AIR] = false; + g_BlockIsSnowable[E_BLOCK_BIG_FLOWER] = false; g_BlockIsSnowable[E_BLOCK_BROWN_MUSHROOM] = false; g_BlockIsSnowable[E_BLOCK_CACTUS] = false; g_BlockIsSnowable[E_BLOCK_CHEST] = false; g_BlockIsSnowable[E_BLOCK_CROPS] = false; + g_BlockIsSnowable[E_BLOCK_DANDELION] = false; g_BlockIsSnowable[E_BLOCK_FIRE] = false; + g_BlockIsSnowable[E_BLOCK_FLOWER] = false; g_BlockIsSnowable[E_BLOCK_GLASS] = false; g_BlockIsSnowable[E_BLOCK_ICE] = false; g_BlockIsSnowable[E_BLOCK_INACTIVE_COMPARATOR] = false; @@ -780,7 +789,6 @@ public: g_BlockIsSnowable[E_BLOCK_REDSTONE_TORCH_ON] = false; g_BlockIsSnowable[E_BLOCK_REDSTONE_WIRE] = false; g_BlockIsSnowable[E_BLOCK_RED_MUSHROOM] = false; - g_BlockIsSnowable[E_BLOCK_RED_ROSE] = false; g_BlockIsSnowable[E_BLOCK_REEDS] = false; g_BlockIsSnowable[E_BLOCK_SAPLING] = false; g_BlockIsSnowable[E_BLOCK_SIGN_POST] = false; @@ -793,7 +801,6 @@ public: g_BlockIsSnowable[E_BLOCK_VINES] = false; g_BlockIsSnowable[E_BLOCK_WALLSIGN] = false; g_BlockIsSnowable[E_BLOCK_WATER] = false; - g_BlockIsSnowable[E_BLOCK_YELLOW_FLOWER] = false; // Blocks that don't drop without a special tool @@ -834,13 +841,16 @@ public: // Nonsolid Blocks: g_BlockIsSolid[E_BLOCK_ACTIVATOR_RAIL] = false; g_BlockIsSolid[E_BLOCK_AIR] = false; + g_BlockIsSolid[E_BLOCK_BIG_FLOWER] = false; g_BlockIsSolid[E_BLOCK_BROWN_MUSHROOM] = false; g_BlockIsSolid[E_BLOCK_CARROTS] = false; g_BlockIsSolid[E_BLOCK_COBWEB] = false; g_BlockIsSolid[E_BLOCK_CROPS] = false; + g_BlockIsSolid[E_BLOCK_DANDELION] = false; g_BlockIsSolid[E_BLOCK_DETECTOR_RAIL] = false; g_BlockIsSolid[E_BLOCK_END_PORTAL] = false; g_BlockIsSolid[E_BLOCK_FIRE] = false; + g_BlockIsSolid[E_BLOCK_FLOWER] = false; g_BlockIsSolid[E_BLOCK_HEAVY_WEIGHTED_PRESSURE_PLATE] = false; g_BlockIsSolid[E_BLOCK_LAVA] = false; g_BlockIsSolid[E_BLOCK_LEVER] = false; @@ -856,7 +866,6 @@ public: g_BlockIsSolid[E_BLOCK_REDSTONE_TORCH_ON] = false; g_BlockIsSolid[E_BLOCK_REDSTONE_WIRE] = false; g_BlockIsSolid[E_BLOCK_RED_MUSHROOM] = false; - g_BlockIsSolid[E_BLOCK_RED_ROSE] = false; g_BlockIsSolid[E_BLOCK_REEDS] = false; g_BlockIsSolid[E_BLOCK_SAPLING] = false; g_BlockIsSolid[E_BLOCK_SIGN_POST] = false; @@ -874,7 +883,6 @@ public: g_BlockIsSolid[E_BLOCK_WOODEN_BUTTON] = false; g_BlockIsSolid[E_BLOCK_WOODEN_PRESSURE_PLATE] = false; g_BlockIsSolid[E_BLOCK_WOODEN_SLAB] = false; - g_BlockIsSolid[E_BLOCK_YELLOW_FLOWER] = false; // Torch placeable g_BlockIsTorchPlaceable[E_BLOCK_BEDROCK] = true; @@ -922,6 +930,7 @@ public: g_BlockIsTorchPlaceable[E_BLOCK_NETHER_QUARTZ_ORE] = true; g_BlockIsTorchPlaceable[E_BLOCK_NOTE_BLOCK] = true; g_BlockIsTorchPlaceable[E_BLOCK_OBSIDIAN] = true; + g_BlockIsTorchPlaceable[E_BLOC_PACKED_ICE] = true; g_BlockIsTorchPlaceable[E_BLOCK_PLANKS] = true; g_BlockIsTorchPlaceable[E_BLOCK_PUMPKIN] = true; g_BlockIsTorchPlaceable[E_BLOCK_QUARTZ_BLOCK] = true; From b7c1ed186ac521589b2471face2e97a32106f49e Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 19:15:48 +0100 Subject: [PATCH 08/19] Update Enchantments.cpp --- source/Enchantments.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Enchantments.cpp b/source/Enchantments.cpp index c74969802..8eb44fa31 100644 --- a/source/Enchantments.cpp +++ b/source/Enchantments.cpp @@ -178,8 +178,8 @@ int cEnchantments::StringToEnchantmentID(const AString & a_EnchantmentName) { enchPunch, "Punch"}, { enchFlame, "Flame"}, { enchInfinity, "Infinity"}, - { enchLuckOfTheSea "LuckOfTheSea"}, - { enchLure "Lure"}, + { enchLuckOfTheSea "LuckOfTheSea"}, + { enchLure "Lure"}, } ; for (int i = 0; i < ARRAYCOUNT(EnchantmentNames); i++) { From 56044aff33ff5f51604d9283379baad6bd174558 Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 19:26:35 +0100 Subject: [PATCH 09/19] Update BlockID.cpp --- source/BlockID.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/BlockID.cpp b/source/BlockID.cpp index 995aede0a..82f69a7d6 100644 --- a/source/BlockID.cpp +++ b/source/BlockID.cpp @@ -651,15 +651,18 @@ public: // Transparent blocks g_BlockTransparent[E_BLOCK_AIR] = true; g_BlockTransparent[E_BLOCK_ACTIVATOR_RAIL] = true; + g_BlockTransparent[E_BLOCK_BIG_FLOWER] = true; g_BlockTransparent[E_BLOCK_BROWN_MUSHROOM] = true; g_BlockTransparent[E_BLOCK_CARROTS] = true; g_BlockTransparent[E_BLOCK_CHEST] = true; g_BlockTransparent[E_BLOCK_COBWEB] = true; g_BlockTransparent[E_BLOCK_CROPS] = true; + g_BlockTransparent[E_BLOCK_DANDELION] = true; g_BlockTransparent[E_BLOCK_DETECTOR_RAIL] = true; g_BlockTransparent[E_BLOCK_FENCE] = true; g_BlockTransparent[E_BLOCK_FENCE_GATE] = true; g_BlockTransparent[E_BLOCK_FIRE] = true; + g_BlockTransparent[E_BLOCK_FLOWER] = true; g_BlockTransparent[E_BLOCK_FLOWER_POT] = true; g_BlockTransparent[E_BLOCK_GLASS] = true; g_BlockTransparent[E_BLOCK_GLASS_PANE] = true; @@ -691,9 +694,6 @@ public: g_BlockTransparent[E_BLOCK_WALLSIGN] = true; g_BlockTransparent[E_BLOCK_WOODEN_DOOR] = true; g_BlockTransparent[E_BLOCK_WOODEN_PRESSURE_PLATE] = true; - g_BlockTransparent[E_BLOCK_DANDELION] = true; - g_BlockTransparent[E_BLOCK_FLOWER] = true; - g_BlockTransparent[E_BLOCK_BIG_FLOWER] = true; // TODO: Any other transparent blocks? From 5c67c17edccddbdeefb79e07abebf12c5bea686e Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 20:49:27 +0100 Subject: [PATCH 10/19] Corrected the comma error --- source/Enchantments.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Enchantments.cpp b/source/Enchantments.cpp index 8eb44fa31..40484f392 100644 --- a/source/Enchantments.cpp +++ b/source/Enchantments.cpp @@ -178,8 +178,8 @@ int cEnchantments::StringToEnchantmentID(const AString & a_EnchantmentName) { enchPunch, "Punch"}, { enchFlame, "Flame"}, { enchInfinity, "Infinity"}, - { enchLuckOfTheSea "LuckOfTheSea"}, - { enchLure "Lure"}, + { enchLuckOfTheSea, "LuckOfTheSea"}, + { enchLure, "Lure"}, } ; for (int i = 0; i < ARRAYCOUNT(EnchantmentNames); i++) { From b6a9394d7a0c77bd7817195224c0c6661a19e73d Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 22:01:30 +0100 Subject: [PATCH 11/19] Update BlockID.cpp --- source/BlockID.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/BlockID.cpp b/source/BlockID.cpp index 82f69a7d6..68aae09dd 100644 --- a/source/BlockID.cpp +++ b/source/BlockID.cpp @@ -930,7 +930,7 @@ public: g_BlockIsTorchPlaceable[E_BLOCK_NETHER_QUARTZ_ORE] = true; g_BlockIsTorchPlaceable[E_BLOCK_NOTE_BLOCK] = true; g_BlockIsTorchPlaceable[E_BLOCK_OBSIDIAN] = true; - g_BlockIsTorchPlaceable[E_BLOC_PACKED_ICE] = true; + g_BlockIsTorchPlaceable[E_BLOCK_PACKED_ICE] = true; g_BlockIsTorchPlaceable[E_BLOCK_PLANKS] = true; g_BlockIsTorchPlaceable[E_BLOCK_PUMPKIN] = true; g_BlockIsTorchPlaceable[E_BLOCK_QUARTZ_BLOCK] = true; From 4d082d119058cafe2cbd555be69237d854725b00 Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 22:03:48 +0100 Subject: [PATCH 12/19] BiomeFile, if not needed, will be removed --- source/BiomeID.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 source/BiomeID.h diff --git a/source/BiomeID.h b/source/BiomeID.h new file mode 100644 index 000000000..9c2d0d2de --- /dev/null +++ b/source/BiomeID.h @@ -0,0 +1,76 @@ +#pragma once + +enum ENUM_BIOME_ID +{ + E_BIOME_OCEAN = 0, + E_BIOME_PLAINS = 1, + E_BIOME_DESERT = 2, + E_BIOME_EXTREME_HILLS = 3, + E_BIOME_FOREST = 4, + E_BIOME_TAIGA = 5, + E_BIOME_SWAMPLAND = 6, + E_BIOME_RIVER = 7, + E_BIOME_HELL = 8, + E_BIOME_SKY = 9, + E_BIOME_FROZEN_OCEAN = 10, + E_BIOME_FROZEN_RIVER = 11, + E_BIOME_ICE_PLAINS = 12, + E_BIOME_ICE_MOUNTAINS = 13, + E_BIOME_MUSHROOM_ISLAND = 14, + E_BIOME_MUSHROOM_ISLAND_SHORE = 15, + E_BIOME_BEACH = 16, + E_BIOME_DESERT_HILLS = 17, + E_BIOME_FOREST_HILLS = 18, + E_BIOME_TAIGA_HILLS = 19, + E_BIOME_EXTREME_HILLS_EDGE = 20, + E_BIOME_JUNGLE = 21, + E_BIOME_JUNGLE_HILLS = 22, + E_BIOME_JUNGLE_EDGE = 23, + E_BIOME_DEEP_OCEAN = 24, + E_BIOME_STONE_BEACH = 25, + E_BIOME_COLD_BEACH = 26, + E_BIOME_BIRCH_FOREST = 27, + E_BIOME_BIRCH_FOREST_HILL = 28, + E_BIOME_ROOFED_FOREST = 29, + E_BIOME_COLD_TAIGA = 30, + E_BIOME_COLD_TAIGA_HILLS = 31, + E_BIOME_MEGA_TAIGA = 32, + E_BIOME_MEGA_TAIGA_HILLS = 33, + E_BIOME_EXTREME_HILLS_PLUS = 34, + E_BIOME_SAVANNA = 35, + E_BIOME_SAVANNA_PLATEAU = 36, + E_BIOME_MESA = 37, + E_BIOME_MESA_PLATEAU_F = 38, + E_BIOME_MESA_PLATEAU = 39, + E_BIOME_SUNFLOWER_PLAINS = 129, + E_BIOME_DESERT_M = 130, + E_BIOME_EXTREME_HILLS_M = 131 + E_BIOME_FLOWER_FOREST = 132, + E_BIOME_TAIGA_M = 133, + E_BIOME_SWAMPLAND_M = 134, + E_BIOME_ICE_PLAINS_SPIKES = 140, + E_BIOME_JUNGLE_M = 149, + E_BIOME_JUNGLE_EDGE_M = 151, + E_BIOME_BIRCH_FOREST_M = 155, + E_BIOME_BIRCH_FOREST_HILLS_M = 156, + E_BIOME_ROOFED_FOREST_M = 157, + E_BIOME_COLD_TAIGA_M = 158, + E_BIOME_MEGA_SPRUCE_TAIGA = 160, + E_BIOME_MEGA_SPRUCE_TAIGA_HILS = 161, + E_BIOME_EXTREME_HILLS_PLUS_M = 162, + E_BIOME_SAVANNA_M = 163, + E_BIOME_SAVANNA_PLATEAU_M = 164, + E_BIOME_MESA_BRYCE = 165, + E_BIOME_MESA_PLATEAU_F_M = 166, + E_BIOME_MESA_PLATEAU_M = 167, +}; + +enum ENUM_BIOME_TYPE_DEF +{ + E_BIOME_SNOW_COVERED = 0, // Temperature =< 0.15 + E_BIOME_COLD = 1, // Temperature = {0.2, 0.25, 0.3} + E_BIOME_MEDIUM = 2, // Temperature = {0.5, 0.6, 0.7, 0.8, 0.95} + E_BIOME_WARM = 3, // Temperature => 1.0 + E_BIOME_NEUTRAL = 4, +}; + From ce0549831144131d7b49b8477eaa60e6581144cf Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 22:08:33 +0100 Subject: [PATCH 13/19] Sorting by Name on g_BlockTransparent --- source/BlockID.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/BlockID.cpp b/source/BlockID.cpp index 68aae09dd..f8949577e 100644 --- a/source/BlockID.cpp +++ b/source/BlockID.cpp @@ -649,8 +649,8 @@ public: g_BlockSpreadLightFalloff[E_BLOCK_WATER] = 3; // Transparent blocks - g_BlockTransparent[E_BLOCK_AIR] = true; g_BlockTransparent[E_BLOCK_ACTIVATOR_RAIL] = true; + g_BlockTransparent[E_BLOCK_AIR] = true; g_BlockTransparent[E_BLOCK_BIG_FLOWER] = true; g_BlockTransparent[E_BLOCK_BROWN_MUSHROOM] = true; g_BlockTransparent[E_BLOCK_CARROTS] = true; @@ -672,10 +672,10 @@ public: g_BlockTransparent[E_BLOCK_IRON_DOOR] = true; g_BlockTransparent[E_BLOCK_LAVA] = true; g_BlockTransparent[E_BLOCK_LEAVES] = true; - g_BlockTransparent[E_BLOCK_NEW_LEAVES] = true; g_BlockTransparent[E_BLOCK_LEVER] = true; g_BlockTransparent[E_BLOCK_MELON_STEM] = true; g_BlockTransparent[E_BLOCK_NETHER_BRICK_FENCE] = true; + g_BlockTransparent[E_BLOCK_NEW_LEAVES] = true; g_BlockTransparent[E_BLOCK_POTATOES] = true; g_BlockTransparent[E_BLOCK_POWERED_RAIL] = true; g_BlockTransparent[E_BLOCK_PISTON_EXTENSION] = true; @@ -683,15 +683,15 @@ public: g_BlockTransparent[E_BLOCK_RAIL] = true; g_BlockTransparent[E_BLOCK_RED_MUSHROOM] = true; g_BlockTransparent[E_BLOCK_SIGN_POST] = true; + g_BlockTransparent[E_BLOCK_SNOW] = true; g_BlockTransparent[E_BLOCK_STATIONARY_LAVA] = true; g_BlockTransparent[E_BLOCK_STATIONARY_WATER] = true; g_BlockTransparent[E_BLOCK_STONE_PRESSURE_PLATE] = true; - g_BlockTransparent[E_BLOCK_SNOW] = true; g_BlockTransparent[E_BLOCK_TALL_GRASS] = true; g_BlockTransparent[E_BLOCK_TORCH] = true; g_BlockTransparent[E_BLOCK_VINES] = true; - g_BlockTransparent[E_BLOCK_WATER] = true; g_BlockTransparent[E_BLOCK_WALLSIGN] = true; + g_BlockTransparent[E_BLOCK_WATER] = true; g_BlockTransparent[E_BLOCK_WOODEN_DOOR] = true; g_BlockTransparent[E_BLOCK_WOODEN_PRESSURE_PLATE] = true; From d58723cc4d80506c9655909246efc65fdbea9bb5 Mon Sep 17 00:00:00 2001 From: nesco Date: Tue, 12 Nov 2013 22:11:57 +0100 Subject: [PATCH 14/19] Delete BiomeID.h --- source/BiomeID.h | 76 ------------------------------------------------ 1 file changed, 76 deletions(-) delete mode 100644 source/BiomeID.h diff --git a/source/BiomeID.h b/source/BiomeID.h deleted file mode 100644 index 9c2d0d2de..000000000 --- a/source/BiomeID.h +++ /dev/null @@ -1,76 +0,0 @@ -#pragma once - -enum ENUM_BIOME_ID -{ - E_BIOME_OCEAN = 0, - E_BIOME_PLAINS = 1, - E_BIOME_DESERT = 2, - E_BIOME_EXTREME_HILLS = 3, - E_BIOME_FOREST = 4, - E_BIOME_TAIGA = 5, - E_BIOME_SWAMPLAND = 6, - E_BIOME_RIVER = 7, - E_BIOME_HELL = 8, - E_BIOME_SKY = 9, - E_BIOME_FROZEN_OCEAN = 10, - E_BIOME_FROZEN_RIVER = 11, - E_BIOME_ICE_PLAINS = 12, - E_BIOME_ICE_MOUNTAINS = 13, - E_BIOME_MUSHROOM_ISLAND = 14, - E_BIOME_MUSHROOM_ISLAND_SHORE = 15, - E_BIOME_BEACH = 16, - E_BIOME_DESERT_HILLS = 17, - E_BIOME_FOREST_HILLS = 18, - E_BIOME_TAIGA_HILLS = 19, - E_BIOME_EXTREME_HILLS_EDGE = 20, - E_BIOME_JUNGLE = 21, - E_BIOME_JUNGLE_HILLS = 22, - E_BIOME_JUNGLE_EDGE = 23, - E_BIOME_DEEP_OCEAN = 24, - E_BIOME_STONE_BEACH = 25, - E_BIOME_COLD_BEACH = 26, - E_BIOME_BIRCH_FOREST = 27, - E_BIOME_BIRCH_FOREST_HILL = 28, - E_BIOME_ROOFED_FOREST = 29, - E_BIOME_COLD_TAIGA = 30, - E_BIOME_COLD_TAIGA_HILLS = 31, - E_BIOME_MEGA_TAIGA = 32, - E_BIOME_MEGA_TAIGA_HILLS = 33, - E_BIOME_EXTREME_HILLS_PLUS = 34, - E_BIOME_SAVANNA = 35, - E_BIOME_SAVANNA_PLATEAU = 36, - E_BIOME_MESA = 37, - E_BIOME_MESA_PLATEAU_F = 38, - E_BIOME_MESA_PLATEAU = 39, - E_BIOME_SUNFLOWER_PLAINS = 129, - E_BIOME_DESERT_M = 130, - E_BIOME_EXTREME_HILLS_M = 131 - E_BIOME_FLOWER_FOREST = 132, - E_BIOME_TAIGA_M = 133, - E_BIOME_SWAMPLAND_M = 134, - E_BIOME_ICE_PLAINS_SPIKES = 140, - E_BIOME_JUNGLE_M = 149, - E_BIOME_JUNGLE_EDGE_M = 151, - E_BIOME_BIRCH_FOREST_M = 155, - E_BIOME_BIRCH_FOREST_HILLS_M = 156, - E_BIOME_ROOFED_FOREST_M = 157, - E_BIOME_COLD_TAIGA_M = 158, - E_BIOME_MEGA_SPRUCE_TAIGA = 160, - E_BIOME_MEGA_SPRUCE_TAIGA_HILS = 161, - E_BIOME_EXTREME_HILLS_PLUS_M = 162, - E_BIOME_SAVANNA_M = 163, - E_BIOME_SAVANNA_PLATEAU_M = 164, - E_BIOME_MESA_BRYCE = 165, - E_BIOME_MESA_PLATEAU_F_M = 166, - E_BIOME_MESA_PLATEAU_M = 167, -}; - -enum ENUM_BIOME_TYPE_DEF -{ - E_BIOME_SNOW_COVERED = 0, // Temperature =< 0.15 - E_BIOME_COLD = 1, // Temperature = {0.2, 0.25, 0.3} - E_BIOME_MEDIUM = 2, // Temperature = {0.5, 0.6, 0.7, 0.8, 0.95} - E_BIOME_WARM = 3, // Temperature => 1.0 - E_BIOME_NEUTRAL = 4, -}; - From e4d77bc3fd5777ab456eb55ff7032866cec65182 Mon Sep 17 00:00:00 2001 From: nesco Date: Wed, 13 Nov 2013 08:16:35 +0100 Subject: [PATCH 15/19] Update Enchantments.h --- source/Enchantments.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Enchantments.h b/source/Enchantments.h index a6b4a53cd..7581b87b5 100644 --- a/source/Enchantments.h +++ b/source/Enchantments.h @@ -57,8 +57,8 @@ public: enchPunch = 49, enchFlame = 50, enchInfinity = 51, - enchLuckOfTheSea = 61, - enchLure = 62, + enchLuckOfTheSea = 61, + enchLure = 62, } ; /// Creates an empty enchantments container From ffe4de51c7d9837317b3c837c9b30a5b5544b899 Mon Sep 17 00:00:00 2001 From: nesco Date: Wed, 13 Nov 2013 08:17:26 +0100 Subject: [PATCH 16/19] Update Enchantments.cpp --- source/Enchantments.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/Enchantments.cpp b/source/Enchantments.cpp index 40484f392..6b53d0b52 100644 --- a/source/Enchantments.cpp +++ b/source/Enchantments.cpp @@ -178,8 +178,8 @@ int cEnchantments::StringToEnchantmentID(const AString & a_EnchantmentName) { enchPunch, "Punch"}, { enchFlame, "Flame"}, { enchInfinity, "Infinity"}, - { enchLuckOfTheSea, "LuckOfTheSea"}, - { enchLure, "Lure"}, + { enchLuckOfTheSea, "LuckOfTheSea"}, + { enchLure, "Lure"}, } ; for (int i = 0; i < ARRAYCOUNT(EnchantmentNames); i++) { From f99835c095411abfe77e8fef2d5cf86166643f61 Mon Sep 17 00:00:00 2001 From: nesco Date: Wed, 13 Nov 2013 08:19:28 +0100 Subject: [PATCH 17/19] compatibility update --- source/BlockID.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/BlockID.h b/source/BlockID.h index a8ff7323a..7596f16a5 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -40,8 +40,10 @@ enum ENUM_BLOCK_ID E_BLOCK_PISTON_EXTENSION = 34, E_BLOCK_WOOL = 35, E_BLOCK_PISTON_MOVED_BLOCK = 36, - E_BLOCK_DANDELION = 37, + E_BLOCK_DANDELION = 37, // Minecraft 1.7.x IDs E_BLOCK_FLOWER = 38, + E_BLOCK_YELLOW_FLOWER = 37, + E_BLOCK_RED_ROSE = 38, // Older IDs E_BLOCK_BROWN_MUSHROOM = 39, E_BLOCK_RED_MUSHROOM = 40, E_BLOCK_GOLD_BLOCK = 41, From e671f29d852f521d0434882373ee154b1fcd805c Mon Sep 17 00:00:00 2001 From: nesco Date: Wed, 13 Nov 2013 14:29:18 +0100 Subject: [PATCH 18/19] compatibility update --- source/BlockID.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/source/BlockID.h b/source/BlockID.h index 7596f16a5..95b8ed9fc 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -40,10 +40,8 @@ enum ENUM_BLOCK_ID E_BLOCK_PISTON_EXTENSION = 34, E_BLOCK_WOOL = 35, E_BLOCK_PISTON_MOVED_BLOCK = 36, - E_BLOCK_DANDELION = 37, // Minecraft 1.7.x IDs + E_BLOCK_DANDELION = 37, E_BLOCK_FLOWER = 38, - E_BLOCK_YELLOW_FLOWER = 37, - E_BLOCK_RED_ROSE = 38, // Older IDs E_BLOCK_BROWN_MUSHROOM = 39, E_BLOCK_RED_MUSHROOM = 40, E_BLOCK_GOLD_BLOCK = 41, @@ -188,6 +186,12 @@ enum ENUM_BLOCK_ID // IsValidBlock() depends on this E_BLOCK_NUMBER_OF_TYPES, ///< Number of individual (different) blocktypes E_BLOCK_MAX_TYPE_ID = E_BLOCK_NUMBER_OF_TYPES - 1 ///< Maximum BlockType number used + + // Synonym or ID compatibility + + E_BLOCK_YELLOW_FLOWER = E_BLOCK_DANDELION, + E_BLOCK_RED_ROSE = E_BLOCK_FLOWER, + E_BLOCK_LOCKED_CHEST = E_BLOCK_STAINED_GLASS, }; // tolua_end From 7d615ee3bab6a3913c24bda2c388d97bc3241ca3 Mon Sep 17 00:00:00 2001 From: nesco Date: Wed, 13 Nov 2013 14:57:54 +0100 Subject: [PATCH 19/19] Bug correction Syntax error --- source/BlockID.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/BlockID.h b/source/BlockID.h index 95b8ed9fc..f3cbc46d6 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -185,7 +185,7 @@ enum ENUM_BLOCK_ID // Keep these two as the last values, without a number - they will get their correct number assigned automagically by C++ // IsValidBlock() depends on this E_BLOCK_NUMBER_OF_TYPES, ///< Number of individual (different) blocktypes - E_BLOCK_MAX_TYPE_ID = E_BLOCK_NUMBER_OF_TYPES - 1 ///< Maximum BlockType number used + E_BLOCK_MAX_TYPE_ID = E_BLOCK_NUMBER_OF_TYPES - 1, ///< Maximum BlockType number used // Synonym or ID compatibility