4 files changed, 32 insertions, 32 deletions

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index ed9c32d32..0b6f33b37 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -297,16 +297,16 @@ g_APIDesc =
 			]],
 			Functions =
 			{
-				FullyOccupiesVoxel = { Params = "Type", Return = "bool", Notes = "Returns whether the specified block fully occupies its voxel." },
-				GetById = { Params = "Type", Return = "{{cBlockInfo}}", Notes = "Returns the {{cBlockInfo}} structure for the specified type." },
-				GetLightValue = { Params = "Type", Return = "number", Notes = "Returns how much light the specified block emits on its own." },
-				GetSpreadLightFalloff = { Params = "Type", Return = "number", Notes = "Returns how much light the specified block consumes." },
-				IsOneHitDig = { Params = "Type", Return = "bool", Notes = "Returns whether the specified block will be destroyed after a single hit." },
-				IsPistonBreakable = { Params = "Type", Return = "bool", Notes = "Returns whether a piston can break the specified block." },
-				IsSnowable = { Params = "Type", Return = "bool", Notes = "Returns whether the specified block can hold snow atop." },
-				IsSolid = { Params = "Type", Return = "bool", Notes = "Returns whether the specified block is solid." },
-				IsTransparent = { Params = "Type", Return = "bool", Notes = "Returns whether the specified block is transparent." },
-				RequiresSpecialTool = { Params = "Type", Return = "bool", Notes = "Returns whether the specified block requires a special tool to drop." },
+				FullyOccupiesVoxel = { Params = "Type", Return = "bool", Notes = "(STATIC) Returns whether the specified block fully occupies its voxel." },
+				Get = { Params = "Type", Return = "{{cBlockInfo}}", Notes = "(STATIC) Returns the {{cBlockInfo}} structure for the specified type." },
+				GetLightValue = { Params = "Type", Return = "number", Notes = "(STATIC) Returns how much light the specified block emits on its own." },
+				GetSpreadLightFalloff = { Params = "Type", Return = "number", Notes = "(STATIC) Returns how much light the specified block consumes." },
+				IsOneHitDig = { Params = "Type", Return = "bool", Notes = "(STATIC) Returns whether the specified block will be destroyed after a single hit." },
+				IsPistonBreakable = { Params = "Type", Return = "bool", Notes = "(STATIC) Returns whether a piston can break the specified block." },
+				IsSnowable = { Params = "Type", Return = "bool", Notes = "(STATIC) Returns whether the specified block can hold snow atop." },
+				IsSolid = { Params = "Type", Return = "bool", Notes = "(STATIC) Returns whether the specified block is solid." },
+				IsTransparent = { Params = "Type", Return = "bool", Notes = "(STATIC) Returns whether the specified block is transparent." },
+				RequiresSpecialTool = { Params = "Type", Return = "bool", Notes = "(STATIC) Returns whether the specified block requires a special tool to drop." },
 			},
 			Variables =
 			{
diff --git a/src/Bindings/DeprecatedBindings.cpp b/src/Bindings/DeprecatedBindings.cpp
index 3e4940494..7c0d8dca1 100644
--- a/src/Bindings/DeprecatedBindings.cpp
+++ b/src/Bindings/DeprecatedBindings.cpp
@@ -55,7 +55,7 @@ static int tolua_set_AllToLua_g_BlockLightValue(lua_State* tolua_S)
 	if (tolua_index<0)
 		tolua_error(tolua_S,"array indexing out of range.",NULL);
 	#endif
-	cBlockInfo::GetById(tolua_index).m_LightValue = ((unsigned char)  tolua_tonumber(tolua_S,3,0));
+	cBlockInfo::Get(tolua_index).m_LightValue = ((unsigned char)  tolua_tonumber(tolua_S,3,0));
 	return 0;
 }
 #endif //#ifndef TOLUA_DISABLE
@@ -99,7 +99,7 @@ static int tolua_set_AllToLua_g_BlockSpreadLightFalloff(lua_State* tolua_S)
 	if (tolua_index<0)
 		tolua_error(tolua_S,"array indexing out of range.",NULL);
 	#endif
