From b355bdeccecf727d30e48634df9b5d424db570bc Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Mon, 4 Jun 2012 12:08:20 +0000 Subject: Added the new recipe parser, parsing the crafting.txt file. Included are a few recipes. The old parser still works, but will be replaced soon. git-svn-id: http://mc-server.googlecode.com/svn/trunk@549 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/BlockID.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'source/BlockID.h') diff --git a/source/BlockID.h b/source/BlockID.h index 03a48491f..ebe089f09 100644 --- a/source/BlockID.h +++ b/source/BlockID.h @@ -145,7 +145,8 @@ enum ENUM_ITEM_ID E_ITEM_GRASS = 2, E_ITEM_DIRT = 3, E_ITEM_COBBLESTONE = 4, - E_ITEM_WOOD = 5, + E_ITEM_PLANKS = 5, + E_ITEM_WOOD = 5, // obsolete, use E_ITEM_PLANKS instead E_ITEM_SAPLING = 6, E_ITEM_BEDROCK = 7, E_ITEM_WATER = 8, @@ -443,8 +444,18 @@ enum +// fwd: cItem.h: +class cItem; + + + + + /// Translates a blocktype string into blocktype. Takes either a number or an items.ini alias as input. Returns -1 on failure. -extern int BlockStringToType(const AString & a_BlockTypeString); +extern int BlockStringToType(const AString & a_BlockTypeString); // tolua_export + +/// Translates an itemtype string into an item. Takes either a number, number^number, number:number or an items.ini alias as input. Returns true if successful. +extern bool StringToItem(const AString & a_ItemTypeString, cItem & a_Item); // tolua_export /// Translates a biome string to biome enum. Takes either a number or a biome alias (built-in). Returns -1 on failure. extern EMCSBiome StringToBiome(const AString & a_BiomeString); -- cgit v1.2.3