summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--MCServer/.gitignore1
-rw-r--r--MCServer/Plugins/APIDump/APIDesc.lua68
-rw-r--r--MCServer/Plugins/APIDump/APIDump.deproj3
-rw-r--r--MCServer/Plugins/APIDump/main.lua235
-rw-r--r--source/World.cpp2
5 files changed, 258 insertions, 51 deletions
diff --git a/MCServer/.gitignore b/MCServer/.gitignore
index 5a018cc6d..ff0517cfa 100644
--- a/MCServer/.gitignore
+++ b/MCServer/.gitignore
@@ -4,6 +4,7 @@ MCServer
logs
players
world*
+API/
API.txt
API_wiki.txt
*.dat
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
new file mode 100644
index 000000000..44981fdd7
--- /dev/null
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -0,0 +1,68 @@
+
+-- APIDesc.lua
+
+-- Contains the API objects' descriptions
+
+
+
+
+g_APIDesc =
+{
+ Classes =
+ {
+ cBlockArea =
+ {
+ Desc = [[
+ This class is used when multiple adjacent blocks are to be manipulated. Because of chunking
+ and multithreading, manipulating single blocks using {{api:cWorld|cWorld:SetBlock}}() is a rather
+ time-consuming operation (locks for exclusive access need to be obtained, chunk lookup is done
+ for each block), so whenever you need to manipulate multiple adjacent blocks, it's better to wrap
+ the operation into a cBlockArea access. cBlockArea is capable of reading / writing across chunk
+ boundaries, has no chunk lookups for get and set operations and is not subject to multithreading
+ locking (because it is not shared among threads).</p>
+ <p>
+ cBlockArea remembers its origin (MinX, MinY, MinZ coords in the Read() call) and therefore supports
+ absolute as well as relative get / set operations. Despite that, the contents of a cBlockArea can
+ be written back into the world at any coords.</p>
+ <p>
+ cBlockArea can hold any combination of the following datatypes:<ul>
+ <li>block types</li>
+ <li>block metas</li>
+ <li>blocklight</li>
+ <li>skylight</li>
+ </ul>
+ Read() and Write() functions have parameters that tell the class which datatypes to read / write.
+ Note that a datatype that has not been read cannot be written (FIXME).</p>
+ <p>
+ Typical usage:<ul>
+ <li>Create cBlockArea object</li>
+ <li>Read an area from the world</li>
+ <li>Modify blocks inside cBlockArea</li>
+ <li>Write the area back to a world</li>
+ </ul></p>
+ ]],
+ Functions =
+ {
+ Clear = { Notes = "Clears the object, resets it to zero size" },
+ CopyFrom = { Params = "{{cBlockArea|BlockAreaSrc}}", Notes = "Copies contents from BlockAreaSrc into self"},
+ CopyTo = { Params = "{{cBlockArea|BlockAreaDst}}", Notes = "Copies contents from self into BlockAreaDst"},
+ GetBlockLight = { Params = "BlockX, BlockY, BlockZ", Return = "NIBBLETYPE", Notes = "Returns the blocklight at the specified absolute coords"},
+ },
+ },
+
+ cBlockEntity =
+ {
+ }
+ },
+
+ IgnoreFunctions =
+ {
+ "globals.assert",
+ "globals.collectgarbage",
+ "globals.xpcall",
+ }
+} ;
+
+
+
+
diff --git a/MCServer/Plugins/APIDump/APIDump.deproj b/MCServer/Plugins/APIDump/APIDump.deproj
index 0d6ad82fa..9ee9170f2 100644
--- a/MCServer/Plugins/APIDump/APIDump.deproj
+++ b/MCServer/Plugins/APIDump/APIDump.deproj
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<project>
<file>
+ <filename>APIDesc.lua</filename>
+ </file>
+ <file>
<filename>main.lua</filename>
</file>
</project>
diff --git a/MCServer/Plugins/APIDump/main.lua b/MCServer/Plugins/APIDump/main.lua
index d0a1da3b1..c13611d2e 100644
--- a/MCServer/Plugins/APIDump/main.lua
+++ b/MCServer/Plugins/APIDump/main.lua
@@ -7,8 +7,17 @@
+-- Global variables:
+g_Plugin = nil;
+
+
+
+
+
function Initialize(Plugin)
+ g_Plugin = Plugin;
+
Plugin:SetName("APIDump")
Plugin:SetVersion(1)
@@ -16,11 +25,11 @@ function Initialize(Plugin)
LOG("Initialized " .. Plugin:GetName() .. " v." .. Plugin:GetVersion())
-- dump all available API functions and objects:
- DumpAPI();
+ -- DumpAPITxt();
+
+ -- Dump all available API object in HTML format into a subfolder:
+ DumpAPIHtml();
- -- Dump all available API objects in wiki-style tables:
- DumpAPIWiki();
-
return true
end
@@ -29,7 +38,7 @@ end
-function DumpAPI()
+function DumpAPITxt()
LOG("Dumping all available functions to API.txt...");
function dump (prefix, a, Output)
for i, v in pairs (a) do
@@ -66,27 +75,30 @@ end
-function DumpAPIWiki()
+
+function CreateAPITables()
--[[
We want an API table of the following shape:
local API = {
- {"cCuboid", {
+ {
+ Name = "cCuboid",
Functions = {
- "Sort",
- "IsInside"
+ {Name = "Sort"},
+ {Name = "IsInside"}
},
Constants = {
}
}},
- {"cBlockArea", {
+ {
+ Name = "cBlockArea",
Functions = {
- "Clear",
- "CopyFrom",
+ {Name = "Clear"},
+ {Name = "CopyFrom"},
...
}
Constants = {
- {"baTypes", 0},
- {"baMetas", 1},
+ {Name = "baTypes", Value = 0},
+ {Name = "baMetas", Value = 1},
...
}
...
@@ -102,31 +114,33 @@ function DumpAPIWiki()
};
--]]
- LOG("Dumping all available functions and constants to API_wiki.txt...");
-
local Globals = {Functions = {}, Constants = {}};
local API = {};
local function Add(a_APIContainer, a_ClassName, a_ClassObj)
if (type(a_ClassObj) == "function") then
- table.insert(a_APIContainer.Functions, a_ClassName);
+ table.insert(a_APIContainer.Functions, {Name = a_ClassName});
elseif (type(a_ClassObj) == "number") then
- table.insert(a_APIContainer.Constants, {a_ClassName, a_ClassObj});
+ table.insert(a_APIContainer.Constants, {Name = a_ClassName, Value = a_ClassObj});
end
end
local function SortClass(a_ClassAPI)
-- Sort the function list and constant lists:
- table.sort(a_ClassAPI.Functions);
+ table.sort(a_ClassAPI.Functions,
+ function(f1, f2)
+ return (f1.Name < f2.Name);
+ end
+ );
table.sort(a_ClassAPI.Constants,
function(c1, c2)
- return (c1[1] < c2[1]);
+ return (c1.Name < c2.Name);
end
);
end;
- local function ParseClass(a_ClassObj)
- local res = {Functions = {}, Constants = {}};
+ local function ParseClass(a_ClassName, a_ClassObj)
+ local res = {Name = a_ClassName, Functions = {}, Constants = {}};
for i, v in pairs(a_ClassObj) do
Add(res, i, v);
end
@@ -141,7 +155,7 @@ function DumpAPIWiki()
local StartLetter = GetChar(i, 0);
if (StartLetter == "c") then
-- Starts with a "c", handle it as a MCS API class
- table.insert(API, {i, ParseClass(v)});
+ table.insert(API, ParseClass(i, v));
end
else
Add(Globals, i, v);
@@ -150,42 +164,163 @@ function DumpAPIWiki()
SortClass(Globals);
table.sort(API,
function(c1, c2)
- return (c1[1] < c2[1]);
+ return (c1.Name < c2.Name);
end
);
- -- Now dump the whole thing into a file, formatted as a wiki table:
- local function WriteClass(a_File, a_ClassAPI)
- if (#a_ClassAPI.Functions > 0) then
- a_File:write("Functions:\n");
- a_File:write("^ Function name ^ Parameters ^ Return value ^ Note ^\n");
- for i, n in ipairs(a_ClassAPI.Functions) do
- a_File:write("| " .. n .. " | | | |\n");
- end
- a_File:write("\n\n");
+ return API, Globals;
+end
+
+
+
+
+
+function DumpAPIHtml()
+ LOG("Dumping all available functions and constants to API subfolder...");
+
+ local API, Globals = CreateAPITables();
+ Globals.Name = "Globals";
+ table.insert(API, Globals);
+
+ -- Read in the descriptions:
+ ReadDescriptions(API);
+
+ -- Create the output folder:
+ os.execute("mkdir API");
+
+ -- Create a "class index" file, write each class as a link to that file,
+ -- then dump class contents into class-specific file
+ local f = io.open("API/index.html", "w");
+ f:write([[<html><head><title>MCServer API - class index</title>
+ <link rel="stylesheet" type="text/css" href="main.css" />
+ </head><body>
+ <ul>
+ ]]);
+ for i, cls in ipairs(API) do
+ f:write("<li><a href=\"" .. cls.Name .. ".html\">" .. cls.Name .. "</a></li>\n");
+ WriteHtmlClass(cls);
+ end
+ f:write("</ul></body></html>");
+ f:close();
+end
+
+
+
+
+
+function ReadDescriptions(a_API)
+ local UnexportedDocumented = {}; -- List of API objects that are documented but not exported, simply a list of names
+ for i, cls in ipairs(a_API) do
+ local APIDesc = g_APIDesc.Classes[cls.Name];
+ if (APIDesc ~= nil) then
+ cls.Desc = APIDesc.Desc;
+
+ if (APIDesc.Functions ~= nil) then
+ -- Assign function descriptions:
+ for j, func in ipairs(cls.Functions) do
+ -- func is {"FuncName"}, add Parameters, Return and Notes from g_APIDesc
+ local FnDesc = APIDesc.Functions[func.Name];
+ if (FnDesc ~= nil) then
+ func.Params = FnDesc.Params;
+ func.Return = FnDesc.Return;
+ func.Notes = FnDesc.Notes;
+ FnDesc.IsExported = true;
+ end
+ end -- for j, func
+
+ -- Add all non-exported function descriptions to UnexportedDocumented:
+ for j, func in pairs(APIDesc.Functions) do
+ -- TODO
+ end
+ end -- if (APIDesc.Functions ~= nil)
+
+ if (APIDesc.Constants ~= nil) then
+ -- Assign constant descriptions:
+ for j, cons in ipairs(cls.Constants) do
+ local CnDesc = APIDesc.Constants[cons.Name];
+ if (CnDesc ~= nil) then
+ cons.Notes = CnDesc.Notes;
+ CnDesc.IsExported = true;
+ end
+ end -- for j, cons
+
+ -- Add all non-exported constant descriptions to UnexportedDocumented:
+ for j, cons in pairs(APIDesc.Constants) do
+ -- TODO
+ end
+ end -- if (APIDesc.Constants ~= nil)
+
end
-
- if (#a_ClassAPI.Constants > 0) then
- a_File:write("Constants:\n");
- a_File:write("^ Constant ^ Value ^ Note ^\n");
- for i, n in ipairs(a_ClassAPI.Constants) do
- a_File:write("| " .. n[1] .. " | " .. n[2] .. " | |\n");
- end
- a_File:write("\n\n");
+ end -- for i, class
+end
+
+
+
+
+
+function WriteHtmlClass(a_ClassAPI)
+ local cf, err = io.open("API/" .. a_ClassAPI.Name .. ".html", "w");
+ if (cf == nil) then
+ return;
+ end
+
+ local function LinkifyString(a_String)
+ -- TODO: Make a link out of anything with the special linkifying syntax {{link|title}}
+ -- a_String:gsub("{{([^|]*)|[^}]*}}", "<a href=\"%1\">%2</a>");
+ return a_String;
+ end
+
+ cf:write([[<html><head><title>MCServer API - ]] .. a_ClassAPI.Name .. [[</title>
+ <link rel="stylesheet" type="text/css" href="main.css" />
+ </head><body>
+ <h1>Contents</h1>
+ <ul>
+ ]]);
+
+ -- Write the table of contents:
+ if (#a_ClassAPI.Constants > 0) then
+ cf:write("<li><a href=\"#constants\">Constants</a></li>\n");
+ end
+ if (#a_ClassAPI.Functions > 0) then
+ cf:write("<li><a href=\"#functions\">Functions</a></li>\n");
+ end
+ cf:write("</ul>");
+
+ -- Write the class description:
+ cf:write("<a name=\"desc\"><h1>" .. a_ClassAPI.Name .. "</h1></a>\n");
+ if (a_ClassAPI.Desc ~= nil) then
+ cf:write("<p>");
+ cf:write(a_ClassAPI.Desc);
+ cf:write("</p>\n");
+ end;
+
+ -- Write the constants:
+ if (#a_ClassAPI.Constants > 0) then
+ cf:write("<a name=\"constants\"><h1>Constants</h1></a>\n");
+ cf:write("<table><tr><th>Name</th><th>Value</th><th>Notes</th></tr>\n");
+ for i, cons in ipairs(a_ClassAPI.Constants) do
+ cf:write("<tr><td>" .. cons.Name .. "</td>");
+ cf:write("<td>" .. cons.Value .. "</td>");
+ cf:write("<td>" .. LinkifyString(cons.Notes or "") .. "</td></tr>\n");
end
+ cf:write("</table>\n");
end
- local f = io.open("API_wiki.txt", "w");
- for i, n in ipairs(API) do
- f:write("Class " .. n[1] .. "\n");
- WriteClass(f, n[2]);
- f:write("\n\n\n----------------\n");
+ -- Write the functions:
+ if (#a_ClassAPI.Functions > 0) then
+ cf:write("<a name=\"functions\"><h1>Functions</h1></a>\n");
+ cf:write("<table><tr><th>Name</th><th>Parameters</th><th>Return value</th><th>Notes</th></tr>\n");
+ for i, func in ipairs(a_ClassAPI.Functions) do
+ cf:write("<tr><td>" .. func.Name .. "</td>");
+ cf:write("<td>" .. LinkifyString(func.Params or "").. "</td>");
+ cf:write("<td>" .. LinkifyString(func.Return or "").. "</td>");
+ cf:write("<td>" .. LinkifyString(func.Notes or "") .. "</td></tr>\n");
+ end
+ cf:write("</table>\n");
end
- f:write("globals:\n");
- WriteClass(f, Globals);
- f:close();
- LOG("API_wiki.txt file written");
+ cf:write("</body></html>");
+ cf:close();
end
diff --git a/source/World.cpp b/source/World.cpp
index a3572a48a..edcbb48f2 100644
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -525,7 +525,7 @@ void cWorld::Start(void)
m_LastSave = 0;
m_LastUnload = 0;
- // preallocate some memory for ticking blocks so we don�t need to allocate that often
+ // preallocate some memory for ticking blocks so we don't need to allocate that often
m_BlockTickQueue.reserve(1000);
m_BlockTickQueueCopy.reserve(1000);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-10 22:12:58 +0200