-	cBlockInfo::GetById(tolua_index).m_SpreadLightFalloff = ((unsigned char)  tolua_tonumber(tolua_S,3,0));
+	cBlockInfo::Get(tolua_index).m_SpreadLightFalloff = ((unsigned char)  tolua_tonumber(tolua_S,3,0));
 	return 0;
 }
 #endif //#ifndef TOLUA_DISABLE
@@ -143,7 +143,7 @@ static int tolua_set_AllToLua_g_BlockTransparent(lua_State* tolua_S)
 	if (tolua_index<0)
 		tolua_error(tolua_S,"array indexing out of range.",NULL);
 	#endif
-	cBlockInfo::GetById(tolua_index).m_Transparent = ((bool)  tolua_toboolean(tolua_S,3,0));
+	cBlockInfo::Get(tolua_index).m_Transparent = ((bool)  tolua_toboolean(tolua_S,3,0));
 	return 0;
 }
 #endif //#ifndef TOLUA_DISABLE
@@ -187,7 +187,7 @@ static int tolua_set_AllToLua_g_BlockOneHitDig(lua_State* tolua_S)
 	if (tolua_index<0)
 		tolua_error(tolua_S,"array indexing out of range.",NULL);
 	#endif
-	cBlockInfo::GetById(tolua_index).m_OneHitDig = ((bool)  tolua_toboolean(tolua_S,3,0));
+	cBlockInfo::Get(tolua_index).m_OneHitDig = ((bool)  tolua_toboolean(tolua_S,3,0));
 	return 0;
 }
 #endif //#ifndef TOLUA_DISABLE
@@ -231,7 +231,7 @@ static int tolua_set_AllToLua_g_BlockPistonBreakable(lua_State* tolua_S)
 	if (tolua_index<0 || tolua_index>=256)
 		tolua_error(tolua_S,"array indexing out of range.",NULL);
 	#endif
-	cBlockInfo::GetById(tolua_index).m_PistonBreakable = ((bool)  tolua_toboolean(tolua_S,3,0));
+	cBlockInfo::Get(tolua_index).m_PistonBreakable = ((bool)  tolua_toboolean(tolua_S,3,0));
 	return 0;
 }
 #endif //#ifndef TOLUA_DISABLE
@@ -275,7 +275,7 @@ static int tolua_set_AllToLua_g_BlockIsSnowable(lua_State* tolua_S)
 	if (tolua_index<0 || tolua_index>=256)
 		tolua_error(tolua_S,"array indexing out of range.",NULL);
 	#endif
-	cBlockInfo::GetById(tolua_index).m_IsSnowable = ((bool)  tolua_toboolean(tolua_S,3,0));
+	cBlockInfo::Get(tolua_index).m_IsSnowable = ((bool)  tolua_toboolean(tolua_S,3,0));
 	return 0;
 }
 #endif //#ifndef TOLUA_DISABLE
@@ -319,7 +319,7 @@ static int tolua_set_AllToLua_g_BlockRequiresSpecialTool(lua_State* tolua_S)
 	if (tolua_index<0 || tolua_index>=256)
 		tolua_error(tolua_S,"array indexing out of range.",NULL);
 	#endif
-	cBlockInfo::GetById(tolua_index).m_RequiresSpecialTool = ((bool)  tolua_toboolean(tolua_S,3,0));
+	cBlockInfo::Get(tolua_index).m_RequiresSpecialTool = ((bool)  tolua_toboolean(tolua_S,3,0));
 	return 0;
 }
 #endif //#ifndef TOLUA_DISABLE
@@ -363,7 +363,7 @@ static int tolua_set_AllToLua_g_BlockIsSolid(lua_State* tolua_S)
 	if (tolua_index<0 || tolua_index>=256)
 		tolua_error(tolua_S,"array indexing out of range.",NULL);
 	#endif
-	cBlockInfo::GetById(tolua_index).m_IsSolid = ((bool)  tolua_toboolean(tolua_S,3,0));
+	cBlockInfo::Get(tolua_index).m_IsSolid = ((bool)  tolua_toboolean(tolua_S,3,0));
 	return 0;
 }
 #endif //#ifndef TOLUA_DISABLE
@@ -407,7 +407,7 @@ static int tolua_set_AllToLua_g_BlockFullyOccupiesVoxel(lua_State* tolua_S)
 	if (tolua_index<0 || tolua_index>=256)
 		tolua_error(tolua_S,"array indexing out of range.",NULL);
 	#endif
