summaryrefslogtreecommitdiffstats
path: root/source/BlockID.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-08 18:08:29 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-09-08 18:08:29 +0200
commit8c43857b739566be1e59d61aec192ef63e77cbb1 (patch)
tree7b69b805537c776fd7620cf5cba539e32f01fef5 /source/BlockID.cpp
parentRelaxed the check for held item, the client sometimes sends wrong ItemType. (diff)
downloadcuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar.gz
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar.bz2
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar.lz
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar.xz
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.tar.zst
cuberite-8c43857b739566be1e59d61aec192ef63e77cbb1.zip
Diffstat (limited to '')
-rw-r--r--source/BlockID.cpp181
1 files changed, 148 insertions, 33 deletions
diff --git a/source/BlockID.cpp b/source/BlockID.cpp
index 7a4b28b14..a326d25d6 100644
--- a/source/BlockID.cpp
+++ b/source/BlockID.cpp
@@ -26,24 +26,128 @@ bool g_BlockRequiresSpecialTool[256];
class cBlockIDMap
{
+ typedef std::map<AString, std::pair<short, short> > ItemMap;
+
public:
- cBlockIDMap(void) : m_Ini("items.ini")
+ cBlockIDMap(void)
{
- m_Ini.ReadFile();
+ cIniFile Ini("items.ini");
+ if (!Ini.ReadFile())
+ {
+ return;
+ }
+ long KeyID = Ini.FindKey("Items");
+ if (KeyID == cIniFile::noID)
+ {
+ return;
+ }
+ unsigned NumValues = Ini.GetNumValues(KeyID);
+ for (unsigned i = 0; i < NumValues; i++)
+ {
+ AString Name = Ini.ValueName(KeyID, i);
+ if (Name.empty())
+ {
+ continue;
+ }
+ AString Value = Ini.GetValue(KeyID, i);
+ AddToMap(Name, Value);
+ } // for i - Ini.Values[]
}
+
int Resolve(const AString & a_ItemName)
{
- return m_Ini.GetValueI("Items", a_ItemName, -1);
+ ItemMap::iterator itr = m_Map.find(a_ItemName);
+ if (itr == m_Map.end())
+ {
+ return -1;
+ }
+ return itr->second.first;
+ }
+
+
+ bool ResolveItem(const AString & a_ItemName, cItem & a_Item)
+ {
+ ItemMap::iterator itr = m_Map.find(a_ItemName);
+ if (itr != m_Map.end())
+ {
+ a_Item.m_ItemType = itr->second.first;
+ a_Item.m_ItemDamage = itr->second.second;
+ return true;
+ }
+
+ // Not a resolvable string, try pure numbers: "45:6", "45^6" etc.
+ AStringVector Split = StringSplit(a_ItemName, ":");
+ if (Split.size() == 1)
+ {
+ Split = StringSplit(a_ItemName, "^");
+ }
+ if (Split.empty())
+ {
+ return false;
+ }
+ a_Item.m_ItemType = (short)atoi(Split[0].c_str());
+ if ((a_Item.m_ItemType == 0) && (Split[0] != "0"))
+ {
+ // Parsing the number failed
+ return false;
+ }
+ if (Split.size() < 2)
+ {
+ return true;
+ }
+ a_Item.m_ItemDamage = atoi(Split[1].c_str());
+ if ((a_Item.m_ItemDamage == 0) && (Split[1] != "0"))
+ {
+ // Parsing the number failed
+ return false;
+ }
+
+ return true;
}
- AString ResolveString(const AString & a_ItemName)
+
+ AString Desolve(short a_ItemType, short a_ItemDamage)
{
- return m_Ini.GetValue("Items", a_ItemName, "");
+ for (ItemMap::iterator itr = m_Map.begin(), end = m_Map.end(); itr != end; ++itr)
+ {
+ if ((itr->second.first == a_ItemType) && (itr->second.second == a_ItemDamage))
+ {
+ return itr->first;
+ }
+ } // for itr - m_Map[]
+ AString res;
+ if (a_ItemDamage == -1)
+ {
+ Printf(res, "%d", a_ItemType);
+ }
+ else
+ {
+ Printf(res, "%d:%d", a_ItemType, a_ItemDamage);
+ }
+ return res;
}
+
protected:
- cIniFile m_Ini;
+ ItemMap m_Map;
+
+
+ void AddToMap(const AString & a_Name, const AString & a_Value)
+ {
+ AStringVector Split = StringSplit(a_Value, ":");
+ if (Split.size() == 1)
+ {
+ Split = StringSplit(a_Value, "^");
+ }
+ if (Split.empty())
+ {
+ return;
+ }
+ short ItemType = (short)atoi(Split[0].c_str());
+ short ItemDamage = (Split.size() > 1) ? (short)atoi(Split[1].c_str()) : -1;
+ m_Map[a_Name] = std::make_pair(ItemType, ItemDamage);
+ }
} ;
@@ -56,6 +160,25 @@ static cBlockIDMap gsBlockIDMap;
+/*
+// Quick self-test:
+class Tester
+{
+public:
+ Tester(void)
+ {
+ cItem Item;
+ gsBlockIDMap.ResolveItem("charcoal", Item);
+ AString Charcoal = gsBlockIDMap.Desolve(Item.m_ItemType, Item.m_ItemDamage);
+ ASSERT(Charcoal == "charcoal");
+ }
+} test;
+//*/
+
+
+
+
+
BLOCKTYPE BlockStringToType(const AString & a_BlockTypeString)
{
int res = atoi(a_BlockTypeString.c_str());
@@ -73,33 +196,25 @@ BLOCKTYPE BlockStringToType(const AString & a_BlockTypeString)
bool StringToItem(const AString & a_ItemTypeString, cItem & a_Item)
{
- AString Resolved = TrimString(gsBlockIDMap.ResolveString(TrimString(a_ItemTypeString)));
- AString txt = (!Resolved.empty()) ? Resolved : a_ItemTypeString;
- AStringVector Split = StringSplit(txt, ":");
- if (Split.size() == 1)
- {
- Split = StringSplit(txt, "^");
- }
- if (Split.empty())
- {
- return false;
- }
- a_Item.m_ItemID = (ENUM_ITEM_ID)atoi(Split[0].c_str());
- if ((a_Item.m_ItemID == 0) && (Split[0] != "0"))
- {
- // Parsing the number failed
- return false;
- }
- if (Split.size() > 1)
- {
- a_Item.m_ItemHealth = atoi(Split[1].c_str());
- if ((a_Item.m_ItemHealth == 0) && (Split[1] != "0"))
- {
- // Parsing the number failed
- return false;
- }
- }
- return true;
+ return gsBlockIDMap.ResolveItem(TrimString(a_ItemTypeString), a_Item);
+}
+
+
+
+
+
+AString ItemToString(const cItem & a_Item)
+{
+ return gsBlockIDMap.Desolve(a_Item.m_ItemType, a_Item.m_ItemDamage);
+}
+
+
+
+
+
+AString ItemTypeToString(short a_ItemType)
+{
+ return gsBlockIDMap.Desolve(a_ItemType, -1);
}