Merge remote-tracking branch 'upstream/master' into playerxp
This commit is contained in:
commit
39f6b12b62
@ -649,20 +649,25 @@ 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;
|
||||
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;
|
||||
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;
|
||||
@ -670,35 +675,37 @@ public:
|
||||
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;
|
||||
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_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;
|
||||
g_BlockTransparent[E_BLOCK_YELLOW_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_BLOCK_PACKED_ICE] = true;
|
||||
g_BlockIsTorchPlaceable[E_BLOCK_PLANKS] = true;
|
||||
g_BlockIsTorchPlaceable[E_BLOCK_PUMPKIN] = true;
|
||||
g_BlockIsTorchPlaceable[E_BLOCK_QUARTZ_BLOCK] = true;
|
||||
|
106
source/BlockID.h
106
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,15 +170,28 @@ 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
|
||||
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
|
||||
|
||||
E_BLOCK_YELLOW_FLOWER = E_BLOCK_DANDELION,
|
||||
E_BLOCK_RED_ROSE = E_BLOCK_FLOWER,
|
||||
E_BLOCK_LOCKED_CHEST = E_BLOCK_STAINED_GLASS,
|
||||
};
|
||||
// tolua_end
|
||||
|
||||
@ -343,7 +356,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 +507,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,
|
||||
@ -550,6 +572,42 @@ enum
|
||||
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,
|
||||
E_META_SNOW_LAYER_TWO = 1,
|
||||
@ -572,6 +630,32 @@ enum
|
||||
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:
|
||||
|
||||
@ -601,6 +685,18 @@ enum
|
||||
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,
|
||||
E_META_TRACKS_Z = 0,
|
||||
|
@ -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++)
|
||||
{
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user