-	cBlockInfo::GetById(tolua_index).m_FullyOccupiesVoxel = ((bool)  tolua_toboolean(tolua_S,3,0));
+	cBlockInfo::Get(tolua_index).m_FullyOccupiesVoxel = ((bool)  tolua_toboolean(tolua_S,3,0));
 	return 0;
 }
 #endif //#ifndef TOLUA_DISABLE
diff --git a/src/BlockInfo.cpp b/src/BlockInfo.cpp
index 5fd6d33c1..c73ae18b6 100644
--- a/src/BlockInfo.cpp
+++ b/src/BlockInfo.cpp
@@ -29,11 +29,11 @@ cBlockInfo::cBlockInfo()
 
 
 
-cBlockInfo & cBlockInfo::GetById(unsigned int a_ID)
+cBlockInfo & cBlockInfo::Get(BLOCKTYPE a_Type)
 {
-	ASSERT(a_ID < 256);
+	ASSERT(a_Type < 256);
 
-	return ms_Info[a_ID];
+	return ms_Info[a_Type];
 }
 
 
diff --git a/src/BlockInfo.h b/src/BlockInfo.h
index 57092ca54..34a845b20 100644
--- a/src/BlockInfo.h
+++ b/src/BlockInfo.h
@@ -19,7 +19,7 @@ public:
 	// tolua_begin
 
 	/** Returns the associated BlockInfo structure. */
-	static cBlockInfo & GetById(unsigned int a_ID);
+	static cBlockInfo & Get(BLOCKTYPE a_Type);
 
 
 	/** How much light do the blocks emit on their own? */
@@ -50,15 +50,15 @@ public:
 	bool m_FullyOccupiesVoxel;
 
 
-	inline static NIBBLETYPE GetLightValue        (unsigned int a_ID) { return GetById(a_ID).m_LightValue;          }
-	inline static NIBBLETYPE GetSpreadLightFalloff(unsigned int a_ID) { return GetById(a_ID).m_SpreadLightFalloff;  }
-	inline static bool IsTransparent              (unsigned int a_ID) { return GetById(a_ID).m_Transparent;         }
-	inline static bool IsOneHitDig                (unsigned int a_ID) { return GetById(a_ID).m_OneHitDig;           }
-	inline static bool IsPistonBreakable          (unsigned int a_ID) { return GetById(a_ID).m_PistonBreakable;     }
-	inline static bool IsSnowable                 (unsigned int a_ID) { return GetById(a_ID).m_IsSnowable;          }
-	inline static bool RequiresSpecialTool        (unsigned int a_ID) { return GetById(a_ID).m_RequiresSpecialTool; }
-	inline static bool IsSolid                    (unsigned int a_ID) { return GetById(a_ID).m_IsSolid;             }
-	inline static bool FullyOccupiesVoxel         (unsigned int a_ID) { return GetById(a_ID).m_FullyOccupiesVoxel;  }
+	inline static NIBBLETYPE GetLightValue        (BLOCKTYPE a_Type) { return Get(a_Type).m_LightValue;          }
+	inline static NIBBLETYPE GetSpreadLightFalloff(BLOCKTYPE a_Type) { return Get(a_Type).m_SpreadLightFalloff;  }
+	inline static bool IsTransparent              (BLOCKTYPE a_Type) { return Get(a_Type).m_Transparent;         }
+	inline static bool IsOneHitDig                (BLOCKTYPE a_Type) { return Get(a_Type).m_OneHitDig;           }
+	inline static bool IsPistonBreakable          (BLOCKTYPE a_Type) { return Get(a_Type).m_PistonBreakable;     }
+	inline static bool IsSnowable                 (BLOCKTYPE a_Type) { return Get(a_Type).m_IsSnowable;          }
+	inline static bool RequiresSpecialTool        (BLOCKTYPE a_Type) { return Get(a_Type).m_RequiresSpecialTool; }
+	inline static bool IsSolid                    (BLOCKTYPE a_Type) { return Get(a_Type).m_IsSolid;             }
+	inline static bool FullyOccupiesVoxel         (BLOCKTYPE a_Type) { return Get(a_Type).m_FullyOccupiesVoxel;  }
 
 	// tolua_end