1 files changed, 78 insertions, 83 deletions

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index f5777b67e..82bbe9e0d 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -487,9 +487,9 @@ g_APIDesc =
 			]],
 			Functions =
 			{
-				Sort = { Notes = "void" },
-				IsInside = { Notes = "bool" },
-				IsInside = { Notes = "bool" },
+				Sort = { Return = "" },
+				IsInside = { Return = "bool" },
+				IsInside = { Return = "bool" },
 			},
 			Variables =
 			{
@@ -688,14 +688,14 @@ g_APIDesc =
 ]],
 			Functions =
 			{
-				SetName = { Notes = "void" },
-				GetName = { Notes = "String" },
-				SetColor = { Notes = "void" },
-				GetColor = { Notes = "String" },
-				AddCommand = { Notes = "void" },
-				HasCommand = { Notes = "bool" },
-				AddPermission = { Notes = "void" },
-				InheritFrom = { Notes = "void" },
+				SetName = { Return = "" },
+				GetName = { Return = "string" },
+				SetColor = { Return = "" },
+				GetColor = { Return = "string" },
+				AddCommand = { Return = "" },
+				HasCommand = { Return = "bool" },
+				AddPermission = { Return = "" },
+				InheritFrom = { Return = "" },
 			},
 			Constants =
 			{
@@ -709,16 +709,16 @@ g_APIDesc =
 			Functions =
 			{
 				constructor = { Return = "{{cIniFile|cIniFile}}" },
-				CaseSensitive = { Notes = "void" },
-				CaseInsensitive = { Notes = "void" },
-				Path = { Notes = "void" },
-				Path = { Notes = "String" },
-				SetPath = { Notes = "void" },
-				ReadFile = { Notes = "bool" },
-				WriteFile = { Notes = "bool" },
-				Erase = { Notes = "void" },
-				Clear = { Notes = "void" },
-				Reset = { Notes = "void" },
+				CaseSensitive = { Return = "" },
+				CaseInsensitive = { Return = "" },
+				Path = { Return = "" },
+				Path = { Return = "string" },
+				SetPath = { Return = "" },
+				ReadFile = { Return = "bool" },
+				WriteFile = { Return = "bool" },
+				Erase = { Return = "" },
+				Clear = { Return = "" },
+				Reset = { Return = "" },
 				FindKey = { Notes = "long i" },
 				FindValue = { Notes = "long i" },
 				NumKeys = { Notes = "unsigned i" },
@@ -743,29 +743,29 @@ g_APIDesc =
 				GetValueSetI = { Notes = "i" },
 				GetValueSetB = { Notes = "bo" },
 				GetValueSetF = { Notes = "doub" },
-				SetValue = { Notes = "bool" },
-				SetValue = { Notes = "bool" },
-				SetValueI = { Notes = "bool" },
-				SetValueB = { Notes = "bool" },
-				SetValueF = { Notes = "bool" },
-				DeleteValueByID = { Notes = "bool" },
-				DeleteValue = { Notes = "bool" },
-				DeleteKey = { Notes = "bool" },
+				SetValue = { Return = "bool" },
+				SetValue = { Return = "bool" },
+				SetValueI = { Return = "bool" },
+				SetValueB = { Return = "bool" },
+				SetValueF = { Return = "bool" },
+				DeleteValueByID = { Return = "bool" },
+				DeleteValue = { Return = "bool" },
+				DeleteKey = { Return = "bool" },
 				NumHeaderComments = { Notes = "unsigned int" },
-				HeaderComment = { Notes = "void" },
+				HeaderComment = { Return = "" },
 				HeaderComment = { Notes = "Stri" },
-				DeleteHeaderComment = { Notes = "bool" },
-				DeleteHeaderComments = { Notes = "void" },
+				DeleteHeaderComment = { Return = "bool" },
+				DeleteHeaderComments = { Return = "" },
 				NumKeyComments = { Notes = "unsigned i" },
 				NumKeyComments = { Notes = "unsigned i" },
-				KeyComment = { Notes = "bool" },
-				KeyComment = { Notes = "bool" },
+				KeyComment = { Return = "bool" },
+				KeyComment = { Return = "bool" },
 				KeyComment = { Notes = "Stri" },
 				KeyComment = { Notes = "Stri" },
-				DeleteKeyComment = { Notes = "bool" },
-				DeleteKeyComment = { Notes = "bool" },
-				DeleteKeyComments = { Notes = "bool" },
-				DeleteKeyComments = { Notes = "bool" },
+				DeleteKeyComment = { Return = "bool" },
+				DeleteKeyComment = { Return = "bool" },
+				DeleteKeyComments = { Return = "bool" },
+				DeleteKeyComments = { Return = "bool" },
 			},
 			Constants =
 			{
@@ -1042,12 +1042,12 @@ a_Player:OpenWindow(Window);
 ]],
 			Functions =
 			{
-				TeleportToEntity = { Notes = "void" },
-				TeleportTo = { Notes = "void" },
-				Heal = { Notes = "void" },
-				TakeDamage = { Notes = "void" },
-				KilledBy = { Notes = "void" },
-				GetHealth = { Notes = "int" },
+				TeleportToEntity = { Return = "" },
+				TeleportTo = { Return = "" },
+				Heal = { Return = "" },
+				TakeDamage = { Return = "" },
+				KilledBy = { Return = "" },
+				GetHealth = { Return = "number" },
 			},
 			Constants =
 			{
@@ -1063,7 +1063,7 @@ a_Player:OpenWindow(Window);
 			{
 				cPickup = { Notes = "[[cPickup}}" },
 				GetItem = { Notes = "{{cItem|cItem}}" },
-				CollectedBy = { Notes = "bool" },
+				CollectedBy = { Return = "bool" },
 			},
 			Constants =
 			{
@@ -1077,40 +1077,35 @@ a_Player:OpenWindow(Window);
 ]],
 			Functions =
 			{
-				GetEyeHeight = { Notes = "double" },
-				GetEyePosition = { Notes = "{{Vector3d|Vector3d}}" },
-				GetFlying = { Notes = "bool" },
-				GetStance = { Notes = "double" },
-				GetInventory = { Notes = "{{cInventory|cInventory}}" },
-				TeleportTo = { Notes = "void" },
-				GetGameMode = { Notes = "{{eGameMode|eGameMode}}" },
-				GetIP = { Notes = "String" },
-				GetLastBlockActionTime = { Notes = "float" },
-				GetLastBlockActionCnt = { Notes = "int" },
-				SetLastBlockActionCnt = { Notes = "void" },
-				SetLastBlockActionTime = { Notes = "void" },
-				SetGameMode = { Notes = "void" },
-				MoveTo = { Notes = "void" },
-				GetClientHandle = { Notes = "{{cClientHandle|cClientHandle}}" },
-				SendMessage = { Notes = "void" },
-				GetName = { Notes = "String" },
-				SetName = { Notes = "void" },
-				AddToGroup = { Notes = "void" },
-				CanUseCommand = { Notes = "bool" },
-				HasPermission = { Notes = "bool" },
-				IsInGroup = { Notes = "bool" },
-				GetColor = { Notes = "String" },
-				TossItem = { Notes = "void" },
-				Heal = { Notes = "void" },
-				TakeDamage = { Notes = "void" },
-				KilledBy = { Notes = "void" },
-				Respawn = { Notes = "void" },
-				SetVisible = { Notes = "void" },
-				IsVisible = { Notes = "bool" },
-				MoveToWorld = { Notes = "bool" },
-				LoadPermissionsFromDisk = { Notes = "void" },
-				GetGroups = { Notes = "list<{{cGroup|cGroup}}>" },
-				GetResolvedPermissions = { Notes = "String" },
+				GetEyeHeight = { Return = "number" },
+				GetEyePosition = { Return = "{{Vector3d|EyePositionVector}}" },
+				GetFlying = { Return = "bool" },
+				GetStance = { Return = "number" },
+				GetInventory = { Return = "{{cInventory|Inventory}}" },
+				GetGameMode = { Return = "{{eGameMode|GameMode}}", Notes = "Returns the player's gamemode. The player may have their gamemode unassigned, in which case they inherit the gamemode from the current {{cWorld|world}}.<br /> <b>NOTE:</b> Instead of comparing the value returned by this function to the gmXXX constants, use the IsGameModeXXX() functions. These functions handle the gamemode inheritance automatically."},
+				GetIP = { Return = "string" },
+				SetGameMode = { Return = "" },
+				MoveTo = { Return = "" },
+				GetClientHandle = { Return = "{{cClientHandle|ClientHandle}}" },
+				SendMessage = { Return = "" },
+				GetName = { Return = "String" },
+				SetName = { Return = "" },
+				AddToGroup = { Return = "" },
+				CanUseCommand = { Return = "bool" },
+				HasPermission = { Return = "bool" },
+				IsInGroup = { Return = "bool" },
+				GetColor = { Return = "string" },
+				TossItem = { Return = "" },
+				Heal = { Return = "" },
+				TakeDamage = { Return = "" },
+				KilledBy = { Return = "" },
+				Respawn = { Return = "" },
+				SetVisible = { Return = "" },
+				IsVisible = { Return = "bool" },
+				MoveToWorld = { Return = "bool" },
+				LoadPermissionsFromDisk = { Return = "" },
+				GetGroups = { Return = "list<{{cGroup|cGroup}}>" },
+				GetResolvedPermissions = { Return = "string" },
 			},
 			Constants =
 			{
@@ -1124,11 +1119,11 @@ a_Player:OpenWindow(Window);
 ]],
 			Functions =
 			{
-				GetName = { Notes = "String" },
-				SetName = { Notes = "void" },
+				GetName = { Return = "string" },
+				SetName = { Return = "" },
 				GetVersion = { Notes = "int" },
-				SetVersion = { Notes = "void" },
-				GetFileName = { Notes = "String" },
+				SetVersion = { Return = "" },
+				GetFileName = { Return = "string" },
 				CreateWebPlugin = { Notes = "{{cWebPlugin|cWebPlugin}}" },
 			},
 			Constants =