summaryrefslogtreecommitdiffstats
path: root/MCServer
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-12-16 22:13:31 +0100
committermadmaxoft <github@xoft.cz>2013-12-16 22:13:46 +0100
commit5d4e1725d43809baf667c51cba8fa8f1dec3220b (patch)
tree81437f3f00a3acc13927d54ac8f39ed7a4bc5dbf /MCServer
parentFixed multiple inheritance in ToLua++. (diff)
downloadcuberite-5d4e1725d43809baf667c51cba8fa8f1dec3220b.tar
cuberite-5d4e1725d43809baf667c51cba8fa8f1dec3220b.tar.gz
cuberite-5d4e1725d43809baf667c51cba8fa8f1dec3220b.tar.bz2
cuberite-5d4e1725d43809baf667c51cba8fa8f1dec3220b.tar.lz
cuberite-5d4e1725d43809baf667c51cba8fa8f1dec3220b.tar.xz
cuberite-5d4e1725d43809baf667c51cba8fa8f1dec3220b.tar.zst
cuberite-5d4e1725d43809baf667c51cba8fa8f1dec3220b.zip
Diffstat (limited to 'MCServer')
-rw-r--r--MCServer/Plugins/APIDump/APIDesc.lua11
-rw-r--r--MCServer/Plugins/APIDump/main_APIDump.lua11
2 files changed, 20 insertions, 2 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 214b45a70..5bc4a5f39 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -2713,8 +2713,8 @@ end
"os",
"string",
"table",
- "g_TrackedPages",
"g_Stats",
+ "g_TrackedPages",
},
IgnoreFunctions =
@@ -2747,6 +2747,15 @@ end
"WriteStats",
},
+ IgnoreConstants =
+ {
+ "cChestEntity.__cBlockEntityWindowOwner__",
+ "cDropSpenserEntity.__cBlockEntityWindowOwner__",
+ "cFurnaceEntity.__cBlockEntityWindowOwner__",
+ "cHopperEntity.__cBlockEntityWindowOwner__",
+ "cLuaWindow.__cItemGrid__cListener__",
+ },
+
IgnoreVariables =
{
"__.*__", -- tolua exports multiple inheritance this way
diff --git a/MCServer/Plugins/APIDump/main_APIDump.lua b/MCServer/Plugins/APIDump/main_APIDump.lua
index de4239f7e..ec5569f55 100644
--- a/MCServer/Plugins/APIDump/main_APIDump.lua
+++ b/MCServer/Plugins/APIDump/main_APIDump.lua
@@ -700,6 +700,15 @@ function ReadDescriptions(a_API)
end
);
+ -- Remove ignored constants:
+ local NewConstants = {};
+ for j, cn in ipairs(cls.Constants) do
+ if (not(IsFunctionIgnored(cls.Name, cn.Name))) then
+ table.insert(NewConstants, cn);
+ end
+ end -- for j, cn
+ cls.Constants = NewConstants;
+
-- Sort the constants:
table.sort(cls.Constants,
function(c1, c2)
@@ -707,7 +716,7 @@ function ReadDescriptions(a_API)
end
);
- -- Remove ignored functions:
+ -- Remove ignored member variables:
local NewVariables = {};
for j, var in ipairs(cls.Variables) do
if (not(IsVariableIgnored(cls.Name .. "." .. var.Name))) then