diff --git a/.gitignore b/.gitignore
index 50d7c43e0fd588e43d9204978d584efba46ede10..c8f21e5044aea7d784b1fa1eb8734caa4aa512c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,11 @@ src/CMakeFiles/*
src/Makefile
src/cmake_config.h
src/cmake_install.cmake
+src/script/CMakeFiles/*
+src/script/common/CMakeFiles/*
+src/script/cpp_api/CMakeFiles/*
+src/script/lua_api/CMakeFiles/*
+src/util/CMakeFiles/*
src/jthread/CMakeFiles/*
src/jthread/Makefile
src/jthread/cmake_config.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba273a0dc656a17a61f66bf7a44891b78a2e423e..446fff07530745cd4d8393254d357e0fb348bd11 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,11 +133,6 @@ endif()
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/builtin" DESTINATION "${SHAREDIR}")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/client" DESTINATION "${SHAREDIR}")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/games/minimal" DESTINATION "${SHAREDIR}/games")
-set(COMMON_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/common")
-if(EXISTS ${COMMON_SOURCE} AND IS_DIRECTORY ${COMMON_SOURCE})
- install(FILES ${COMMON_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/common/")
- install(DIRECTORY ${COMMON_SOURCE}/mods DESTINATION "${SHAREDIR}/games/common")
-endif()
set(MINETEST_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/minetest_game")
if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE})
install(FILES ${MINETEST_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/minetest_game/")
@@ -145,24 +140,12 @@ if(EXISTS ${MINETEST_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_GAME_SOURCE})
install(DIRECTORY ${MINETEST_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/minetest_game")
install(DIRECTORY ${MINETEST_GAME_SOURCE}/menu DESTINATION "${SHAREDIR}/games/minetest_game")
endif()
-set(MINETEST_BUILD_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/build")
-if(EXISTS ${MINETEST_BUILD_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_BUILD_GAME_SOURCE})
- install(FILES ${MINETEST_BUILD_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/build/")
- install(FILES ${MINETEST_BUILD_GAME_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/build/")
- install(DIRECTORY ${MINETEST_BUILD_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/build")
-endif()
-set(MINETEST_SURVIVAL_GAME_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/games/survival")
-if(EXISTS ${MINETEST_SURVIVAL_GAME_SOURCE} AND IS_DIRECTORY ${MINETEST_SURVIVAL_GAME_SOURCE})
- install(FILES ${MINETEST_SURVIVAL_GAME_SOURCE}/game.conf DESTINATION "${SHAREDIR}/games/survival/")
- install(FILES ${MINETEST_SURVIVAL_GAME_SOURCE}/README.txt DESTINATION "${SHAREDIR}/games/survival/")
- install(DIRECTORY ${MINETEST_SURVIVAL_GAME_SOURCE}/mods DESTINATION "${SHAREDIR}/games/survival")
-endif()
if(BUILD_CLIENT)
#install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/sounds/base/pack" DESTINATION "${SHAREDIR}/sounds/base")
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/textures/base/pack" DESTINATION "${SHAREDIR}/textures/base")
endif()
if(RUN_IN_PLACE)
- install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/minetest/mods_here.txt" DESTINATION "${SHAREDIR}/mods/minetest")
+ install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/mods/mods_here.txt" DESTINATION "${SHAREDIR}/mods")
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/textures/all/textures_here.txt" DESTINATION "${SHAREDIR}/textures/all")
endif()
diff --git a/README.txt b/README.txt
index ae5003f77bf741533f38cfc10007b0eb9fbf0ed8..43b31d70f3350b0ecb20a1519705e6d4f91beae3 100644
--- a/README.txt
+++ b/README.txt
@@ -9,10 +9,9 @@ and contributors (see source file comments and the version control log)
In case you downloaded the source code:
---------------------------------------
If you downloaded the Minetest Engine source code in which this file is
-contained, you probably want to download these projects too:
- https://github.com/minetest/common/
+contained, you probably want to download the minetest_game project too:
https://github.com/minetest/minetest_game/
-See the README.txt in them.
+See the README.txt in it.
Further documentation
----------------------
@@ -92,13 +91,6 @@ $ wget https://github.com/minetest/minetest/tarball/master -O master.tar.gz
$ tar xf master.tar.gz
$ cd minetest-minetest-286edd4 (or similar)
-Download common (needed for minetest_game and some others)
-$ cd games/
-$ wget https://github.com/minetest/common/tarball/master -O common.tar.gz
-$ tar xf common.tar.gz
-$ mv minetest-common-* common
-$ cd ..
-
Download minetest_game (otherwise only the "Minimal development test" game is available)
$ cd games/
$ wget https://github.com/minetest/minetest_game/tarball/master -O minetest_game.tar.gz
@@ -124,7 +116,7 @@ $ ./minetest
Compiling on Windows:
---------------------
- This section is outdated. In addition to what is described here:
- - In addition to minetest, you need to download common and minetest_game.
+ - In addition to minetest, you need to download minetest_game.
- If you wish to have sound support, you need libogg, libvorbis and libopenal
- You need:
@@ -267,6 +259,20 @@ distribution.
Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
http://creativecommons.org/licenses/by-sa/3.0/
+Authors of media files
+-----------------------
+Everything not listed in here:
+Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+BlockMen:
+ textures/base/pack/menuheader.png
+
+erlehmann:
+ misc/minetest-icon-24x24.png
+ misc/minetest-icon.ico
+ misc/minetest-icon.svg
+ textures/base/pack/logo.png
+
License of Minetest source code
-------------------------------
diff --git a/builtin/chatcommands.lua b/builtin/chatcommands.lua
index f548fb01df037065d8d61cabc496503714f39c84..6a3b29e7c83004b88fddf4d15387edd718a28f7a 100644
--- a/builtin/chatcommands.lua
+++ b/builtin/chatcommands.lua
@@ -261,7 +261,7 @@ minetest.register_chatcommand("teleport", {
}
for _, d in ipairs(tries) do
local p = {x = pos.x+d.x, y = pos.y+d.y, z = pos.z+d.z}
- local n = minetest.env:get_node(p)
+ local n = minetest.get_node(p)
if not minetest.registered_nodes[n.name].walkable then
return p, true
end
@@ -272,7 +272,7 @@ minetest.register_chatcommand("teleport", {
local teleportee = nil
local p = {}
p.x, p.y, p.z = string.match(param, "^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
- teleportee = minetest.env:get_player_by_name(name)
+ teleportee = minetest.get_player_by_name(name)
if teleportee and p.x and p.y and p.z then
minetest.chat_send_player(name, "Teleporting to ("..p.x..", "..p.y..", "..p.z..")")
teleportee:setpos(p)
@@ -283,9 +283,9 @@ minetest.register_chatcommand("teleport", {
local p = nil
local target_name = nil
target_name = string.match(param, "^([^ ]+)$")
- teleportee = minetest.env:get_player_by_name(name)
+ teleportee = minetest.get_player_by_name(name)
if target_name then
- local target = minetest.env:get_player_by_name(target_name)
+ local target = minetest.get_player_by_name(target_name)
if target then
p = target:getpos()
end
@@ -303,7 +303,7 @@ minetest.register_chatcommand("teleport", {
local teleportee_name = nil
teleportee_name, p.x, p.y, p.z = string.match(param, "^([^ ]+) +([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
if teleportee_name then
- teleportee = minetest.env:get_player_by_name(teleportee_name)
+ teleportee = minetest.get_player_by_name(teleportee_name)
end
if teleportee and p.x and p.y and p.z then
minetest.chat_send_player(name, "Teleporting "..teleportee_name.." to ("..p.x..", "..p.y..", "..p.z..")")
@@ -317,10 +317,10 @@ minetest.register_chatcommand("teleport", {
local target_name = nil
teleportee_name, target_name = string.match(param, "^([^ ]+) +([^ ]+)$")
if teleportee_name then
- teleportee = minetest.env:get_player_by_name(teleportee_name)
+ teleportee = minetest.get_player_by_name(teleportee_name)
end
if target_name then
- local target = minetest.env:get_player_by_name(target_name)
+ local target = minetest.get_player_by_name(target_name)
if target then
p = target:getpos()
end
@@ -402,7 +402,7 @@ local function handle_give_command(cmd, giver, receiver, stackstring)
minetest.chat_send_player(giver, 'error: cannot give an unknown item')
return
end
- local receiverref = minetest.env:get_player_by_name(receiver)
+ local receiverref = minetest.get_player_by_name(receiver)
if receiverref == nil then
minetest.chat_send_player(giver, receiver..' is not a known player')
return
@@ -466,14 +466,14 @@ minetest.register_chatcommand("spawnentity", {
return
end
print('/spawnentity invoked, entityname="'..entityname..'"')
- local player = minetest.env:get_player_by_name(name)
+ local player = minetest.get_player_by_name(name)
if player == nil then
print("Unable to spawn entity, player is nil")
return true -- Handled chat message
end
local p = player:getpos()
p.y = p.y + 1
- minetest.env:add_entity(p, entityname)
+ minetest.add_entity(p, entityname)
minetest.chat_send_player(name, '"'..entityname
..'" spawned.');
end,
@@ -483,7 +483,7 @@ minetest.register_chatcommand("pulverize", {
description = "delete item in hand",
privs = {},
func = function(name, param)
- local player = minetest.env:get_player_by_name(name)
+ local player = minetest.get_player_by_name(name)
if player == nil then
print("Unable to pulverize, player is nil")
return true -- Handled chat message
@@ -533,7 +533,7 @@ minetest.register_chatcommand("rollback_check", {
if act_p.x ~= pos.x or act_p.y ~= pos.y or act_p.z ~= pos.z then
nodedesc = minetest.pos_to_string(act_p)
end
- local nodename = minetest.env:get_node(act_p).name
+ local nodename = minetest.get_node(act_p).name
minetest.chat_send_player(name, "Last actor on "..nodedesc..
" was "..actor..", "..dump(act_seconds)..
"s ago (node is now "..nodename..")")
@@ -598,7 +598,7 @@ minetest.register_chatcommand("time", {
if newtime == nil then
minetest.chat_send_player(name, "Invalid time")
else
- minetest.env:set_timeofday((newtime % 24000) / 24000)
+ minetest.set_timeofday((newtime % 24000) / 24000)
minetest.chat_send_player(name, "Time of day changed.")
minetest.log("action", name .. " sets time " .. newtime)
end
@@ -625,7 +625,7 @@ minetest.register_chatcommand("ban", {
minetest.chat_send_player(name, "Ban list: " .. minetest.get_ban_list())
return
end
- if not minetest.env:get_player_by_name(param) then
+ if not minetest.get_player_by_name(param) then
minetest.chat_send_player(name, "No such player")
return
end
@@ -660,7 +660,7 @@ minetest.register_chatcommand("clearobjects", {
func = function(name, param)
minetest.log("action", name .. " clears all objects")
minetest.chat_send_all("Clearing all objects. This may take long. You may experience a timeout. (by " .. name .. ")")
- minetest.env:clear_objects()
+ minetest.clear_objects()
minetest.log("action", "object clearing done")
minetest.chat_send_all("*** Cleared all objects.")
end,
@@ -673,7 +673,7 @@ minetest.register_chatcommand("msg", {
func = function(name, param)
local found, _, sendto, message = param:find("^([^%s]+)%s(.+)$")
if found then
- if minetest.env:get_player_by_name(sendto) then
+ if minetest.get_player_by_name(sendto) then
minetest.log("action", "PM from "..name.." to "..sendto..": "..message)
minetest.chat_send_player(sendto, "PM from "..name..": "..message, false)
minetest.chat_send_player(name, "Message sent")
diff --git a/builtin/deprecated.lua b/builtin/deprecated.lua
index 405ce3b09fbcddc3ecc47f37a2b6a38090037fc2..23ab386750674919d2cb45611070e427f26740a5 100644
--- a/builtin/deprecated.lua
+++ b/builtin/deprecated.lua
@@ -24,3 +24,25 @@ minetest.add_to_creative_inventory = function(itemstring)
minetest.log('info', "WARNING: minetest.add_to_creative_inventory: This function is deprecated and does nothing.")
end
+--
+-- EnvRef
+--
+minetest.env = {}
+local envref_deprecation_message_printed = false
+setmetatable(minetest.env, {
+ __index = function(table, key)
+ if not envref_deprecation_message_printed then
+ minetest.log("info", "WARNING: minetest.env:[...] is deprecated and should be replaced with minetest.[...]")
+ envref_deprecation_message_printed = true
+ end
+ local func = minetest[key]
+ if type(func) == "function" then
+ rawset(table, key, function(self, ...)
+ return func(unpack({...}))
+ end)
+ else
+ rawset(table, key, nil)
+ end
+ return rawget(table, key)
+ end
+})
diff --git a/builtin/falling.lua b/builtin/falling.lua
index f6491991bbfe7baab087de8aa4dc8b5e7d048815..5ee693298519bc01a8f4b842446a98bebcfa1789 100644
--- a/builtin/falling.lua
+++ b/builtin/falling.lua
@@ -53,27 +53,27 @@ minetest.register_entity("__builtin:falling_node", {
-- Turn to actual sand when collides to ground or just move
local pos = self.object:getpos()
local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} -- Position of bottom center point
- local bcn = minetest.env:get_node(bcp)
+ local bcn = minetest.get_node(bcp)
-- Note: walkable is in the node definition, not in item groups
if minetest.registered_nodes[bcn.name] and
minetest.registered_nodes[bcn.name].walkable then
if minetest.registered_nodes[bcn.name].buildable_to then
- minetest.env:remove_node(bcp)
+ minetest.remove_node(bcp)
return
end
local np = {x=bcp.x, y=bcp.y+1, z=bcp.z}
-- Check what's here
- local n2 = minetest.env:get_node(np)
+ local n2 = minetest.get_node(np)
-- If it's not air or liquid, remove node and replace it with
-- it's drops
if n2.name ~= "air" and (not minetest.registered_nodes[n2.name] or
minetest.registered_nodes[n2.name].liquidtype == "none") then
local drops = minetest.get_node_drops(n2.name, "")
- minetest.env:remove_node(np)
+ minetest.remove_node(np)
-- Add dropped items
local _, dropped_item
for _, dropped_item in ipairs(drops) do
- minetest.env:add_item(np, dropped_item)
+ minetest.add_item(np, dropped_item)
end
-- Run script hook
local _, callback
@@ -82,7 +82,7 @@ minetest.register_entity("__builtin:falling_node", {
end
end
-- Create node and remove entity
- minetest.env:add_node(np, {name=self.nodename})
+ minetest.add_node(np, {name=self.nodename})
self.object:remove()
nodeupdate(np)
else
@@ -92,20 +92,20 @@ minetest.register_entity("__builtin:falling_node", {
})
function spawn_falling_node(p, nodename)
- obj = minetest.env:add_entity(p, "__builtin:falling_node")
+ obj = minetest.add_entity(p, "__builtin:falling_node")
obj:get_luaentity():set_node(nodename)
end
function drop_attached_node(p)
- local nn = minetest.env:get_node(p).name
- minetest.env:remove_node(p)
+ local nn = minetest.get_node(p).name
+ minetest.remove_node(p)
for _,item in ipairs(minetest.get_node_drops(nn, "")) do
local pos = {
x = p.x + math.random()/2 - 0.25,
y = p.y + math.random()/2 - 0.25,
z = p.z + math.random()/2 - 0.25,
}
- minetest.env:add_item(pos, item)
+ minetest.add_item(pos, item)
end
end
@@ -130,7 +130,7 @@ function check_attached_node(p, n)
d.y = -1
end
local p2 = {x=p.x+d.x, y=p.y+d.y, z=p.z+d.z}
- local nn = minetest.env:get_node(p2).name
+ local nn = minetest.get_node(p2).name
local def2 = minetest.registered_nodes[nn]
if def2 and not def2.walkable then
return false
@@ -143,10 +143,10 @@ end
--
function nodeupdate_single(p, delay)
- n = minetest.env:get_node(p)
+ n = minetest.get_node(p)
if minetest.get_node_group(n.name, "falling_node") ~= 0 then
p_bottom = {x=p.x, y=p.y-1, z=p.z}
- n_bottom = minetest.env:get_node(p_bottom)
+ n_bottom = minetest.get_node(p_bottom)
-- Note: walkable is in the node definition, not in item groups
if minetest.registered_nodes[n_bottom.name] and
(not minetest.registered_nodes[n_bottom.name].walkable or
@@ -154,7 +154,7 @@ function nodeupdate_single(p, delay)
if delay then
minetest.after(0.1, nodeupdate_single, {x=p.x, y=p.y, z=p.z}, false)
else
- minetest.env:remove_node(p)
+ minetest.remove_node(p)
spawn_falling_node(p, n.name)
nodeupdate(p)
end
diff --git a/builtin/item.lua b/builtin/item.lua
index 51a17106a60a3b73b31495f76ea0a25c6a6da0ab..85b4cc0e42e242bcb205bba9e5d96f50a3c5bc13 100644
--- a/builtin/item.lua
+++ b/builtin/item.lua
@@ -129,9 +129,9 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
end
local under = pointed_thing.under
- local oldnode_under = minetest.env:get_node_or_nil(under)
+ local oldnode_under = minetest.get_node_or_nil(under)
local above = pointed_thing.above
- local oldnode_above = minetest.env:get_node_or_nil(above)
+ local oldnode_above = minetest.get_node_or_nil(above)
if not oldnode_under or not oldnode_above then
minetest.log("info", placer:get_player_name() .. " tried to place"
@@ -163,7 +163,7 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
minetest.log("action", placer:get_player_name() .. " places node "
.. def.name .. " at " .. minetest.pos_to_string(place_to))
- local oldnode = minetest.env:get_node(place_to)
+ local oldnode = minetest.get_node(place_to)
local newnode = {name = def.name, param1 = 0, param2 = 0}
-- Calculate direction for wall mounted stuff like torches and signs
@@ -197,7 +197,7 @@ function minetest.item_place_node(itemstack, placer, pointed_thing)
end
-- Add node and update
- minetest.env:add_node(place_to, newnode)
+ minetest.add_node(place_to, newnode)
local take_item = true
@@ -232,7 +232,7 @@ function minetest.item_place_object(itemstack, placer, pointed_thing)
local pos = minetest.get_pointed_thing_position(pointed_thing, true)
if pos ~= nil then
local item = itemstack:take_item()
- minetest.env:add_item(pos, item)
+ minetest.add_item(pos, item)
end
return itemstack
end
@@ -241,7 +241,7 @@ function minetest.item_place(itemstack, placer, pointed_thing)
-- Call on_rightclick if the pointed node defines it
if pointed_thing.type == "node" and placer and
not placer:get_player_control().sneak then
- local n = minetest.env:get_node(pointed_thing.under)
+ local n = minetest.get_node(pointed_thing.under)
local nn = n.name
if minetest.registered_nodes[nn] and minetest.registered_nodes[nn].on_rightclick then
return minetest.registered_nodes[nn].on_rightclick(pointed_thing.under, n, placer, itemstack) or itemstack
@@ -258,7 +258,7 @@ function minetest.item_drop(itemstack, dropper, pos)
if dropper.get_player_name then
local v = dropper:get_look_dir()
local p = {x=pos.x+v.x, y=pos.y+1.5+v.y, z=pos.z+v.z}
- local obj = minetest.env:add_item(p, itemstack)
+ local obj = minetest.add_item(p, itemstack)
if obj then
v.x = v.x*2
v.y = v.y*2 + 1
@@ -266,7 +266,7 @@ function minetest.item_drop(itemstack, dropper, pos)
obj:setvelocity(v)
end
else
- minetest.env:add_item(pos, itemstack)
+ minetest.add_item(pos, itemstack)
end
return ItemStack("")
end
@@ -304,7 +304,7 @@ function minetest.handle_node_drops(pos, drops, digger)
y = pos.y + math.random()/2-0.25,
z = pos.z + math.random()/2-0.25,
}
- minetest.env:add_item(p, left)
+ minetest.add_item(p, left)
end
end
end
@@ -340,11 +340,11 @@ function minetest.node_dig(pos, node, digger)
local oldmetadata = nil
if def.after_dig_node then
- oldmetadata = minetest.env:get_meta(pos):to_table()
+ oldmetadata = minetest.get_meta(pos):to_table()
end
-- Remove node and update
- minetest.env:remove_node(pos)
+ minetest.remove_node(pos)
-- Run callback
if def.after_dig_node then
diff --git a/builtin/item_entity.lua b/builtin/item_entity.lua
index 50ce7eafedc3b8212079dfac4e4941796ef0a54a..c682db2faa1613dc714611a65f08ac75383914fb 100644
--- a/builtin/item_entity.lua
+++ b/builtin/item_entity.lua
@@ -3,7 +3,7 @@
function minetest.spawn_item(pos, item)
-- Take item in any format
local stack = ItemStack(item)
- local obj = minetest.env:add_entity(pos, "__builtin:item")
+ local obj = minetest.add_entity(pos, "__builtin:item")
obj:get_luaentity():set_item(stack:to_string())
return obj
end
@@ -83,7 +83,7 @@ minetest.register_entity("__builtin:item", {
on_step = function(self, dtime)
local p = self.object:getpos()
p.y = p.y - 0.3
- local nn = minetest.env:get_node(p).name
+ local nn = minetest.get_node(p).name
-- If node is not registered or node is walkably solid and resting on nodebox
local v = self.object:getvelocity()
if not minetest.registered_nodes[nn] or minetest.registered_nodes[nn].walkable and v.y == 0 then
diff --git a/builtin/misc.lua b/builtin/misc.lua
index 8308b3d6b4d3e4250df0203710990c3085eb304f..f4e7dbca655ff2af500e56560d74fe5366abbade 100644
--- a/builtin/misc.lua
+++ b/builtin/misc.lua
@@ -43,7 +43,7 @@ end
function minetest.get_connected_players()
-- This could be optimized a bit, but leave that for later
local list = {}
- for _, obj in pairs(minetest.env:get_objects_inside_radius({x=0,y=0,z=0}, 1000000)) do
+ for _, obj in pairs(minetest.get_objects_inside_radius({x=0,y=0,z=0}, 1000000)) do
if obj:is_player() then
table.insert(list, obj)
end
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 02ca7cba306dac78e7645e426186ef544302d254..5143c2ef3f15ce7ddd0d7d53c656459fd1d9cfd1 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -50,12 +50,8 @@ where gameid is unique to each game.
The game directory contains the file game.conf, which contains these fields:
name = <Human-readable full name of the game>
- common_mods = <Comma-separated list of common mods>
eg.
name = Minetest
- common_mods = bucket, default, doors, fire, stairs
-
-Common mods are loaded from the pseudo-game "common".
The game directory can contain the file minetest.conf, which will be used
to set default settings when running the particular game.
@@ -64,9 +60,9 @@ Mod load path
-------------
Generic:
$path_share/games/gameid/mods/
- $path_share/mods/gameid/
+ $path_share/mods/
$path_user/games/gameid/mods/
- $path_user/mods/gameid/ <-- User-installed mods
+ $path_user/mods/ <-- User-installed mods
$worldpath/worldmods/
In a run-in-place version (eg. the distributed windows version):
@@ -514,7 +510,7 @@ Usage:
- Groups are stored in a table, having the group names with keys and the
group ratings as values. For example:
groups = {crumbly=3, soil=1}
- ^ Default dirt (soil group actually currently not defined; TODO)
+ ^ Default dirt
groups = {crumbly=2, soil=1, level=2, outerspace=1}
^ A more special dirt-kind of thing
- Groups always have a rating associated with them. If there is no
@@ -587,6 +583,9 @@ Special groups
- attached_node: if the node under it is not a walkable block the node will be
dropped as an item. If the node is wallmounted the
wallmounted direction is checked.
+- soil: saplings will grow on nodes in this group
+- connect_to_raillike: makes nodes of raillike drawtype connect to
+ other group members with same drawtype
Known damage and digging time defining groups
----------------------------------------------
@@ -769,7 +768,7 @@ Some of the values in the key-value store are handled specially:
Example stuff:
-local meta = minetest.env:get_meta(pos)
+local meta = minetest.get_meta(pos)
meta:set_string("formspec",
"invsize[8,9;]"..
"list[context;main;0,0;8,4;]"..
@@ -915,6 +914,7 @@ minetest.formspec_escape(string) -> string
minetest namespace reference
-----------------------------
+Utilities:
minetest.get_current_modname() -> string
minetest.get_modpath(modname) -> eg. "/home/user/.minetest/usermods/modname"
^ Useful for loading additional .lua modules or static data from mod
@@ -929,6 +929,7 @@ minetest.has_feature(arg) -> bool, missing_features
^ arg: string or table in format {foo=true, bar=true}
^ missing_features: {foo=true, bar=true}
+Logging:
minetest.debug(line)
^ Always printed to stderr and logfile (print() is redirected here)
minetest.log(line)
@@ -956,10 +957,12 @@ minetest.register_on_shutdown(func())
minetest.register_on_placenode(func(pos, newnode, placer, oldnode, itemstack))
^ Called when a node has been placed
^ If return true no item is taken from itemstack
-^ Deprecated: Use on_construct or after_place_node in node definition instead
+^ Not recommended; use on_construct or after_place_node in node definition
+^ whenever possible
minetest.register_on_dignode(func(pos, oldnode, digger))
^ Called when a node has been dug.
-^ Deprecated: Use on_destruct or after_dig_node in node definition instead
+^ Not recommended: Use on_destruct or after_dig_node in node definition
+^ whenever possible
minetest.register_on_punchnode(func(pos, node, puncher))
^ Called when a node is punched
minetest.register_on_generated(func(minp, maxp, blockseed))
@@ -1026,6 +1029,64 @@ minetest.chat_send_all(text)
minetest.chat_send_player(name, text, prepend)
^ prepend: optional, if it is set to false "Server -!- " will not be prepended to the message
+Environment access:
+
+minetest.set_node(pos, node)
+minetest.add_node(pos, node): alias set_node(pos, node)
+^ Set node at position (node = {name="foo", param1=0, param2=0})
+minetest.remove_node(pos)
+^ Equivalent to set_node(pos, "air")
+minetest.get_node(pos)
+^ Returns {name="ignore", ...} for unloaded area
+minetest.get_node_or_nil(pos)
+^ Returns nil for unloaded area
+minetest.get_node_light(pos, timeofday) -> 0...15 or nil
+^ timeofday: nil = current time, 0 = night, 0.5 = day
+
+minetest.place_node(pos, node)
+^ Place node with the same effects that a player would cause
+minetest.dig_node(pos)
+^ Dig node with the same effects that a player would cause
+minetest.punch_node(pos)
+^ Punch node with the same effects that a player would cause
+
+minetest.get_meta(pos) -- Get a NodeMetaRef at that position
+minetest.get_node_timer(pos) -- Get NodeTimerRef
+
+minetest.add_entity(pos, name): Spawn Lua-defined entity at position
+^ Returns ObjectRef, or nil if failed
+minetest.add_item(pos, item): Spawn item
+^ Returns ObjectRef, or nil if failed
+minetest.get_player_by_name(name) -- Get an ObjectRef to a player
+minetest.get_objects_inside_radius(pos, radius)
+minetest.set_timeofday(val): val: 0...1; 0 = midnight, 0.5 = midday
+minetest.get_timeofday()
+minetest.find_node_near(pos, radius, nodenames) -> pos or nil
+^ nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
+minetest.find_nodes_in_area(minp, maxp, nodenames) -> list of positions
+^ nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
+minetest.get_perlin(seeddiff, octaves, persistence, scale)
+^ Return world-specific perlin noise (int(worldseed)+seeddiff)
+minetest.clear_objects()
+^ clear all objects in the environments
+minetest.line_of_sight(pos1,pos2,stepsize) ->true/false
+^ checkif there is a direct line of sight between pos1 and pos2
+^ pos1 First position
+^ pos2 Second position
+^ stepsize smaller gives more accurate results but requires more computing
+ time. Default is 1.
+minetest.find_path(pos1,pos2,searchdistance,max_jump,max_drop,algorithm)
+^ -> table containing path
+^ returns a table of 3d points representing a path from pos1 to pos2 or nil
+^ pos1: start position
+^ pos2: end position
+^ searchdistance: number of blocks to search in each direction
+^ max_jump: maximum height difference to consider walkable
+^ max_drop: maximum height difference to consider droppable
+^ algorithm: A*_noprefetch(default), A*, Dijkstra
+minetest.spawn_tree (pos, {treedef})
+^ spawns L-System tree at given pos with definition in treedef table
+
Inventory:
minetest.get_inventory(location) -> InvRef
^ location = eg. {type="player", name="celeron55"}
@@ -1196,7 +1257,11 @@ minetest.deserialize(string) -> table
Global objects:
minetest.env - EnvRef of the server environment and world.
-^ Using this you can access nodes and entities
+^ Any function in the minetest namespace can be called using the syntax
+ minetest.env:somefunction(somearguments)
+ instead of
+ minetest.somefunction(somearguments)
+^ Deprecated, but support is not to be dropped soon
Global tables:
minetest.registered_items
@@ -1225,129 +1290,9 @@ minetest.digprop_glasslike(toughness)
Class reference
----------------
-EnvRef: basically ServerEnvironment and ServerMap combined.
-methods:
-- set_node(pos, node)
-- add_node(pos, node): alias set_node(pos, node)
- ^ Set node at position (node = {name="foo", param1=0, param2=0})
-- remove_node(pos)
- ^ Equivalent to set_node(pos, "air")
-- get_node(pos)
- ^ Returns {name="ignore", ...} for unloaded area
-- get_node_or_nil(pos)
- ^ Returns nil for unloaded area
-- get_node_light(pos, timeofday) -> 0...15 or nil
- ^ timeofday: nil = current time, 0 = night, 0.5 = day
-
-- place_node(pos, node)
- ^ Place node with the same effects that a player would cause
-- dig_node(pos)
- ^ Dig node with the same effects that a player would cause
-- punch_node(pos)
- ^ Punch node with the same effects that a player would cause
-
-- get_meta(pos) -- Get a NodeMetaRef at that position
-- get_node_timer(pos) -- Get NodeTimerRef
-
-- add_entity(pos, name): Spawn Lua-defined entity at position
- ^ Returns ObjectRef, or nil if failed
-- add_item(pos, item): Spawn item
- ^ Returns ObjectRef, or nil if failed
-- get_player_by_name(name) -- Get an ObjectRef to a player
-- get_objects_inside_radius(pos, radius)
-- set_timeofday(val): val: 0...1; 0 = midnight, 0.5 = midday
-- get_timeofday()
-- find_node_near(pos, radius, nodenames) -> pos or nil
- ^ nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
-- find_nodes_in_area(minp, maxp, nodenames) -> list of positions
- ^ nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
-- get_perlin(seeddiff, octaves, persistence, scale)
- ^ Return world-specific perlin noise (int(worldseed)+seeddiff)
-- clear_objects()
- ^ clear all objects in the environments
-- line_of_sight(pos1,pos2,stepsize) ->true/false
- ^ checkif there is a direct line of sight between pos1 and pos2
- ^ pos1 First position
- ^ pos2 Second position
- ^ stepsize smaller gives more accurate results but requires more computing
- time. Default is 1.
--find_path(pos1,pos2,searchdistance,max_jump,max_drop,algorithm) -> table containing path
- ^ returns a table of 3d points representing a path from pos1 to pos2 or nil
- ^ pos1: start position
- ^ pos2: end position
- ^ searchdistance: number of blocks to search in each direction
- ^ max_jump: maximum height difference to consider walkable
- ^ max_drop: maximum height difference to consider droppable
- ^ algorithm: A*_noprefetch(default), A*, Dijkstra
-- spawn_tree (pos, {treedef})
- ^ spawns L-System tree at given pos with definition in treedef table
-treedef={
- axiom, - string initial tree axiom
- rules_a, - string rules set A
- rules_b, - string rules set B
- rules_c, - string rules set C
- rules_d, - string rules set D
- trunk, - string trunk node name
- leaves, - string leaves node name
- leaves2, - string secondary leaves node name
- leaves2_chance,- num chance (0-100) to replace leaves with leaves2
- angle, - num angle in deg
- iterations, - num max # of iterations, usually 2 -5
- random_level, - num factor to lower nr of iterations, usually 0 - 3
- trunk_type, - string single/double/crossed) type of trunk: 1 node, 2x2 nodes or 3x3 in cross shape
- thin_branches, - boolean true -> use thin (1 node) branches
- fruit, - string fruit node name
- fruit_chance, - num chance (0-100) to replace leaves with fruit node
- seed, - num random seed
- }
-
-Key for Special L-System Symbols used in Axioms
- G - move forward one unit with the pen up
- F - move forward one unit with the pen down drawing trunks and branches
- f - move forward one unit with the pen down drawing leaves (100% chance)
- T - move forward one unit with the pen down drawing trunks only
- R - move forward one unit with the pen down placing fruit
- A - replace with rules set A
- B - replace with rules set B
- C - replace with rules set C
- D - replace with rules set D
- a - replace with rules set A, chance 90%
- b - replace with rules set B, chance 80%
- c - replace with rules set C, chance 70%
- d - replace with rules set D, chance 60%
- + - yaw the turtle right by angle parameter
- - - yaw the turtle left by angle parameter
- & - pitch the turtle down by angle parameter
- ^ - pitch the turtle up by angle parameter
- / - roll the turtle to the right by angle parameter
- * - roll the turtle to the left by angle parameter
- [ - save in stack current state info
- ] - recover from stack state info
-
-Example usage: spawn small apple tree
-apple_tree={
- axiom="FFFFFAFFBF",
- rules_a="[&&&FFFFF&&FFFF][&&&++++FFFFF&&FFFF][&&&----FFFFF&&FFFF]",
- rules_b="[&&&++FFFFF&&FFFF][&&&--FFFFF&&FFFF][&&&------FFFFF&&FFFF]",
- trunk="default:tree",
- leaves="default:leaves",
- angle=30,
- iterations=2,
- random_level=0,
- trunk_type="single",
- thin_branches=true,
- fruit_chance=10,
- fruit="default:apple"
- }
-minetest.env:spawn_tree(pos,apple_tree)
-
-Deprecated:
-- add_rat(pos): Add C++ rat object (no-op)
-- add_firefly(pos): Add C++ firefly object (no-op)
-
NodeMetaRef: Node metadata - reference extra data and functionality stored
in a node
-- Can be gotten via minetest.env:get_nodemeta(pos)
+- Can be gotten via minetest.get_nodemeta(pos)
methods:
- set_string(name, value)
- get_string(name)
@@ -1361,7 +1306,7 @@ methods:
^ See "Node Metadata"
NodeTimerRef: Node Timers - a high resolution persistent per-node timer
-- Can be gotten via minetest.env:get_node_timer(pos)
+- Can be gotten via minetest.get_node_timer(pos)
methods:
- set(timeout,elapsed)
^ set a timer's state
@@ -1454,6 +1399,8 @@ Player-only: (no-op for other objects)
^ flags: (is visible) hotbar, healthbar, crosshair, wielditem
^ pass a table containing a true/false value of each flag to be set or unset
^ if a flag is nil, the flag is not modified
+- hud_set_hotbar_itemcount(count): sets number of items in builtin hotbar
+ ^ count: number of items, must be between 1 and 23
InvRef: Reference to an inventory
methods:
@@ -1516,7 +1463,7 @@ methods:
PerlinNoise: A perlin noise generator
- Can be created via PerlinNoise(seed, octaves, persistence, scale)
-- Also minetest.env:get_perlin(seeddiff, octaves, persistence, scale)
+- Also minetest.get_perlin(seeddiff, octaves, persistence, scale)
methods:
- get2d(pos) -> 2d noise value at pos={x=,y=}
- get3d(pos) -> 3d noise value at pos={x=,y=,z=}
@@ -1546,6 +1493,68 @@ Registered entities
^ Should return a string that will be passed to on_activate when
the object is instantiated the next time.
+L-system trees
+---------------
+treedef={
+ axiom, - string initial tree axiom
+ rules_a, - string rules set A
+ rules_b, - string rules set B
+ rules_c, - string rules set C
+ rules_d, - string rules set D
+ trunk, - string trunk node name
+ leaves, - string leaves node name
+ leaves2, - string secondary leaves node name
+ leaves2_chance,- num chance (0-100) to replace leaves with leaves2
+ angle, - num angle in deg
+ iterations, - num max # of iterations, usually 2 -5
+ random_level, - num factor to lower nr of iterations, usually 0 - 3
+ trunk_type, - string single/double/crossed) type of trunk: 1 node, 2x2 nodes or 3x3 in cross shape
+ thin_branches, - boolean true -> use thin (1 node) branches
+ fruit, - string fruit node name
+ fruit_chance, - num chance (0-100) to replace leaves with fruit node
+ seed, - num random seed
+ }
+
+Key for Special L-System Symbols used in Axioms
+ G - move forward one unit with the pen up
+ F - move forward one unit with the pen down drawing trunks and branches
+ f - move forward one unit with the pen down drawing leaves (100% chance)
+ T - move forward one unit with the pen down drawing trunks only
+ R - move forward one unit with the pen down placing fruit
+ A - replace with rules set A
+ B - replace with rules set B
+ C - replace with rules set C
+ D - replace with rules set D
+ a - replace with rules set A, chance 90%
+ b - replace with rules set B, chance 80%
+ c - replace with rules set C, chance 70%
+ d - replace with rules set D, chance 60%
+ + - yaw the turtle right by angle parameter
+ - - yaw the turtle left by angle parameter
+ & - pitch the turtle down by angle parameter
+ ^ - pitch the turtle up by angle parameter
+ / - roll the turtle to the right by angle parameter
+ * - roll the turtle to the left by angle parameter
+ [ - save in stack current state info
+ ] - recover from stack state info
+
+Example usage: spawn small apple tree
+apple_tree={
+ axiom="FFFFFAFFBF",
+ rules_a="[&&&FFFFF&&FFFF][&&&++++FFFFF&&FFFF][&&&----FFFFF&&FFFF]",
+ rules_b="[&&&++FFFFF&&FFFF][&&&--FFFFF&&FFFF][&&&------FFFFF&&FFFF]",
+ trunk="default:tree",
+ leaves="default:leaves",
+ angle=30,
+ iterations=2,
+ random_level=0,
+ trunk_type="single",
+ thin_branches=true,
+ fruit_chance=10,
+ fruit="default:apple"
+ }
+minetest.spawn_tree(pos,apple_tree)
+
Definition tables
------------------
@@ -1715,13 +1724,13 @@ Node definition (register_node)
after_place_node = func(pos, placer, itemstack),
^ Called after constructing node when node was placed using
- minetest.item_place_node / minetest.env:place_node
+ minetest.item_place_node / minetest.place_node
^ If return true no item is taken from itemstack
^ default: nil
after_dig_node = func(pos, oldnode, oldmetadata, digger),
^ oldmetadata is in table format
^ Called after destructing node when node was dug using
- minetest.node_dig / minetest.env:dig_node
+ minetest.node_dig / minetest.dig_node
^ default: nil
can_dig = function(pos,player)
^ returns true if node can be dug, or false if not
@@ -1740,7 +1749,7 @@ Node definition (register_node)
on_timer = function(pos,elapsed),
^ default: nil
- ^ called by NodeTimers, see EnvRef and NodeTimerRef
+ ^ called by NodeTimers, see minetest.get_node_timer and NodeTimerRef
^ elapsed is the total time passed since the timer was started
^ return true to run the timer for another cycle with the same timeout value
diff --git a/games/minimal/mods/bucket/init.lua b/games/minimal/mods/bucket/init.lua
index 6aa0921d5f8319cbd86f869e6a0e85fdc5afcbc3..dcd59ed38e5cd9f2cc2c02d6334726fefe6815da 100644
--- a/games/minimal/mods/bucket/init.lua
+++ b/games/minimal/mods/bucket/init.lua
@@ -41,13 +41,13 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image)
return
end
-- Check if pointing to a liquid
- n = minetest.env:get_node(pointed_thing.under)
+ n = minetest.get_node(pointed_thing.under)
if bucket.liquids[n.name] == nil then
-- Not a liquid
- minetest.env:add_node(pointed_thing.above, {name=source})
+ minetest.add_node(pointed_thing.above, {name=source})
elseif n.name ~= source then
-- It's a liquid
- minetest.env:add_node(pointed_thing.under, {name=source})
+ minetest.add_node(pointed_thing.under, {name=source})
end
return {name="bucket:bucket_empty"}
end
@@ -65,10 +65,10 @@ minetest.register_craftitem("bucket:bucket_empty", {
return
end
-- Check if pointing to a liquid source
- n = minetest.env:get_node(pointed_thing.under)
+ n = minetest.get_node(pointed_thing.under)
liquiddef = bucket.liquids[n.name]
if liquiddef ~= nil and liquiddef.source == n.name and liquiddef.itemname ~= nil then
- minetest.env:add_node(pointed_thing.under, {name="air"})
+ minetest.add_node(pointed_thing.under, {name="air"})
return {name=liquiddef.itemname}
end
end,
diff --git a/games/minimal/mods/default/init.lua b/games/minimal/mods/default/init.lua
index d8067d211b237b97b90fd15e773e56aa99cac151..9f9db5ac7e65bbb1ad6d9adce19594e68fc37414 100644
--- a/games/minimal/mods/default/init.lua
+++ b/games/minimal/mods/default/init.lua
@@ -741,7 +741,7 @@ minetest.register_node("default:dirt_with_grass", {
description = "Dirt with grass",
tiles ={"default_grass.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
is_ground_content = true,
- groups = {crumbly=3},
+ groups = {crumbly=3, soil=1},
drop = 'default:dirt',
sounds = default.node_sound_dirt_defaults({
footstep = {name="default_grass_footstep", gain=0.4},
@@ -752,7 +752,7 @@ minetest.register_node("default:dirt_with_grass_footsteps", {
description = "Dirt with grass and footsteps",
tiles ={"default_grass_footsteps.png", "default_dirt.png", "default_dirt.png^default_grass_side.png"},
is_ground_content = true,
- groups = {crumbly=3},
+ groups = {crumbly=3, soil=1},
drop = 'default:dirt',
sounds = default.node_sound_dirt_defaults({
footstep = {name="default_grass_footstep", gain=0.4},
@@ -763,7 +763,7 @@ minetest.register_node("default:dirt", {
description = "Dirt",
tiles ={"default_dirt.png"},
is_ground_content = true,
- groups = {crumbly=3},
+ groups = {crumbly=3, soil=1},
sounds = default.node_sound_dirt_defaults(),
})
@@ -1133,14 +1133,14 @@ minetest.register_node("default:sign_wall", {
legacy_wallmounted = true,
sounds = default.node_sound_defaults(),
on_construct = function(pos)
- --local n = minetest.env:get_node(pos)
- local meta = minetest.env:get_meta(pos)
+ --local n = minetest.get_node(pos)
+ local meta = minetest.get_meta(pos)
meta:set_string("formspec", "field[text;;${text}]")
meta:set_string("infotext", "\"\"")
end,
on_receive_fields = function(pos, formname, fields, sender)
--print("Sign at "..minetest.pos_to_string(pos).." got "..dump(fields))
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
fields.text = fields.text or ""
print((sender:get_player_name() or "").." wrote \""..fields.text..
"\" to sign at "..minetest.pos_to_string(pos))
@@ -1158,7 +1158,7 @@ minetest.register_node("default:chest", {
legacy_facedir_simple = true,
sounds = default.node_sound_wood_defaults(),
on_construct = function(pos)
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
meta:set_string("formspec",
"size[8,9]"..
"list[current_name;main;0,0;8,4;]"..
@@ -1168,7 +1168,7 @@ minetest.register_node("default:chest", {
inv:set_size("main", 8*4)
end,
can_dig = function(pos,player)
- local meta = minetest.env:get_meta(pos);
+ local meta = minetest.get_meta(pos);
local inv = meta:get_inventory()
return inv:is_empty("main")
end,
@@ -1190,13 +1190,13 @@ minetest.register_node("default:chest_locked", {
legacy_facedir_simple = true,
sounds = default.node_sound_wood_defaults(),
after_place_node = function(pos, placer)
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
meta:set_string("owner", placer:get_player_name() or "")
meta:set_string("infotext", "Locked Chest (owned by "..
meta:get_string("owner")..")")
end,
on_construct = function(pos)
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
meta:set_string("formspec",
"size[8,9]"..
"list[current_name;main;0,0;8,4;]"..
@@ -1207,12 +1207,12 @@ minetest.register_node("default:chest_locked", {
inv:set_size("main", 8*4)
end,
can_dig = function(pos,player)
- local meta = minetest.env:get_meta(pos);
+ local meta = minetest.get_meta(pos);
local inv = meta:get_inventory()
return inv:is_empty("main")
end,
allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
if not has_locked_chest_privilege(meta, player) then
minetest.log("action", player:get_player_name()..
" tried to access a locked chest belonging to "..
@@ -1223,7 +1223,7 @@ minetest.register_node("default:chest_locked", {
return count
end,
allow_metadata_inventory_put = function(pos, listname, index, stack, player)
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
if not has_locked_chest_privilege(meta, player) then
minetest.log("action", player:get_player_name()..
" tried to access a locked chest belonging to "..
@@ -1234,7 +1234,7 @@ minetest.register_node("default:chest_locked", {
return stack:get_count()
end,
allow_metadata_inventory_take = function(pos, listname, index, stack, player)
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
if not has_locked_chest_privilege(meta, player) then
minetest.log("action", player:get_player_name()..
" tried to access a locked chest belonging to "..
@@ -1275,7 +1275,7 @@ minetest.register_node("default:furnace", {
legacy_facedir_simple = true,
sounds = default.node_sound_stone_defaults(),
on_construct = function(pos)
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
meta:set_string("formspec", default.furnace_inactive_formspec)
meta:set_string("infotext", "Furnace")
local inv = meta:get_inventory()
@@ -1284,7 +1284,7 @@ minetest.register_node("default:furnace", {
inv:set_size("dst", 4)
end,
can_dig = function(pos,player)
- local meta = minetest.env:get_meta(pos);
+ local meta = minetest.get_meta(pos);
local inv = meta:get_inventory()
if not inv:is_empty("fuel") then
return false
@@ -1308,7 +1308,7 @@ minetest.register_node("default:furnace_active", {
legacy_facedir_simple = true,
sounds = default.node_sound_stone_defaults(),
on_construct = function(pos)
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
meta:set_string("formspec", default.furnace_inactive_formspec)
meta:set_string("infotext", "Furnace");
local inv = meta:get_inventory()
@@ -1317,7 +1317,7 @@ minetest.register_node("default:furnace_active", {
inv:set_size("dst", 4)
end,
can_dig = function(pos,player)
- local meta = minetest.env:get_meta(pos);
+ local meta = minetest.get_meta(pos);
local inv = meta:get_inventory()
if not inv:is_empty("fuel") then
return false
@@ -1331,16 +1331,16 @@ minetest.register_node("default:furnace_active", {
})
function hacky_swap_node(pos,name)
- local node = minetest.env:get_node(pos)
- local meta = minetest.env:get_meta(pos)
+ local node = minetest.get_node(pos)
+ local meta = minetest.get_meta(pos)
local meta0 = meta:to_table()
if node.name == name then
return
end
node.name = name
local meta0 = meta:to_table()
- minetest.env:set_node(pos,node)
- meta = minetest.env:get_meta(pos)
+ minetest.set_node(pos,node)
+ meta = minetest.get_meta(pos)
meta:from_table(meta0)
end
@@ -1349,7 +1349,7 @@ minetest.register_abm({
interval = 1.0,
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
for i, name in ipairs({
"fuel_totaltime",
"fuel_time",
diff --git a/games/minimal/mods/default/mapgen.lua b/games/minimal/mods/default/mapgen.lua
index 478567d0aa5e7e823e626426058172e732e73746..7209cb6b3429f24498b02cf12329919a792d624d 100644
--- a/games/minimal/mods/default/mapgen.lua
+++ b/games/minimal/mods/default/mapgen.lua
@@ -104,17 +104,17 @@ minetest.register_on_generated(function(minp, maxp, seed)
for divz=0+1,divs-1-1 do
local cx = minp.x + math.floor((divx+0.5)*divlen)
local cz = minp.z + math.floor((divz+0.5)*divlen)
- if minetest.env:get_node({x=cx,y=1,z=cz}).name == "default:water_source" and
- minetest.env:get_node({x=cx,y=0,z=cz}).name == "default:sand" then
+ if minetest.get_node({x=cx,y=1,z=cz}).name == "default:water_source" and
+ minetest.get_node({x=cx,y=0,z=cz}).name == "default:sand" then
local is_shallow = true
local num_water_around = 0
- if minetest.env:get_node({x=cx-divlen*2,y=1,z=cz+0}).name == "default:water_source" then
+ if minetest.get_node({x=cx-divlen*2,y=1,z=cz+0}).name == "default:water_source" then
num_water_around = num_water_around + 1 end
- if minetest.env:get_node({x=cx+divlen*2,y=1,z=cz+0}).name == "default:water_source" then
+ if minetest.get_node({x=cx+divlen*2,y=1,z=cz+0}).name == "default:water_source" then
num_water_around = num_water_around + 1 end
- if minetest.env:get_node({x=cx+0,y=1,z=cz-divlen*2}).name == "default:water_source" then
+ if minetest.get_node({x=cx+0,y=1,z=cz-divlen*2}).name == "default:water_source" then
num_water_around = num_water_around + 1 end
- if minetest.env:get_node({x=cx+0,y=1,z=cz+divlen*2}).name == "default:water_source" then
+ if minetest.get_node({x=cx+0,y=1,z=cz+divlen*2}).name == "default:water_source" then
num_water_around = num_water_around + 1 end
if num_water_around >= 2 then
is_shallow = false
@@ -122,8 +122,8 @@ minetest.register_on_generated(function(minp, maxp, seed)
if is_shallow then
for x1=-divlen,divlen do
for z1=-divlen,divlen do
- if minetest.env:get_node({x=cx+x1,y=0,z=cz+z1}).name == "default:sand" then
- minetest.env:set_node({x=cx+x1,y=0,z=cz+z1}, {name="default:clay"})
+ if minetest.get_node({x=cx+x1,y=0,z=cz+z1}).name == "default:sand" then
+ minetest.set_node({x=cx+x1,y=0,z=cz+z1}, {name="default:clay"})
end
end
end
diff --git a/games/minimal/mods/experimental/init.lua b/games/minimal/mods/experimental/init.lua
index 6fce9698aadcedc483917ea00029167b7e6a5e34..3e2e7787b62819ae1228cc39ee0d2fd14c054b80 100644
--- a/games/minimal/mods/experimental/init.lua
+++ b/games/minimal/mods/experimental/init.lua
@@ -66,7 +66,7 @@ test_sound()
function on_step(dtime)
-- print("experimental on_step")
--[[
- objs = minetest.env:get_objects_inside_radius({x=0,y=0,z=0}, 10)
+ objs = minetest.get_objects_inside_radius({x=0,y=0,z=0}, 10)
for k, obj in pairs(objs) do
name = obj:get_player_name()
if name then
@@ -86,17 +86,17 @@ function on_step(dtime)
experimental.t1 = experimental.t1 + dtime
if experimental.t1 >= 2 then
experimental.t1 = experimental.t1 - 2
- minetest.log("time of day is "..minetest.env:get_timeofday())
+ minetest.log("time of day is "..minetest.get_timeofday())
if experimental.day then
minetest.log("forcing day->night")
experimental.day = false
- minetest.env:set_timeofday(0.0)
+ minetest.set_timeofday(0.0)
else
minetest.log("forcing night->day")
experimental.day = true
- minetest.env:set_timeofday(0.5)
+ minetest.set_timeofday(0.5)
end
- minetest.log("time of day is "..minetest.env:get_timeofday())
+ minetest.log("time of day is "..minetest.get_timeofday())
end
--]]
end
@@ -133,8 +133,8 @@ minetest.register_node("experimental:tnt", {
minetest.register_on_punchnode(function(p, node)
if node.name == "experimental:tnt" then
- minetest.env:remove_node(p)
- minetest.env:add_entity(p, "experimental:tnt")
+ minetest.remove_node(p)
+ minetest.add_entity(p, "experimental:tnt")
nodeupdate(p)
end
end)
@@ -262,7 +262,7 @@ minetest.register_on_chat_message(function(name, message)
minetest.chat_send_player(name, "you don't have permission to interact")
return true -- Handled chat message
end
- local player = minetest.env:get_player_by_name(name)
+ local player = minetest.get_player_by_name(name)
if player == nil then
print("Unable to spawn entity, player is nil")
return true -- Handled chat message
@@ -270,7 +270,7 @@ minetest.register_on_chat_message(function(name, message)
local entityname = "experimental:dummyball"
local p = player:getpos()
p.y = p.y + 1
- minetest.env:add_entity(p, entityname)
+ minetest.add_entity(p, entityname)
minetest.chat_send_player(name, '"'..entityname
..'" spawned.');
return true -- Handled chat message
@@ -323,7 +323,7 @@ end)
minetest.register_on_generated(function(minp, maxp)
--print("on_generated: minp="..dump(minp).." maxp="..dump(maxp))
--cp = {x=(minp.x+maxp.x)/2, y=(minp.y+maxp.y)/2, z=(minp.z+maxp.z)/2}
- --minetest.env:add_node(cp, {name="sand"})
+ --minetest.add_node(cp, {name="sand"})
end)
-- Example setting get
@@ -353,7 +353,7 @@ end)
action = function(pos, node, active_object_count, active_object_count_wider)
print("TNT ABM action")
pos.y = pos.y + 1
- minetest.env:add_node(pos, {name="papyrus"})
+ minetest.add_node(pos, {name="papyrus"})
end,
})]]
@@ -364,7 +364,7 @@ end)
chance = 1,
action = function(pos, node, active_object_count, active_object_count_wider)
print("ABM: Sign text changed")
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
meta:set_text("foo")
end,
})]]
@@ -395,7 +395,7 @@ minetest.register_abm({
end
pos.y = pos.y + 1
- n = minetest.env:get_node(pos)
+ n = minetest.get_node(pos)
print(dump(n))
if n.name ~= "air" then
return
@@ -404,7 +404,7 @@ minetest.register_abm({
pos.y = pos.y + 2
ncpos = pos
nctime = os.clock()
- minetest.env:add_node(ncpos, {name="nyancat"})
+ minetest.add_node(ncpos, {name="nyancat"})
end
})
@@ -431,12 +431,12 @@ minetest.register_abm({
p2 = {x = p1.x + s1[2], y = p1.y, z = p1.z + s1[3]}
table.insert(ncold, 1, p0)
while #ncold >= 10 do
- minetest.env:add_node(ncold[#ncold], {name="air"})
+ minetest.add_node(ncold[#ncold], {name="air"})
table.remove(ncold, #ncold)
end
- minetest.env:add_node(p0, {name="nyancat_rainbow"})
- minetest.env:add_node(p1, {name="nyancat", param1=s0[4]})
- minetest.env:add_node(p2, {name="air"})
+ minetest.add_node(p0, {name="nyancat_rainbow"})
+ minetest.add_node(p1, {name="nyancat", param1=s0[4]})
+ minetest.add_node(p2, {name="air"})
ncpos = p1
end
end,
@@ -448,20 +448,20 @@ minetest.register_node("experimental:tester_node_1", {
groups = {oddly_breakable_by_hand=2},
sounds = default.node_sound_wood_defaults(),
-- This was known to cause a bug in minetest.item_place_node() when used
- -- via minetest.env:place_node(), causing a placer with no position
+ -- via minetest.place_node(), causing a placer with no position
paramtype2 = "facedir",
on_construct = function(pos)
experimental.print_to_everything("experimental:tester_node_1:on_construct("..minetest.pos_to_string(pos)..")")
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
meta:set_string("mine", "test")
- local timer = minetest.env:get_node_timer(pos)
+ local timer = minetest.get_node_timer(pos)
timer:start(4, 3)
end,
after_place_node = function(pos, placer)
experimental.print_to_everything("experimental:tester_node_1:after_place_node("..minetest.pos_to_string(pos)..")")
- local meta = minetest.env:get_meta(pos)
+ local meta = minetest.get_meta(pos)
if meta:get_string("mine") == "test" then
experimental.print_to_everything("correct metadata found")
else
@@ -493,14 +493,14 @@ minetest.register_craftitem("experimental:tester_tool_1", {
on_use = function(itemstack, user, pointed_thing)
--print(dump(pointed_thing))
if pointed_thing.type == "node" then
- if minetest.env:get_node(pointed_thing.under).name == "experimental:tester_node_1" then
+ if minetest.get_node(pointed_thing.under).name == "experimental:tester_node_1" then
local p = pointed_thing.under
minetest.log("action", "Tester tool used at "..minetest.pos_to_string(p))
- minetest.env:dig_node(p)
+ minetest.dig_node(p)
else
local p = pointed_thing.above
minetest.log("action", "Tester tool used at "..minetest.pos_to_string(p))
- minetest.env:place_node(p, {name="experimental:tester_node_1"})
+ minetest.place_node(p, {name="experimental:tester_node_1"})
end
end
end,
@@ -556,7 +556,7 @@ minetest.register_chatcommand("test1", {
params = "",
description = "Test 1: Modify player's inventory view",
func = function(name, param)
- local player = minetest.env:get_player_by_name(name)
+ local player = minetest.get_player_by_name(name)
if not player then
return
end
diff --git a/games/minimal/mods/legacy/init.lua b/games/minimal/mods/legacy/init.lua
index 7f9088ce092078318f34ea7ea62d085c2c4af5d2..98ad69be0fca3096860b56701ddf86e7bdb3ac41 100644
--- a/games/minimal/mods/legacy/init.lua
+++ b/games/minimal/mods/legacy/init.lua
@@ -79,14 +79,12 @@ minetest.register_craftitem(":rat", {
description = "Rat",
inventory_image = "rat.png",
on_drop = function(item, dropper, pos)
- minetest.env:add_rat(pos)
item:take_item()
return item
end,
on_place = function(item, dropped, pointed)
pos = minetest.get_pointed_thing_position(pointed, true)
if pos ~= nil then
- minetest.env:add_rat(pos)
item:take_item()
return item
end
@@ -103,14 +101,12 @@ minetest.register_craftitem(":firefly", {
description = "Firefly",
inventory_image = "firefly.png",
on_drop = function(item, dropper, pos)
- minetest.env:add_firefly(pos)
item:take_item()
return item
end,
on_place = function(item, dropped, pointed)
pos = minetest.get_pointed_thing_position(pointed, true)
if pos ~= nil then
- minetest.env:add_firefly(pos)
item:take_item()
return item
end
diff --git a/minetest.conf.example b/minetest.conf.example
index 7d56f99d80b77bc9762ab6c674c756307f18a166..1f9780f407ae2d89748a12385dc9cab86d5a0190 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -12,7 +12,7 @@
#
# NOTE: This file might not be up-to-date, refer to the
# defaultsettings.cpp file for an up-to-date list:
-# https://bitbucket.org/celeron55/minetest/src/tip/src/defaultsettings.cpp
+# https://github.com/minetest/minetest/blob/master/src/defaultsettings.cpp
#
# A vim command to convert most of defaultsettings.cpp to conf file format:
# :'<,'>s/\tsettings->setDefault("\([^"]*\)", "\([^"]*\)");.*/#\1 = \2/g
diff --git a/mods/minetest/mods_here.txt b/mods/minetest/mods_here.txt
deleted file mode 100644
index 5135cb947af568f0b43e210835f8a29e6f42d8db..0000000000000000000000000000000000000000
--- a/mods/minetest/mods_here.txt
+++ /dev/null
@@ -1 +0,0 @@
-You can install Minetest mods by copying (and extracting) them into this folder.
diff --git a/mods/mods_here.txt b/mods/mods_here.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e105fbd1a1e89309648028bb29966220de22949b
--- /dev/null
+++ b/mods/mods_here.txt
@@ -0,0 +1,4 @@
+You can install Minetest mods by copying (and extracting) them into this folder.
+To enable them, go to the configure world window in the main menu or write
+ load_mod_<modname> = true
+in world.mt in the world directory.
diff --git a/po/uk/minetest.po b/po/uk/minetest.po
index 84a8a8708fe5c03ac7efdb7b647acdf4fa4d7bf6..d9823b5e2f882cfa4ec9e68d84b7e7f5a6b70d3f 100644
--- a/po/uk/minetest.po
+++ b/po/uk/minetest.po
@@ -51,7 +51,7 @@ msgstr ""
msgid ""
"\n"
"Check debug.txt for details."
-msgstr "Деталі у файлі debug.txt."
+msgstr "\nДеталі у файлі debug.txt."
#: src/guiConfigureWorld.cpp:123
msgid ""
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 74c5fabb87023cb0fe0636f6553b066b6bbd2b21..51ed27837c2411fb567841d075371a3c38f96b37 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -206,6 +206,9 @@ configure_file(
"${PROJECT_BINARY_DIR}/cmake_config.h"
)
+add_subdirectory(script)
+add_subdirectory(util)
+
set(common_SRCS
rollback_interface.cpp
rollback.cpp
@@ -222,22 +225,6 @@ set(common_SRCS
itemdef.cpp
nodedef.cpp
object_properties.cpp
- scriptapi_types.cpp
- scriptapi_common.cpp
- scriptapi_content.cpp
- scriptapi_craft.cpp
- scriptapi_node.cpp
- scriptapi_item.cpp
- scriptapi_env.cpp
- scriptapi_nodetimer.cpp
- scriptapi_noise.cpp
- scriptapi_entity.cpp
- scriptapi_object.cpp
- scriptapi_nodemeta.cpp
- scriptapi_inventory.cpp
- scriptapi_particles.cpp
- scriptapi.cpp
- script.cpp
log.cpp
content_sao.cpp
emerge.cpp
@@ -283,12 +270,8 @@ set(common_SRCS
staticobject.cpp
serverlist.cpp
pathfinder.cpp
- util/serialize.cpp
- util/directiontables.cpp
- util/numeric.cpp
- util/pointedthing.cpp
- util/string.cpp
- util/timetaker.cpp
+ ${SCRIPT_SRCS}
+ ${UTIL_SRCS}
)
# This gives us the icon
@@ -365,6 +348,7 @@ set(minetestserver_SRCS
include_directories(
${PROJECT_BINARY_DIR}
+ ${PROJECT_SOURCE_DIR}
${IRRLICHT_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR}
${CMAKE_BUILD_TYPE}
@@ -375,6 +359,7 @@ include_directories(
${SQLITE3_INCLUDE_DIR}
${LUA_INCLUDE_DIR}
${JSON_INCLUDE_DIR}
+ ${PROJECT_SOURCE_DIR}/script
)
if(USE_FREETYPE)
diff --git a/src/camera.cpp b/src/camera.cpp
index 6224a2b8ec99b052f11b2919af7f653d21bebaa6..3d8713d6ad7328140588b0821becb7697320a30f 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -71,7 +71,12 @@ Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
m_digging_anim(0),
m_digging_button(-1),
- m_dummymesh(createCubeMesh(v3f(1,1,1)))
+ m_dummymesh(createCubeMesh(v3f(1,1,1))),
+
+ m_wield_change_timer(0.125),
+ m_wield_mesh_next(NULL),
+ m_previous_playeritem(-1),
+ m_previous_itemname("")
{
//dstream<<__FUNCTION_NAME<<std::endl;
@@ -142,6 +147,22 @@ void Camera::step(f32 dtime)
m_view_bobbing_fall = -1; // Mark the effect as finished
}
+ bool was_under_zero = m_wield_change_timer < 0;
+ if(m_wield_change_timer < 0.125)
+ m_wield_change_timer += dtime;
+ if(m_wield_change_timer > 0.125)
+ m_wield_change_timer = 0.125;
+
+ if(m_wield_change_timer >= 0 && was_under_zero) {
+ if(m_wield_mesh_next) {
+ m_wieldnode->setMesh(m_wield_mesh_next);
+ m_wieldnode->setVisible(true);
+ } else {
+ m_wieldnode->setVisible(false);
+ }
+ m_wield_mesh_next = NULL;
+ }
+
if (m_view_bobbing_state != 0)
{
//f32 offset = dtime * m_view_bobbing_speed * 0.035;
@@ -342,8 +363,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
m_fov_y = fov_degrees * M_PI / 180.0;
// Increase vertical FOV on lower aspect ratios (<16:10)
m_fov_y *= MYMAX(1.0, MYMIN(1.4, sqrt(16./10. / m_aspect)));
- // WTF is this? It can't be right
- m_fov_x = 2 * atan(0.5 * m_aspect * tan(m_fov_y));
+ m_fov_x = 2 * atan(m_aspect * tan(0.5 * m_fov_y));
m_cameranode->setAspectRatio(m_aspect);
m_cameranode->setFOV(m_fov_y);
@@ -352,6 +372,10 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
v3f wield_position = v3f(55, -35, 65);
//v3f wield_rotation = v3f(-100, 120, -100);
v3f wield_rotation = v3f(-100, 120, -100);
+ if(m_wield_change_timer < 0)
+ wield_position.Y -= 40 + m_wield_change_timer*320;
+ else
+ wield_position.Y -= 40 - m_wield_change_timer*320;
if(m_digging_anim < 0.05 || m_digging_anim > 0.5){
f32 frac = 1.0;
if(m_digging_anim > 0.5)
@@ -560,18 +584,34 @@ void Camera::setDigging(s32 button)
m_digging_button = button;
}
-void Camera::wield(const ItemStack &item)
+void Camera::wield(const ItemStack &item, u16 playeritem)
{
IItemDefManager *idef = m_gamedef->idef();
- scene::IMesh *wield_mesh = idef->getWieldMesh(item.getDefinition(idef).name, m_gamedef);
- if(wield_mesh)
- {
- m_wieldnode->setMesh(wield_mesh);
- m_wieldnode->setVisible(true);
- }
- else
- {
- m_wieldnode->setVisible(false);
+ std::string itemname = item.getDefinition(idef).name;
+ m_wield_mesh_next = idef->getWieldMesh(itemname, m_gamedef);
+ if(playeritem != m_previous_playeritem &&
+ !(m_previous_itemname == "" && itemname == "")) {
+ m_previous_playeritem = playeritem;
+ m_previous_itemname = itemname;
+ if(m_wield_change_timer >= 0.125)
+ m_wield_change_timer = -0.125;
+ else if(m_wield_change_timer > 0) {
+ m_wield_change_timer = -m_wield_change_timer;
+ }
+ } else {
+ if(m_wield_mesh_next) {
+ m_wieldnode->setMesh(m_wield_mesh_next);
+ m_wieldnode->setVisible(true);
+ } else {
+ m_wieldnode->setVisible(false);
+ }
+ m_wield_mesh_next = NULL;
+ if(m_previous_itemname != itemname) {
+ m_previous_itemname = itemname;
+ m_wield_change_timer = 0;
+ }
+ else
+ m_wield_change_timer = 0.125;
}
}
diff --git a/src/camera.h b/src/camera.h
index 0ed5c20d292096833afe890bdfb08f0fc4d302e1..c8a6e0bb80092b1817baca3cf8d9d18d2b2c4f47 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -117,7 +117,7 @@ class Camera
void setDigging(s32 button);
// Replace the wielded item mesh
- void wield(const ItemStack &item);
+ void wield(const ItemStack &item, u16 playeritem);
// Draw the wielded tool.
// This has to happen *after* the main scene is drawn.
@@ -178,6 +178,12 @@ class Camera
//dummymesh for camera
irr::scene::IAnimatedMesh* m_dummymesh;
+
+ // Animation when changing wielded item
+ f32 m_wield_change_timer;
+ scene::IMesh *m_wield_mesh_next;
+ u16 m_previous_playeritem;
+ std::string m_previous_itemname;
};
#endif
diff --git a/src/client.cpp b/src/client.cpp
index 929ed0eabdab48358a9c20841b164f802e4e47cd..6b1789fe095a51a4f963dd25cedc48c2f82936d2 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -350,6 +350,11 @@ Client::~Client()
m_mesh_update_thread.setRun(false);
while(m_mesh_update_thread.IsRunning())
sleep_ms(100);
+ while(!m_mesh_update_thread.m_queue_out.empty()) {
+ MeshUpdateResult r = m_mesh_update_thread.m_queue_out.pop_front();
+ delete r.mesh;
+ }
+
delete m_inventory_from_server;
@@ -757,6 +762,8 @@ void Client::step(float dtime)
// Replace with the new mesh
block->mesh = r.mesh;
+ } else {
+ delete r.mesh;
}
if(r.ack_block_to_server)
{
@@ -1980,7 +1987,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
event.spawn_particle.expirationtime = expirationtime;
event.spawn_particle.size = size;
- event.add_particlespawner.collisiondetection =
+ event.spawn_particle.collisiondetection =
collisiondetection;
event.spawn_particle.texture = new std::string(texture);
@@ -2129,6 +2136,23 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id)
player->hud_flags &= ~mask;
player->hud_flags |= flags;
}
+ else if(command == TOCLIENT_HUD_SET_PARAM)
+ {
+ std::string datastring((char *)&data[2], datasize - 2);
+ std::istringstream is(datastring, std::ios_base::binary);
+
+ Player *player = m_env.getLocalPlayer();
+ assert(player != NULL);
+
+ u16 param = readU16(is);
+ std::string value = deSerializeString(is);
+
+ if(param == HUD_PARAM_HOTBAR_ITEMCOUNT && value.size() == 4){
+ s32 hotbar_itemcount = readS32((u8*) value.c_str());
+ if(hotbar_itemcount > 0 && hotbar_itemcount <= HUD_HOTBAR_ITEMCOUNT_MAX)
+ player->hud_hotbar_itemcount = hotbar_itemcount;
+ }
+ }
else
{
infostream<<"Client: Ignoring unknown command "
diff --git a/src/clientserver.h b/src/clientserver.h
index ee9271bbcdfe2cdfbffa4aac8ba49eea5e41de9d..a43baab23c6b29d84efa57d0b944d18b88c0deb4 100644
--- a/src/clientserver.h
+++ b/src/clientserver.h
@@ -480,6 +480,14 @@ enum ToClientCommand
u32 flags
u32 mask
*/
+
+ TOCLIENT_HUD_SET_PARAM = 0x4d,
+ /*
+ u16 command
+ u16 param
+ u16 len
+ u8[len] value
+ */
};
enum ToServerCommand
diff --git a/src/collision.cpp b/src/collision.cpp
index 673966b6e89df679588db04949fa9cad7b04031b..3058426eb380f4f11acf12606b00f44723ce7580 100644
--- a/src/collision.cpp
+++ b/src/collision.cpp
@@ -298,7 +298,7 @@ collisionMoveResult collisionMoveSimple(Environment *env, IGameDef *gamedef,
f32 distance = speed_f.getLength();
std::vector<DistanceSortedActiveObject> clientobjects;
c_env->getActiveObjects(pos_f,distance * 1.5,clientobjects);
- for (int i=0; i < clientobjects.size(); i++)
+ for (size_t i=0; i < clientobjects.size(); i++)
{
if ((self == 0) || (self != clientobjects[i].obj)) {
objects.push_back((ActiveObject*)clientobjects[i].obj);
diff --git a/src/content_abm.cpp b/src/content_abm.cpp
index e20201dcf7aa2aa1ea5ccd71724327dc46e4ac85..3704fe83d4c45ffb0e84591fa23f974ff20eb298 100644
--- a/src/content_abm.cpp
+++ b/src/content_abm.cpp
@@ -99,14 +99,10 @@ class MakeTreesFromSaplingsABM : public ActiveBlockModifier
{
private:
content_t c_junglesapling;
- content_t c_dirt;
- content_t c_dirt_with_grass;
public:
MakeTreesFromSaplingsABM(ServerEnvironment *env, INodeDefManager *nodemgr) {
- c_junglesapling = nodemgr->getId("junglesapling");
- c_dirt = nodemgr->getId("mapgen_dirt");
- c_dirt_with_grass = nodemgr->getId("mapgen_dirt_with_grass");
+ c_junglesapling = nodemgr->getId("junglesapling");
}
virtual std::set<std::string> getTriggerContents()
@@ -127,8 +123,7 @@ class MakeTreesFromSaplingsABM : public ActiveBlockModifier
ServerMap *map = &env->getServerMap();
MapNode n_below = map->getNodeNoEx(p - v3s16(0, 1, 0));
- if (n_below.getContent() != c_dirt &&
- n_below.getContent() != c_dirt_with_grass)
+ if (!((ItemGroupList) ndef->get(n_below).groups)["soil"])
return;
bool is_jungle_tree = n.getContent() == c_junglesapling;
@@ -196,17 +191,58 @@ class LiquidFlowABM : public ActiveBlockModifier
virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n)
{
ServerMap *map = &env->getServerMap();
- if (map->transforming_liquid_size() < 500)
- map->transforming_liquid_add(p);
+ if (map->transforming_liquid_size() > 500)
+ return;
+ map->transforming_liquid_add(p);
//if ((*map).m_transforming_liquid.size() < 500) (*map).m_transforming_liquid.push_back(p);
}
};
+class LiquidDropABM : public ActiveBlockModifier
+{
+private:
+ std::set<std::string> contents;
+
+public:
+ LiquidDropABM(ServerEnvironment *env, INodeDefManager *nodemgr)
+ {
+ std::set<content_t> liquids;
+ nodemgr->getIds("group:liquid", liquids);
+ for(std::set<content_t>::const_iterator k = liquids.begin(); k != liquids.end(); k++)
+ contents.insert(nodemgr->get(*k).liquid_alternative_source);
+ }
+ virtual std::set<std::string> getTriggerContents()
+ { return contents; }
+ virtual std::set<std::string> getRequiredNeighbors()
+ {
+ std::set<std::string> neighbors;
+ neighbors.insert("mapgen_air");
+ return neighbors;
+ }
+ virtual float getTriggerInterval()
+ { return 20.0; }
+ virtual u32 getTriggerChance()
+ { return 10; }
+ virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n)
+ {
+ ServerMap *map = &env->getServerMap();
+ if (map->transforming_liquid_size() > 500)
+ return;
+ //todo: look around except top
+ MapNode n_below = map->getNodeNoEx(p - v3s16(0, 1, 0));
+ if (n_below.getContent() != CONTENT_AIR)
+ return;
+ map->transforming_liquid_add(p);
+ }
+};
+
void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef)
{
env->addActiveBlockModifier(new GrowGrassABM());
env->addActiveBlockModifier(new RemoveGrassABM());
env->addActiveBlockModifier(new MakeTreesFromSaplingsABM(env, nodedef));
- if (g_settings->getBool("liquid_finite"))
+ if (g_settings->getBool("liquid_finite")) {
env->addActiveBlockModifier(new LiquidFlowABM(env, nodedef));
+ env->addActiveBlockModifier(new LiquidDropABM(env, nodedef));
+ }
}
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
index 155b39ab6c52a765667e671e02d7bf7fe631483c..84408e77695956a3fe5d4fe1261fbda6f508e262 100644
--- a/src/content_mapblock.cpp
+++ b/src/content_mapblock.cpp
@@ -1188,34 +1188,81 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
MapNode n_minus_z_plus_y = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x, y+1, z-1));
MapNode n_plus_z_minus_y = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x, y-1, z+1));
MapNode n_minus_z_minus_y = data->m_vmanip.getNodeNoEx(blockpos_nodes + v3s16(x, y-1, z-1));
-
+
content_t thiscontent = n.getContent();
- if(n_minus_x.getContent() == thiscontent)
+ std::string groupname = "connect_to_raillike"; // name of the group that enables connecting to raillike nodes of different kind
+ bool self_connect_to_raillike = ((ItemGroupList) nodedef->get(n).groups)[groupname] != 0;
+
+ if ((nodedef->get(n_minus_x).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_minus_x).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_minus_x.getContent() == thiscontent)
is_rail_x[0] = true;
- if (n_minus_x_minus_y.getContent() == thiscontent)
+
+ if ((nodedef->get(n_minus_x_minus_y).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_minus_x_minus_y).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_minus_x_minus_y.getContent() == thiscontent)
is_rail_x_minus_y[0] = true;
- if(n_minus_x_plus_y.getContent() == thiscontent)
+
+ if ((nodedef->get(n_minus_x_plus_y).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_minus_x_plus_y).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_minus_x_plus_y.getContent() == thiscontent)
is_rail_x_plus_y[0] = true;
- if(n_plus_x.getContent() == thiscontent)
+ if ((nodedef->get(n_plus_x).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_plus_x).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_plus_x.getContent() == thiscontent)
is_rail_x[1] = true;
- if (n_plus_x_minus_y.getContent() == thiscontent)
+
+ if ((nodedef->get(n_plus_x_minus_y).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_plus_x_minus_y).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_plus_x_minus_y.getContent() == thiscontent)
is_rail_x_minus_y[1] = true;
- if(n_plus_x_plus_y.getContent() == thiscontent)
+
+ if ((nodedef->get(n_plus_x_plus_y).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_plus_x_plus_y).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_plus_x_plus_y.getContent() == thiscontent)
is_rail_x_plus_y[1] = true;
- if(n_minus_z.getContent() == thiscontent)
+ if ((nodedef->get(n_minus_z).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_minus_z).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_minus_z.getContent() == thiscontent)
is_rail_z[0] = true;
- if (n_minus_z_minus_y.getContent() == thiscontent)
+
+ if ((nodedef->get(n_minus_z_minus_y).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_minus_z_minus_y).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_minus_z_minus_y.getContent() == thiscontent)
is_rail_z_minus_y[0] = true;
- if(n_minus_z_plus_y.getContent() == thiscontent)
+
+ if ((nodedef->get(n_minus_z_plus_y).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_minus_z_plus_y).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_minus_z_plus_y.getContent() == thiscontent)
is_rail_z_plus_y[0] = true;
- if(n_plus_z.getContent() == thiscontent)
+ if ((nodedef->get(n_plus_z).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_plus_z).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_plus_z.getContent() == thiscontent)
is_rail_z[1] = true;
- if (n_plus_z_minus_y.getContent() == thiscontent)
+
+ if ((nodedef->get(n_plus_z_minus_y).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_plus_z_minus_y).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_plus_z_minus_y.getContent() == thiscontent)
is_rail_z_minus_y[1] = true;
- if(n_plus_z_plus_y.getContent() == thiscontent)
+
+ if ((nodedef->get(n_plus_z_plus_y).drawtype == NDT_RAILLIKE
+ && ((ItemGroupList) nodedef->get(n_plus_z_plus_y).groups)[groupname] != 0
+ && self_connect_to_raillike)
+ || n_plus_z_plus_y.getContent() == thiscontent)
is_rail_z_plus_y[1] = true;
bool is_rail_x_all[] = {false, false};
@@ -1255,7 +1302,8 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
if(is_rail_x_all[0] && is_rail_x_all[1])
angle = 90;
if(is_rail_z_all[0] && is_rail_z_all[1]){
- if (n_minus_z_plus_y.getContent() == thiscontent) angle = 180;
+ if (is_rail_z_plus_y[0])
+ angle = 180;
}
else if(is_rail_x_all[0] && is_rail_z_all[0])
angle = 270;
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 24a9186f77c0e1e0a8d6d0589f3f873ce36ba830..cc02a743146264f939141fe889e12fff628788be 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "tool.h" // For ToolCapabilities
#include "gamedef.h"
#include "player.h"
-#include "scriptapi.h"
+#include "cpp_api/scriptapi.h"
#include "genericobject.h"
#include "util/serialize.h"
@@ -387,8 +387,7 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
LuaEntitySAO::~LuaEntitySAO()
{
if(m_registered){
- lua_State *L = m_env->getLua();
- scriptapi_luaentity_rm(L, m_id);
+ ENV_TO_SA(m_env)->luaentity_Remove(m_id);
}
}
@@ -397,16 +396,15 @@ void LuaEntitySAO::addedToEnvironment(u32 dtime_s)
ServerActiveObject::addedToEnvironment(dtime_s);
// Create entity from name
- lua_State *L = m_env->getLua();
- m_registered = scriptapi_luaentity_add(L, m_id, m_init_name.c_str());
+ m_registered = ENV_TO_SA(m_env)->luaentity_Add(m_id, m_init_name.c_str());
if(m_registered){
// Get properties
- scriptapi_luaentity_get_properties(L, m_id, &m_prop);
+ ENV_TO_SA(m_env)->luaentity_GetProperties(m_id, &m_prop);
// Initialize HP from properties
m_hp = m_prop.hp_max;
// Activate entity, supplying serialized state
- scriptapi_luaentity_activate(L, m_id, m_init_state.c_str(), dtime_s);
+ ENV_TO_SA(m_env)->luaentity_Activate(m_id, m_init_state.c_str(), dtime_s);
}
}
@@ -515,8 +513,7 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
}
if(m_registered){
- lua_State *L = m_env->getLua();
- scriptapi_luaentity_step(L, m_id, dtime);
+ ENV_TO_SA(m_env)->luaentity_Step(m_id, dtime);
}
if(send_recommended == false)
@@ -626,8 +623,7 @@ std::string LuaEntitySAO::getStaticData()
os<<serializeString(m_init_name);
// state
if(m_registered){
- lua_State *L = m_env->getLua();
- std::string state = scriptapi_luaentity_get_staticdata(L, m_id);
+ std::string state = ENV_TO_SA(m_env)->luaentity_GetStaticdata(m_id);
os<<serializeLongString(state);
} else {
os<<serializeLongString(m_init_state);
@@ -673,8 +669,14 @@ int LuaEntitySAO::punch(v3f dir,
{
setHP(getHP() - result.damage);
+
+ std::string punchername = "nil";
+
+ if ( puncher != 0 )
+ punchername = puncher->getDescription();
+
actionstream<<getDescription()<<" punched by "
- <<puncher->getDescription()<<", damage "<<result.damage
+ <<punchername<<", damage "<<result.damage
<<" hp, health now "<<getHP()<<" hp"<<std::endl;
{
@@ -688,8 +690,7 @@ int LuaEntitySAO::punch(v3f dir,
m_removed = true;
}
- lua_State *L = m_env->getLua();
- scriptapi_luaentity_punch(L, m_id, puncher,
+ ENV_TO_SA(m_env)->luaentity_Punch(m_id, puncher,
time_from_last_punch, toolcap, dir);
return result.wear;
@@ -702,8 +703,7 @@ void LuaEntitySAO::rightClick(ServerActiveObject *clicker)
// It's best that attachments cannot be clicked
if(isAttached())
return;
- lua_State *L = m_env->getLua();
- scriptapi_luaentity_rightclick(L, m_id, clicker);
+ ENV_TO_SA(m_env)->luaentity_Rightclick(m_id, clicker);
}
void LuaEntitySAO::setPos(v3f pos)
@@ -1307,8 +1307,13 @@ int PlayerSAO::punch(v3f dir,
HitParams hitparams = getHitParams(m_armor_groups, toolcap,
time_from_last_punch);
+ std::string punchername = "nil";
+
+ if ( puncher != 0 )
+ punchername = puncher->getDescription();
+
actionstream<<"Player "<<m_player->getName()<<" punched by "
- <<puncher->getDescription()<<", damage "<<hitparams.hp
+ <<punchername<<", damage "<<hitparams.hp
<<" HP"<<std::endl;
setHP(getHP() - hitparams.hp);
diff --git a/src/emerge.cpp b/src/emerge.cpp
index 2d8b01819b08916877ddbd9b1674c557331d49ce..fd6c0e91f746d138b2f490404daf71913652f3f3 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -32,8 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mapblock.h"
#include "serverobject.h"
#include "settings.h"
-#include "script.h"
-#include "scriptapi.h"
+#include "cpp_api/scriptapi.h"
#include "profiler.h"
#include "log.h"
#include "nodedef.h"
@@ -349,7 +348,7 @@ bool EmergeThread::getBlockOrStartGen(v3s16 p, MapBlock **b,
void *EmergeThread::Thread() {
ThreadStarted();
- log_register_thread("EmergeThread" + id);
+ log_register_thread("EmergeThread" + itos(id));
DSTACK(__FUNCTION_NAME);
BEGIN_DEBUG_EXCEPTION_HANDLER
@@ -418,7 +417,7 @@ void *EmergeThread::Thread() {
ign(&m_server->m_ignore_map_edit_events_area,
VoxelArea(minp, maxp));
{ // takes about 90ms with -O1 on an e3-1230v2
- scriptapi_environment_on_generated(m_server->m_lua,
+ SERVER_TO_SA(m_server)->environment_OnGenerated(
minp, maxp, emerge->getBlockSeed(minp));
}
diff --git a/src/emerge.h b/src/emerge.h
index fdca93c06253676ec11501d330e6120c68438815..b42e82d38237e1dcaab047eb8dc0e46fd49febad 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -31,8 +31,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
infostream << "EmergeThread: " x << std::endl; }
class Mapgen;
-class MapgenParams;
-class MapgenFactory;
+struct MapgenParams;
+struct MapgenFactory;
class Biome;
class BiomeDefManager;
class EmergeThread;
diff --git a/src/environment.cpp b/src/environment.cpp
index e06b032f2f2d5cec3646f8a19b757f44379402f2..83ae590149937e7a8cf5cb9050bb245cbf0cf8f6 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "settings.h"
#include "log.h"
#include "profiler.h"
-#include "scriptapi.h"
+#include "cpp_api/scriptapi.h"
#include "nodedef.h"
#include "nodemetadata.h"
#include "main.h" // For g_settings, g_profiler
@@ -320,10 +320,10 @@ void ActiveBlockList::update(std::list<v3s16> &active_positions,
ServerEnvironment
*/
-ServerEnvironment::ServerEnvironment(ServerMap *map, lua_State *L,
+ServerEnvironment::ServerEnvironment(ServerMap *map, ScriptApi *scriptIface,
IGameDef *gamedef, IBackgroundBlockEmerger *emerger):
m_map(map),
- m_lua(L),
+ m_script(scriptIface),
m_gamedef(gamedef),
m_emerger(emerger),
m_random_spawn_timer(3),
@@ -826,7 +826,7 @@ void ServerEnvironment::activateBlock(MapBlock *block, u32 additional_dtime)
i != elapsed_timers.end(); i++){
n = block->getNodeNoEx(i->first);
v3s16 p = i->first + block->getPosRelative();
- if(scriptapi_node_on_timer(m_lua,p,n,i->second.elapsed))
+ if(m_script->node_on_timer(p,n,i->second.elapsed))
block->setNodeTimer(i->first,NodeTimer(i->second.timeout,0));
}
}
@@ -847,17 +847,17 @@ bool ServerEnvironment::setNode(v3s16 p, const MapNode &n)
MapNode n_old = m_map->getNodeNoEx(p);
// Call destructor
if(ndef->get(n_old).has_on_destruct)
- scriptapi_node_on_destruct(m_lua, p, n_old);
+ m_script->node_on_destruct(p, n_old);
// Replace node
bool succeeded = m_map->addNodeWithEvent(p, n);
if(!succeeded)
return false;
// Call post-destructor
if(ndef->get(n_old).has_after_destruct)
- scriptapi_node_after_destruct(m_lua, p, n_old);
+ m_script->node_after_destruct(p, n_old);
// Call constructor
if(ndef->get(n).has_on_construct)
- scriptapi_node_on_construct(m_lua, p, n);
+ m_script->node_on_construct(p, n);
return true;
}
@@ -867,7 +867,7 @@ bool ServerEnvironment::removeNode(v3s16 p)
MapNode n_old = m_map->getNodeNoEx(p);
// Call destructor
if(ndef->get(n_old).has_on_destruct)
- scriptapi_node_on_destruct(m_lua, p, n_old);
+ m_script->node_on_destruct(p, n_old);
// Replace with air
// This is slightly optimized compared to addNodeWithEvent(air)
bool succeeded = m_map->removeNodeWithEvent(p);
@@ -875,7 +875,7 @@ bool ServerEnvironment::removeNode(v3s16 p)
return false;
// Call post-destructor
if(ndef->get(n_old).has_after_destruct)
- scriptapi_node_after_destruct(m_lua, p, n_old);
+ m_script->node_after_destruct(p, n_old);
// Air doesn't require constructor
return true;
}
@@ -910,7 +910,6 @@ void ServerEnvironment::clearAllObjects()
if(obj->getType() == ACTIVEOBJECT_TYPE_PLAYER)
continue;
u16 id = i->first;
- v3f objectpos = obj->getBasePosition();
// Delete static object if block is loaded
if(obj->m_static_exists){
MapBlock *block = m_map->getBlockNoCreateNoEx(obj->m_static_block);
@@ -931,7 +930,7 @@ void ServerEnvironment::clearAllObjects()
// Tell the object about removal
obj->removingFromEnvironment();
// Deregister in scripting api
- scriptapi_rm_object_reference(m_lua, obj);
+ m_script->removeObjectReference(obj);
// Delete active object
if(obj->environmentDeletes())
@@ -1031,8 +1030,6 @@ void ServerEnvironment::step(float dtime)
// Ignore disconnected players
if(player->peer_id == 0)
continue;
-
- v3f playerpos = player->getPosition();
// Move
player->move(dtime, *m_map, 100*BS);
@@ -1162,7 +1159,7 @@ void ServerEnvironment::step(float dtime)
i != elapsed_timers.end(); i++){
n = block->getNodeNoEx(i->first);
p = i->first + block->getPosRelative();
- if(scriptapi_node_on_timer(m_lua,p,n,i->second.elapsed))
+ if(m_script->node_on_timer(p,n,i->second.elapsed))
block->setNodeTimer(i->first,NodeTimer(i->second.timeout,0));
}
}
@@ -1216,7 +1213,7 @@ void ServerEnvironment::step(float dtime)
/*
Step script environment (run global on_step())
*/
- scriptapi_environment_step(m_lua, dtime);
+ m_script->environment_Step(dtime);
/*
Step active objects
@@ -1510,7 +1507,7 @@ u16 ServerEnvironment::addActiveObjectRaw(ServerActiveObject *object,
<<std::endl;
// Register reference in scripting api (must be done before post-init)
- scriptapi_add_object_reference(m_lua, object);
+ m_script->addObjectReference(object);
// Post-initialize object
object->addedToEnvironment(dtime_s);
@@ -1598,7 +1595,7 @@ void ServerEnvironment::removeRemovedObjects()
// Tell the object about removal
obj->removingFromEnvironment();
// Deregister in scripting api
- scriptapi_rm_object_reference(m_lua, obj);
+ m_script->removeObjectReference(obj);
// Delete
if(obj->environmentDeletes())
@@ -1904,7 +1901,7 @@ void ServerEnvironment::deactivateFarObjects(bool force_delete)
// Tell the object about removal
obj->removingFromEnvironment();
// Deregister in scripting api
- scriptapi_rm_object_reference(m_lua, obj);
+ m_script->removeObjectReference(obj);
// Delete active object
if(obj->environmentDeletes())
@@ -2072,8 +2069,6 @@ void ClientEnvironment::step(float dtime)
*/
{
- v3f lplayerpos = lplayer->getPosition();
-
// Apply physics
if(free_move == false && is_climbing == false)
{
@@ -2174,7 +2169,7 @@ void ClientEnvironment::step(float dtime)
v3s16 p2 = floatToInt(pf + v3f(0, BS*0.8, 0), BS);
MapNode n2 = m_map->getNodeNoEx(p2);
v3s16 p3 = floatToInt(pf + v3f(0, BS*1.6, 0), BS);
- MapNode n3 = m_map->getNodeNoEx(p2);
+ MapNode n3 = m_map->getNodeNoEx(p3);
u32 damage_per_second = 0;
damage_per_second = MYMAX(damage_per_second,
@@ -2197,7 +2192,6 @@ void ClientEnvironment::step(float dtime)
i != m_players.end(); ++i)
{
Player *player = *i;
- v3f playerpos = player->getPosition();
/*
Handle non-local players
diff --git a/src/environment.h b/src/environment.h
index a3e43dbb4af5d7de62c885b0881953bec0e2b353..a62173a11f51a4481fd8fa86399a9d21ce51c82c 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -50,6 +50,7 @@ class IGameDef;
class Map;
class ServerMap;
class ClientMap;
+class ScriptApi;
class Environment
{
@@ -190,7 +191,7 @@ class IBackgroundBlockEmerger
class ServerEnvironment : public Environment
{
public:
- ServerEnvironment(ServerMap *map, lua_State *L, IGameDef *gamedef,
+ ServerEnvironment(ServerMap *map, ScriptApi *iface, IGameDef *gamedef,
IBackgroundBlockEmerger *emerger);
~ServerEnvironment();
@@ -198,8 +199,9 @@ class ServerEnvironment : public Environment
ServerMap & getServerMap();
- lua_State* getLua()
- { return m_lua; }
+ //TODO find way to remove this fct!
+ ScriptApi* getScriptIface()
+ { return m_script; }
IGameDef *getGameDef()
{ return m_gamedef; }
@@ -348,7 +350,7 @@ class ServerEnvironment : public Environment
// The map
ServerMap *m_map;
// Lua state
- lua_State *m_lua;
+ ScriptApi* m_script;
// Game definition
IGameDef *m_gamedef;
// Background block emerger (the server, in practice)
diff --git a/src/game.cpp b/src/game.cpp
index f63a4a400228d1cb78e99704570924a1725d7e23..22bd8c4292fbb02f55d8d9b715500c6d5cb7fd74 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -66,6 +66,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "sound_openal.h"
#endif
#include "event_manager.h"
+#include <iomanip>
#include <list>
#include "util/directiontables.h"
@@ -134,6 +135,10 @@ struct TextDestPlayerInventory : public TextDest
m_client->sendInventoryFields(m_formname, fields);
}
+ void setFormName(std::string formname) {
+ m_formname = formname;
+ }
+
Client *m_client;
std::string m_formname;
};
@@ -847,7 +852,7 @@ void nodePlacementPrediction(Client &client,
<<") - Name not known"<<std::endl;
return;
}
- // Predict param2
+ // Predict param2 for facedir and wallmounted nodes
u8 param2 = 0;
if(nodedef->get(id).param_type_2 == CPT2_WALLMOUNTED){
v3s16 dir = nodepos - neighbourpos;
@@ -859,8 +864,33 @@ void nodePlacementPrediction(Client &client,
param2 = dir.Z < 0 ? 5 : 4;
}
}
- // TODO: Facedir prediction
- // TODO: If predicted node is in attached_node group, check attachment
+ if(nodedef->get(id).param_type_2 == CPT2_FACEDIR){
+ v3s16 dir = nodepos - floatToInt(client.getEnv().getLocalPlayer()->getPosition(), BS);
+ if(abs(dir.X) > abs(dir.Z)){
+ param2 = dir.X < 0 ? 3 : 1;
+ } else {
+ param2 = dir.Z < 0 ? 2 : 0;
+ }
+ }
+ assert(param2 >= 0 && param2 <= 5);
+ //Check attachment if node is in group attached_node
+ if(((ItemGroupList) nodedef->get(id).groups)["attached_node"] != 0){
+ static v3s16 wallmounted_dirs[8] = {
+ v3s16(0,1,0),
+ v3s16(0,-1,0),
+ v3s16(1,0,0),
+ v3s16(-1,0,0),
+ v3s16(0,0,1),
+ v3s16(0,0,-1),
+ };
+ v3s16 pp;
+ if(nodedef->get(id).param_type_2 == CPT2_WALLMOUNTED)
+ pp = p + wallmounted_dirs[param2];
+ else
+ pp = p + v3s16(0,-1,0);
+ if(!nodedef->get(map.getNode(pp)).walkable)
+ return;
+ }
// Add node to client map
MapNode n(id, 0, param2);
try{
@@ -895,6 +925,7 @@ void the_game(
)
{
FormspecFormSource* current_formspec = 0;
+ TextDestPlayerInventory* current_textdest = 0;
video::IVideoDriver* driver = device->getVideoDriver();
scene::ISceneManager* smgr = device->getSceneManager();
@@ -1042,7 +1073,7 @@ void the_game(
u32 lasttime = device->getTimer()->getTime();
while(device->run())
{
- f32 dtime=0; // in seconds
+ f32 dtime = 0.033; // in seconds
if (cloud_menu_background) {
u32 time = device->getTimer()->getTime();
if(time > lasttime)
@@ -1136,7 +1167,7 @@ void the_game(
u32 lasttime = device->getTimer()->getTime();
while(device->run())
{
- f32 dtime=0; // in seconds
+ f32 dtime = 0.033; // in seconds
if (cloud_menu_background) {
u32 time = device->getTimer()->getTime();
if(time > lasttime)
@@ -1962,7 +1993,7 @@ void the_game(
{
s32 wheel = input->getMouseWheel();
u16 max_item = MYMIN(PLAYER_INVENTORY_SIZE-1,
- hud.hotbar_itemcount-1);
+ player->hud_hotbar_itemcount-1);
if(wheel < 0)
{
@@ -1986,7 +2017,7 @@ void the_game(
const KeyPress *kp = NumberKey + (i + 1) % 10;
if(input->wasKeyDown(*kp))
{
- if(i < PLAYER_INVENTORY_SIZE && i < hud.hotbar_itemcount)
+ if(i < PLAYER_INVENTORY_SIZE && i < player->hud_hotbar_itemcount)
{
new_playeritem = i;
@@ -2211,19 +2242,23 @@ void the_game(
if (current_formspec == 0)
{
/* Create menu */
+ /* Note: FormspecFormSource and TextDestPlayerInventory
+ * are deleted by guiFormSpecMenu */
current_formspec = new FormspecFormSource(*(event.show_formspec.formspec),¤t_formspec);
-
+ current_textdest = new TextDestPlayerInventory(&client,*(event.show_formspec.formname));
GUIFormSpecMenu *menu =
new GUIFormSpecMenu(device, guiroot, -1,
&g_menumgr,
&client, gamedef);
menu->setFormSource(current_formspec);
- menu->setTextDest(new TextDestPlayerInventory(&client,*(event.show_formspec.formname)));
+ menu->setTextDest(current_textdest);
menu->drop();
}
else
{
+ assert(current_textdest != 0);
/* update menu */
+ current_textdest->setFormName(*(event.show_formspec.formname));
current_formspec->setForm(*(event.show_formspec.formspec));
}
delete(event.show_formspec.formspec);
@@ -2927,21 +2962,20 @@ void the_game(
static float endscenetime_avg = 0;
endscenetime_avg = endscenetime_avg * 0.95 + (float)endscenetime*0.05;*/
- char temptext[300];
- snprintf(temptext, 300, "%s ("
- "R: range_all=%i"
- ")"
- " drawtime=%.0f, dtime_jitter = % .1f %%"
- ", v_range = %.1f, RTT = %.3f",
- program_name_and_version,
- draw_control.range_all,
- drawtime_avg,
- dtime_jitter1_max_fraction * 100.0,
- draw_control.wanted_range,
- client.getRTT()
- );
-
- guitext->setText(narrow_to_wide(temptext).c_str());
+ std::ostringstream os(std::ios_base::binary);
+ os<<std::fixed
+ <<program_name_and_version
+ <<" (R: range_all="<<draw_control.range_all<<")"
+ <<std::setprecision(0)
+ <<" drawtime = "<<drawtime_avg
+ <<std::setprecision(1)
+ <<", dtime_jitter = "
+ <<(dtime_jitter1_max_fraction * 100.0)<<" %"
+ <<std::setprecision(1)
+ <<", v_range = "<<draw_control.wanted_range
+ <<std::setprecision(3)
+ <<", RTT = "<<client.getRTT();
+ guitext->setText(narrow_to_wide(os.str()).c_str());
guitext->setVisible(true);
}
else if(show_hud || show_chat)
@@ -2956,17 +2990,15 @@ void the_game(
if(show_debug)
{
- char temptext[300];
- snprintf(temptext, 300,
- "(% .1f, % .1f, % .1f)"
- " (yaw = %.1f) (seed = %llu)",
- player_position.X/BS,
- player_position.Y/BS,
- player_position.Z/BS,
- wrapDegrees_0_360(camera_yaw),
- (unsigned long long)client.getMapSeed());
-
- guitext2->setText(narrow_to_wide(temptext).c_str());
+ std::ostringstream os(std::ios_base::binary);
+ os<<std::setprecision(1)<<std::fixed
+ <<"(" <<(player_position.X/BS)
+ <<", "<<(player_position.Y/BS)
+ <<", "<<(player_position.Z/BS)
+ <<") (yaw="<<(wrapDegrees_0_360(camera_yaw))
+ <<") (seed = "<<((unsigned long long)client.getMapSeed())
+ <<")";
+ guitext2->setText(narrow_to_wide(os.str()).c_str());
guitext2->setVisible(true);
}
else
@@ -3084,7 +3116,7 @@ void the_game(
ItemStack item;
if(mlist != NULL)
item = mlist->getItem(client.getPlayerItem());
- camera.wield(item);
+ camera.wield(item, client.getPlayerItem());
}
/*
diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp
index f31e599dc7eeb6f017a4d3c567e4346eb3d4acfa..3dfd0090a6c6b224898b06ed678ec41269f33eb8 100644
--- a/src/guiChatConsole.cpp
+++ b/src/guiChatConsole.cpp
@@ -121,7 +121,9 @@ GUIChatConsole::GUIChatConsole(
GUIChatConsole::~GUIChatConsole()
{
- delete m_font;
+#if USE_FREETYPE
+ m_font->drop();
+#endif
}
void GUIChatConsole::openConsole(f32 height)
diff --git a/src/guiConfigureWorld.cpp b/src/guiConfigureWorld.cpp
index f94ed7d17b4913cfb05259391fe3e5f79a07f78a..8f5ef937da89ed27afcab38dd87210024ead13ca 100644
--- a/src/guiConfigureWorld.cpp
+++ b/src/guiConfigureWorld.cpp
@@ -116,40 +116,18 @@ GUIConfigureWorld::GUIConfigureWorld(gui::IGUIEnvironment* env,
// mod_names
if(!mod.is_modpack &&
mod_names.count(modname) == 0)
- m_new_mod_names.insert(modname);
+ m_settings.setBool("load_mod_"+modname, false);
}
- if(!m_new_mod_names.empty())
- {
- wchar_t* text = wgettext("Warning: Some mods are not configured yet.\n"
- "They will be enabled by default when you save the configuration. ");
- GUIMessageMenu *menu =
- new GUIMessageMenu(Environment, Parent, -1, m_menumgr, text);
- menu->drop();
- delete[] text;
- }
-
-
// find missing mods (mentioned in world.mt, but not installed)
- std::set<std::string> missing_mods;
for(std::set<std::string>::iterator it = mod_names.begin();
it != mod_names.end(); ++it)
{
std::string modname = *it;
if(m_addonmods.count(modname) == 0)
- missing_mods.insert(modname);
+ m_settings.remove("load_mod_"+modname);
}
- if(!missing_mods.empty())
- {
- wchar_t* text = wgettext("Warning: Some configured mods are missing.\n"
- "Their setting will be removed when you save the configuration. ");
- GUIMessageMenu *menu =
- new GUIMessageMenu(Environment, Parent, -1, m_menumgr, text);
- delete[] text;
- for(std::set<std::string>::iterator it = missing_mods.begin();
- it != missing_mods.end(); ++it)
- m_settings.remove("load_mod_"+(*it));
- menu->drop();
- }
+ std::string worldmtfile = m_wspec.path+DIR_DELIM+"world.mt";
+ m_settings.updateConfigFile(worldmtfile.c_str());
}
void GUIConfigureWorld::drawMenu()
@@ -187,8 +165,6 @@ void GUIConfigureWorld::regenerateGui(v2u32 screensize)
DesiredRect = rect;
recalculateAbsolutePosition(false);
- v2s32 size = rect.getSize();
-
v2s32 topleft = v2s32(10, 10);
/*
@@ -388,11 +364,6 @@ bool GUIConfigureWorld::OnEvent(const SEvent& event)
return true;
}
case GUI_ID_SAVE: {
- for(std::set<std::string>::iterator it = m_new_mod_names.begin();
- it!= m_new_mod_names.end(); ++it)
- {
- m_settings.setBool("load_mod_"+(*it),true);
- }
std::string worldmtfile = m_wspec.path+DIR_DELIM+"world.mt";
m_settings.updateConfigFile(worldmtfile.c_str());
@@ -558,22 +529,14 @@ void GUIConfigureWorld::buildTreeView(std::map<std::string, ModSpec> mods,
buildTreeView(mod.modpack_content, new_node);
else
{
- // set icon for node: ? for new mods, x for disabled mods,
- // checkmark for enabled mods
- if(m_new_mod_names.count(modname) > 0)
- {
- new_node->setIcon(QUESTIONMARK_STR);
- }
+ // set icon for node: x for disabled mods, checkmark for enabled mods
+ bool mod_enabled = false;
+ if(m_settings.exists("load_mod_"+modname))
+ mod_enabled = m_settings.getBool("load_mod_"+modname);
+ if(mod_enabled)
+ new_node->setIcon(CHECKMARK_STR);
else
- {
- bool mod_enabled = true;
- if(m_settings.exists("load_mod_"+modname))
- mod_enabled = m_settings.getBool("load_mod_"+modname);
- if(mod_enabled)
- new_node->setIcon(CHECKMARK_STR);
- else
- new_node->setIcon(CROSS_STR);
- }
+ new_node->setIcon(CROSS_STR);
}
}
}
@@ -690,7 +653,6 @@ void GUIConfigureWorld::enableMod(std::string modname)
m_nodes.find(modname);
if(it != m_nodes.end())
(*it).second->setIcon(CHECKMARK_STR);
- m_new_mod_names.erase(modname);
//also enable all dependencies
for(std::set<std::string>::iterator it=mspec.depends.begin();
it != mspec.depends.end(); ++it)
@@ -715,7 +677,6 @@ void GUIConfigureWorld::disableMod(std::string modname)
m_nodes.find(modname);
if(it != m_nodes.end())
(*it).second->setIcon(CROSS_STR);
- m_new_mod_names.erase(modname);
//also disable all mods that depend on this one
std::pair<std::multimap<std::string, std::string>::iterator,
std::multimap<std::string, std::string>::iterator > rdep =
diff --git a/src/guiConfigureWorld.h b/src/guiConfigureWorld.h
index 8a77c5f898fab1546e89491390ff1326df508083..23ebac66d1a6820bc37e1508977491c563e2fe93 100644
--- a/src/guiConfigureWorld.h
+++ b/src/guiConfigureWorld.h
@@ -69,9 +69,6 @@ class GUIConfigureWorld : public GUIModalMenu
// the settings in the world.mt file
Settings m_settings;
- // mods that are installed but not mentioned in world.mt file
- std::set<std::string> m_new_mod_names;
-
// maps modnames to nodes in m_treeview
std::map<std::string,gui::IGUITreeViewNode*> m_nodes;
diff --git a/src/guiCreateWorld.cpp b/src/guiCreateWorld.cpp
index caa884bc05e7beb36c5cc0e2e4d87946686fec86..f9afe959202c2674b55814c536aea7e1a3e4168c 100644
--- a/src/guiCreateWorld.cpp
+++ b/src/guiCreateWorld.cpp
@@ -112,8 +112,6 @@ void GUICreateWorld::regenerateGui(v2u32 screensize)
DesiredRect = rect;
recalculateAbsolutePosition(false);
- v2s32 size = rect.getSize();
-
v2s32 topleft = v2s32(10+80, 10+70);
/*
@@ -137,6 +135,9 @@ void GUICreateWorld::regenerateGui(v2u32 screensize)
evt.EventType = EET_KEY_INPUT_EVENT;
evt.KeyInput.Key = KEY_END;
evt.KeyInput.PressedDown = true;
+ evt.KeyInput.Char = 0;
+ evt.KeyInput.Control = 0;
+ evt.KeyInput.Shift = 0;
e->OnEvent(evt);
}
{
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
index 6ada77698d2acd38f5a4dd3d43cab14a02bc3a60..3e0d7fd46710f2fa2b20a6145ba412f189664f9b 100644
--- a/src/guiFormSpecMenu.cpp
+++ b/src/guiFormSpecMenu.cpp
@@ -418,9 +418,12 @@ void GUIFormSpecMenu::regenerateGui(v2u32 screensize)
e->setTextAlignment(gui::EGUIA_UPPERLEFT, gui::EGUIA_UPPERLEFT);
} else {
irr::SEvent evt;
- evt.KeyInput.Key = KEY_END;
evt.EventType = EET_KEY_INPUT_EVENT;
+ evt.KeyInput.Key = KEY_END;
evt.KeyInput.PressedDown = true;
+ evt.KeyInput.Char = 0;
+ evt.KeyInput.Control = 0;
+ evt.KeyInput.Shift = 0;
e->OnEvent(evt);
}
diff --git a/src/guiMainMenu.cpp b/src/guiMainMenu.cpp
index 36685db847acc0ed8a2efcd1e34d1a19ed200b43..223bba93c1a0c9cffcca962c4117bdb312172f13 100644
--- a/src/guiMainMenu.cpp
+++ b/src/guiMainMenu.cpp
@@ -54,11 +54,11 @@ const wchar_t *contrib_core_strs[] = {
L"Lisa Milne (darkrose) <lisa@ltmnet.com>",
L"Maciej Kasatkin (RealBadAngel) <mk@realbadangel.pl>",
L"proller <proler@gmail.com>",
- L"sfan5 <sfan5@live.de>"
+ L"sfan5 <sfan5@live.de>",
+ L"kahrl <kahrl@gmx.net>"
};
const wchar_t *contrib_active_strs[] = {
- L"kahrl <kahrl@gmx.net>",
L"sapier <sapier@gmx.net>",
L"Vanessa Ezekowitz (VanessaE) <vanessaezekowitz@gmail.com>",
L"Jurgen Doser (doserj) <jurgen.doser@gmail.com>",
diff --git a/src/guiPasswordChange.cpp b/src/guiPasswordChange.cpp
index a4d16444da63abf4332463902a4c8f06bd0990e4..8b55234c2a6b914ab9fd13fd14ee85200a2ce2e0 100644
--- a/src/guiPasswordChange.cpp
+++ b/src/guiPasswordChange.cpp
@@ -95,7 +95,6 @@ void GUIPasswordChange::regenerateGui(v2u32 screensize)
v2s32 size = rect.getSize();
v2s32 topleft_client(40, 0);
- v2s32 size_client = size - v2s32(40, 0);
/*
Add stuff
diff --git a/src/guiTextInputMenu.cpp b/src/guiTextInputMenu.cpp
index c15eeedc5fae607c4463351c985c377fdcd48237..d5229f4157fb1760de885dd2834bbc8717607261 100644
--- a/src/guiTextInputMenu.cpp
+++ b/src/guiTextInputMenu.cpp
@@ -121,6 +121,9 @@ void GUITextInputMenu::regenerateGui(v2u32 screensize)
evt.EventType = EET_KEY_INPUT_EVENT;
evt.KeyInput.Key = KEY_END;
evt.KeyInput.PressedDown = true;
+ evt.KeyInput.Char = 0;
+ evt.KeyInput.Control = 0;
+ evt.KeyInput.Shift = 0;
e->OnEvent(evt);
}
changeCtype("");
diff --git a/src/guiVolumeChange.cpp b/src/guiVolumeChange.cpp
index 4e92b82c25b3fc14d5b42fde2c4d97a1db5065f9..c272b132dc3e7f80a47ce4f8ad839da5a3cddb95 100644
--- a/src/guiVolumeChange.cpp
+++ b/src/guiVolumeChange.cpp
@@ -96,7 +96,6 @@ void GUIVolumeChange::regenerateGui(v2u32 screensize)
v2s32 size = rect.getSize();
v2s32 topleft_client(40, 0);
- v2s32 size_client = size - v2s32(40, 0);
int volume=(int)(g_settings->getFloat("sound_volume")*100);
/*
Add stuff
diff --git a/src/hud.cpp b/src/hud.cpp
index 65c78ca506bdef0091f24ec3327974f653133f7d..a3ae38bcb7a241b75832d9ced81ff8b3b85551ff 100644
--- a/src/hud.cpp
+++ b/src/hud.cpp
@@ -43,7 +43,6 @@ Hud::Hud(video::IVideoDriver *driver, gui::IGUIEnvironment* guienv,
screensize = v2u32(0, 0);
displaycenter = v2s32(0, 0);
hotbar_imagesize = 48;
- hotbar_itemcount = 8;
tsrc = gamedef->getTextureSource();
@@ -286,6 +285,7 @@ void Hud::drawHotbar(v2s32 centerlowerpos, s32 halfheartcount, u16 playeritem) {
return;
}
+ s32 hotbar_itemcount = player->hud_hotbar_itemcount;
s32 padding = hotbar_imagesize / 12;
s32 width = hotbar_itemcount * (hotbar_imagesize + padding * 2);
v2s32 pos = centerlowerpos - v2s32(width / 2, hotbar_imagesize + padding * 2);
diff --git a/src/hud.h b/src/hud.h
index 00e44dd8000318304091f82a0296f7da667be796..fa9d33f8b5d5e02b6b79801bfaa066a3a94d2337 100644
--- a/src/hud.h
+++ b/src/hud.h
@@ -36,6 +36,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define HUD_FLAG_CROSSHAIR_VISIBLE (1 << 2)
#define HUD_FLAG_WIELDITEM_VISIBLE (1 << 3)
+#define HUD_PARAM_HOTBAR_ITEMCOUNT 1
+
+#define HUD_HOTBAR_ITEMCOUNT_DEFAULT 8
+#define HUD_HOTBAR_ITEMCOUNT_MAX 23
+
class Player;
enum HudElementType {
@@ -46,7 +51,7 @@ enum HudElementType {
};
enum HudElementStat {
- HUD_STAT_POS,
+ HUD_STAT_POS = 0,
HUD_STAT_NAME,
HUD_STAT_SCALE,
HUD_STAT_TEXT,
@@ -102,7 +107,6 @@ class Hud {
v2u32 screensize;
v2s32 displaycenter;
s32 hotbar_imagesize;
- s32 hotbar_itemcount;
video::SColor crosshair_argb;
video::SColor selectionbox_argb;
diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp
index 08cae6d407275751a5fec30733f0ce4ba6da824a..6187675d47e2c22002acfb3f2e8bc6166e23c1fc 100644
--- a/src/inventorymanager.cpp
+++ b/src/inventorymanager.cpp
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "inventorymanager.h"
#include "log.h"
#include "environment.h"
-#include "scriptapi.h"
+#include "cpp_api/scriptapi.h"
#include "serverobject.h"
#include "main.h" // for g_settings
#include "settings.h"
@@ -226,9 +226,8 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
to_inv.type == InventoryLocation::DETACHED &&
from_inv.name == to_inv.name)
{
- lua_State *L = player->getEnv()->getLua();
- src_can_take_count = scriptapi_detached_inventory_allow_move(
- L, from_inv.name, from_list, from_i,
+ src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowMove(
+ from_inv.name, from_list, from_i,
to_list, to_i, try_take_count, player);
dst_can_put_count = src_can_take_count;
}
@@ -237,20 +236,18 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Destination is detached
if(to_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- dst_can_put_count = scriptapi_detached_inventory_allow_put(
- L, to_inv.name, to_list, to_i, src_item, player);
+ dst_can_put_count = PLAYER_TO_SA(player)->detached_inventory_AllowPut(
+ to_inv.name, to_list, to_i, src_item, player);
}
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- src_can_take_count = scriptapi_detached_inventory_allow_take(
- L, from_inv.name, from_list, from_i, src_item, player);
+ src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowTake(
+ from_inv.name, from_list, from_i, src_item, player);
}
}
@@ -262,9 +259,8 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
to_inv.type == InventoryLocation::NODEMETA &&
from_inv.p == to_inv.p)
{
- lua_State *L = player->getEnv()->getLua();
- src_can_take_count = scriptapi_nodemeta_inventory_allow_move(
- L, from_inv.p, from_list, from_i,
+ src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowMove(
+ from_inv.p, from_list, from_i,
to_list, to_i, try_take_count, player);
dst_can_put_count = src_can_take_count;
}
@@ -273,20 +269,18 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Destination is nodemeta
if(to_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- dst_can_put_count = scriptapi_nodemeta_inventory_allow_put(
- L, to_inv.p, to_list, to_i, src_item, player);
+ dst_can_put_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowPut(
+ to_inv.p, to_list, to_i, src_item, player);
}
// Source is nodemeta
if(from_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = try_take_count;
- src_can_take_count = scriptapi_nodemeta_inventory_allow_take(
- L, from_inv.p, from_list, from_i, src_item, player);
+ src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowTake(
+ from_inv.p, from_list, from_i, src_item, player);
}
}
@@ -412,9 +406,8 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
to_inv.type == InventoryLocation::DETACHED &&
from_inv.name == to_inv.name)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_detached_inventory_on_move(
- L, from_inv.name, from_list, from_i,
+ PLAYER_TO_SA(player)->detached_inventory_OnMove(
+ from_inv.name, from_list, from_i,
to_list, to_i, count, player);
}
else
@@ -422,16 +415,14 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Destination is detached
if(to_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_detached_inventory_on_put(
- L, to_inv.name, to_list, to_i, src_item, player);
+ PLAYER_TO_SA(player)->detached_inventory_OnPut(
+ to_inv.name, to_list, to_i, src_item, player);
}
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_detached_inventory_on_take(
- L, from_inv.name, from_list, from_i, src_item, player);
+ PLAYER_TO_SA(player)->detached_inventory_OnTake(
+ from_inv.name, from_list, from_i, src_item, player);
}
}
@@ -442,25 +433,22 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
to_inv.type == InventoryLocation::NODEMETA &&
from_inv.p == to_inv.p)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_nodemeta_inventory_on_move(
- L, from_inv.p, from_list, from_i,
+ PLAYER_TO_SA(player)->nodemeta_inventory_OnMove(
+ from_inv.p, from_list, from_i,
to_list, to_i, count, player);
}
else{
// Destination is nodemeta
if(to_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_nodemeta_inventory_on_put(
- L, to_inv.p, to_list, to_i, src_item, player);
+ PLAYER_TO_SA(player)->nodemeta_inventory_OnPut(
+ to_inv.p, to_list, to_i, src_item, player);
}
// Source is nodemeta
else if(from_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_nodemeta_inventory_on_take(
- L, from_inv.p, from_list, from_i, src_item, player);
+ PLAYER_TO_SA(player)->nodemeta_inventory_OnTake(
+ from_inv.p, from_list, from_i, src_item, player);
}
}
@@ -563,21 +551,19 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = take_count;
- src_can_take_count = scriptapi_detached_inventory_allow_take(
- L, from_inv.name, from_list, from_i, src_item, player);
+ src_can_take_count = PLAYER_TO_SA(player)->detached_inventory_AllowTake(
+ from_inv.name, from_list, from_i, src_item, player);
}
// Source is nodemeta
if(from_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
ItemStack src_item = list_from->getItem(from_i);
src_item.count = take_count;
- src_can_take_count = scriptapi_nodemeta_inventory_allow_take(
- L, from_inv.p, from_list, from_i, src_item, player);
+ src_can_take_count = PLAYER_TO_SA(player)->nodemeta_inventory_AllowTake(
+ from_inv.p, from_list, from_i, src_item, player);
}
if(src_can_take_count != -1 && src_can_take_count < take_count)
@@ -590,7 +576,7 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Drop the item
ItemStack item1 = list_from->getItem(from_i);
item1.count = take_count;
- if(scriptapi_item_on_drop(player->getEnv()->getLua(), item1, player,
+ if(PLAYER_TO_SA(player)->item_OnDrop(item1, player,
player->getBasePosition() + v3f(0,1,0)))
{
actually_dropped_count = take_count - item1.count;
@@ -627,17 +613,15 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame
// Source is detached
if(from_inv.type == InventoryLocation::DETACHED)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_detached_inventory_on_take(
- L, from_inv.name, from_list, from_i, src_item, player);
+ PLAYER_TO_SA(player)->detached_inventory_OnTake(
+ from_inv.name, from_list, from_i, src_item, player);
}
// Source is nodemeta
if(from_inv.type == InventoryLocation::NODEMETA)
{
- lua_State *L = player->getEnv()->getLua();
- scriptapi_nodemeta_inventory_on_take(
- L, from_inv.p, from_list, from_i, src_item, player);
+ PLAYER_TO_SA(player)->nodemeta_inventory_OnTake(
+ from_inv.p, from_list, from_i, src_item, player);
}
/*
diff --git a/src/jthread/jmutex.h b/src/jthread/jmutex.h
index e528aeb4ab95216407dfcc4284a39a1e1edc6032..383150f3fc4f0cf086162b10915afd782d7df906 100644
--- a/src/jthread/jmutex.h
+++ b/src/jthread/jmutex.h
@@ -57,6 +57,7 @@ class JMutex
int Lock();
int Unlock();
bool IsInitialized() { return initialized; }
+
private:
#if (defined(WIN32) || defined(_WIN32_WCE))
#ifdef JMUTEX_CRITICALSECTION
@@ -66,6 +67,14 @@ class JMutex
#endif // JMUTEX_CRITICALSECTION
#else // pthread mutex
pthread_mutex_t mutex;
+
+ bool IsLocked() {
+ if (pthread_mutex_trylock(&mutex)) {
+ pthread_mutex_unlock(&mutex);
+ return true;
+ }
+ return false;
+ }
#endif // WIN32
bool initialized;
};
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 13117d8811b54830ac5856c9fd63d867ba8ce9d6..f8dfca0500fb76458f1c8eaff12acabe6a190414 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -73,6 +73,7 @@ void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
if(isAttached)
{
setPosition(overridePosition);
+ m_sneak_node_exists = false;
return;
}
@@ -85,6 +86,7 @@ void LocalPlayer::move(f32 dtime, ClientEnvironment *env, f32 pos_max_d,
{
position += m_speed * dtime;
setPosition(position);
+ m_sneak_node_exists = false;
return;
}
diff --git a/src/main.cpp b/src/main.cpp
index 7f9ec1ace13385a808787888e3946e559207d493..eda992793641949068475179dc0afc16a71bf240 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1845,7 +1845,9 @@ int main(int argc, char *argv[])
MenuMusicFetcher soundfetcher;
ISoundManager *sound = NULL;
+#if USE_SOUND
sound = createOpenALSoundManager(&soundfetcher);
+#endif
if(!sound)
sound = &dummySoundManager;
SimpleSoundSpec spec;
@@ -1940,6 +1942,9 @@ int main(int argc, char *argv[])
sound = NULL;
}
+ // Save controls status
+ menu->readInput(&menudata);
+
infostream<<"Dropping main menu"<<std::endl;
menu->drop();
@@ -2145,7 +2150,9 @@ int main(int argc, char *argv[])
*/
device->drop();
- delete font;
+#if USE_FREETYPE
+ font->drop();
+#endif
#endif // !SERVER
diff --git a/src/map.cpp b/src/map.cpp
index 821805d4eff55b49f83f59fb5914bf9e8454f65f..43502253b14121b2aa3fb12e9f5e9af64f221cdb 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -288,10 +288,10 @@ void Map::unspreadLight(enum LightBank bank,
continue;
// Calculate relative position in block
- v3s16 relpos = pos - blockpos_last * MAP_BLOCKSIZE;
+ //v3s16 relpos = pos - blockpos_last * MAP_BLOCKSIZE;
// Get node straight from the block
- MapNode n = block->getNode(relpos);
+ //MapNode n = block->getNode(relpos);
u8 oldlight = j->second;
@@ -937,7 +937,7 @@ void Map::addNodeAndUpdate(v3s16 p, MapNode n,
*/
v3s16 toppos = p + v3s16(0,1,0);
- v3s16 bottompos = p + v3s16(0,-1,0);
+ //v3s16 bottompos = p + v3s16(0,-1,0);
bool node_under_sunlight = true;
std::set<v3s16> light_sources;
@@ -1246,7 +1246,7 @@ void Map::removeNodeAndUpdate(v3s16 p,
// Get the brightest neighbour node and propagate light from it
v3s16 n2p = getBrightestNeighbour(bank, p);
try{
- MapNode n2 = getNode(n2p);
+ //MapNode n2 = getNode(n2p);
lightNeighbors(bank, n2p, modified_blocks);
}
catch(InvalidPositionException &e)
@@ -1755,7 +1755,7 @@ void Map::transformLiquidsFinite(std::map<v3s16, MapBlock*> & modified_blocks)
}
//relax up
- if (relax && p0.Y <= water_level && liquid_levels[D_TOP] == 0 &&
+ if (relax && ((p0.Y == water_level) || (fast_flood && p0.Y <= water_level)) && liquid_levels[D_TOP] == 0 &&
liquid_levels[D_BOTTOM] == LIQUID_LEVEL_SOURCE &&
total_level >= LIQUID_LEVEL_SOURCE * can_liquid_same_level-
(can_liquid_same_level - relax) &&
@@ -2831,7 +2831,7 @@ ServerMapSector * ServerMap::createSector(v2s16 p2d)
sector = new ServerMapSector(this, p2d, m_gamedef);
// Sector position on map in nodes
- v2s16 nodepos2d = p2d * MAP_BLOCKSIZE;
+ //v2s16 nodepos2d = p2d * MAP_BLOCKSIZE;
/*
Insert to container
diff --git a/src/mapgen.cpp b/src/mapgen.cpp
index 0646a8826a0804279218d6dee92f7fb17332aa2e..835c14be13cd196a1200ef8144e6a81afea4c6e1 100644
--- a/src/mapgen.cpp
+++ b/src/mapgen.cpp
@@ -71,6 +71,12 @@ Ore *createOre(OreType type) {
}
+Ore::~Ore() {
+ delete np;
+ delete noise;
+}
+
+
void Ore::resolveNodeNames(INodeDefManager *ndef) {
if (ore == CONTENT_IGNORE) {
ore = ndef->getId(ore_name);
@@ -347,23 +353,18 @@ bool MapgenV6Params::readParams(Settings *settings) {
freq_desert = settings->getFloat("mgv6_freq_desert");
freq_beach = settings->getFloat("mgv6_freq_beach");
- np_terrain_base = settings->getNoiseParams("mgv6_np_terrain_base");
- np_terrain_higher = settings->getNoiseParams("mgv6_np_terrain_higher");
- np_steepness = settings->getNoiseParams("mgv6_np_steepness");
- np_height_select = settings->getNoiseParams("mgv6_np_height_select");
- np_mud = settings->getNoiseParams("mgv6_np_mud");
- np_beach = settings->getNoiseParams("mgv6_np_beach");
- np_biome = settings->getNoiseParams("mgv6_np_biome");
- np_cave = settings->getNoiseParams("mgv6_np_cave");
- np_humidity = settings->getNoiseParams("mgv6_np_humidity");
- np_trees = settings->getNoiseParams("mgv6_np_trees");
- np_apple_trees = settings->getNoiseParams("mgv6_np_apple_trees");
-
- bool success =
- np_terrain_base && np_terrain_higher && np_steepness &&
- np_height_select && np_trees && np_mud &&
- np_beach && np_biome && np_cave &&
- np_humidity && np_apple_trees;
+ bool success =
+ settings->getNoiseParams("mgv6_np_terrain_base", np_terrain_base) &&
+ settings->getNoiseParams("mgv6_np_terrain_higher", np_terrain_higher) &&
+ settings->getNoiseParams("mgv6_np_steepness", np_steepness) &&
+ settings->getNoiseParams("mgv6_np_height_select", np_height_select) &&
+ settings->getNoiseParams("mgv6_np_mud", np_mud) &&
+ settings->getNoiseParams("mgv6_np_beach", np_beach) &&
+ settings->getNoiseParams("mgv6_np_biome", np_biome) &&
+ settings->getNoiseParams("mgv6_np_cave", np_cave) &&
+ settings->getNoiseParams("mgv6_np_humidity", np_humidity) &&
+ settings->getNoiseParams("mgv6_np_trees", np_trees) &&
+ settings->getNoiseParams("mgv6_np_apple_trees", np_apple_trees);
return success;
}
@@ -387,16 +388,13 @@ void MapgenV6Params::writeParams(Settings *settings) {
bool MapgenV7Params::readParams(Settings *settings) {
- np_terrain_base = settings->getNoiseParams("mgv7_np_terrain_base");
- np_terrain_alt = settings->getNoiseParams("mgv7_np_terrain_alt");
- np_terrain_mod = settings->getNoiseParams("mgv7_np_terrain_mod");
- np_terrain_persist = settings->getNoiseParams("mgv7_np_terrain_persist");
- np_height_select = settings->getNoiseParams("mgv7_np_height_select");
- np_ridge = settings->getNoiseParams("mgv7_np_ridge");
-
- bool success =
- np_terrain_base && np_terrain_alt && np_terrain_mod &&
- np_terrain_persist && np_height_select && np_ridge;
+ bool success =
+ settings->getNoiseParams("mgv7_np_terrain_base", np_terrain_base) &&
+ settings->getNoiseParams("mgv7_np_terrain_alt", np_terrain_alt) &&
+ settings->getNoiseParams("mgv7_np_terrain_mod", np_terrain_mod) &&
+ settings->getNoiseParams("mgv7_np_terrain_persist", np_terrain_persist) &&
+ settings->getNoiseParams("mgv7_np_height_select", np_height_select) &&
+ settings->getNoiseParams("mgv7_np_ridge", np_ridge);
return success;
}
diff --git a/src/mapgen.h b/src/mapgen.h
index 17136a13796c704de70ca44166752f51d923b0e5..5d1e3bdf03952bf484c306ac0a1b7014f20b5b2b 100644
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -74,7 +74,8 @@ struct MapgenParams {
}
virtual bool readParams(Settings *settings) = 0;
- virtual void writeParams(Settings *settings) {};
+ virtual void writeParams(Settings *settings) = 0;
+ virtual ~MapgenParams() {}
};
class Mapgen {
@@ -86,6 +87,8 @@ class Mapgen {
ManualMapVoxelManipulator *vm;
INodeDefManager *ndef;
+ virtual ~Mapgen() {}
+
void updateLiquid(UniqueQueue<v3s16> *trans_liquid, v3s16 nmin, v3s16 nmax);
void setLighting(v3s16 nmin, v3s16 nmax, u8 light);
void lightSpread(VoxelArea &a, v3s16 p, u8 light);
@@ -105,6 +108,7 @@ struct MapgenFactory {
virtual Mapgen *createMapgen(int mgid, MapgenParams *params,
EmergeManager *emerge) = 0;
virtual MapgenParams *createMapgenParams() = 0;
+ virtual ~MapgenFactory() {}
};
enum OreType {
@@ -140,6 +144,8 @@ class Ore {
noise = NULL;
}
+ virtual ~Ore();
+
void resolveNodeNames(INodeDefManager *ndef);
void placeOre(Mapgen *mg, u32 blockseed, v3s16 nmin, v3s16 nmax);
virtual void generate(ManualMapVoxelManipulator *vm, int seed,
@@ -147,11 +153,13 @@ class Ore {
};
class OreScatter : public Ore {
+ ~OreScatter() {}
virtual void generate(ManualMapVoxelManipulator *vm, int seed,
u32 blockseed, v3s16 nmin, v3s16 nmax);
};
class OreSheet : public Ore {
+ ~OreSheet() {}
virtual void generate(ManualMapVoxelManipulator *vm, int seed,
u32 blockseed, v3s16 nmin, v3s16 nmax);
};
diff --git a/src/mapgen_indev.cpp b/src/mapgen_indev.cpp
index 2eeaf13ebc7c7b20a14357e95084aaca05063041..430359be2d0d4d4f25dcf302c6e3329c181da242 100644
--- a/src/mapgen_indev.cpp
+++ b/src/mapgen_indev.cpp
@@ -84,17 +84,14 @@ void NoiseIndev::transformNoiseMapFarScale(float xx, float yy, float zz) {
MapgenIndev::MapgenIndev(int mapgenid, MapgenIndevParams *params, EmergeManager *emerge)
: MapgenV6(mapgenid, params, emerge)
{
- noiseindev_terrain_base = new NoiseIndev(params->npindev_terrain_base, seed, csize.X, csize.Z);
- noiseindev_terrain_higher = new NoiseIndev(params->npindev_terrain_higher, seed, csize.X, csize.Z);
- noiseindev_steepness = new NoiseIndev(params->npindev_steepness, seed, csize.X, csize.Z);
-// noise_height_select = new Noise(params->np_height_select, seed, csize.X, csize.Y);
-// noise_trees = new Noise(params->np_trees, seed, csize.X, csize.Y);
- noiseindev_mud = new NoiseIndev(params->npindev_mud, seed, csize.X, csize.Z);
-// noise_beach = new Noise(params->np_beach, seed, csize.X, csize.Y);
- noiseindev_float_islands1 = new NoiseIndev(params->npindev_float_islands1, seed, csize.X, csize.Y, csize.Z);
- noiseindev_float_islands2 = new NoiseIndev(params->npindev_float_islands2, seed, csize.X, csize.Y, csize.Z);
- noiseindev_float_islands3 = new NoiseIndev(params->npindev_float_islands3, seed, csize.X, csize.Z);
- noiseindev_biome = new NoiseIndev(params->npindev_biome, seed, csize.X, csize.Z);
+ noiseindev_terrain_base = new NoiseIndev(¶ms->npindev_terrain_base, seed, csize.X, csize.Z);
+ noiseindev_terrain_higher = new NoiseIndev(¶ms->npindev_terrain_higher, seed, csize.X, csize.Z);
+ noiseindev_steepness = new NoiseIndev(¶ms->npindev_steepness, seed, csize.X, csize.Z);
+ noiseindev_mud = new NoiseIndev(¶ms->npindev_mud, seed, csize.X, csize.Z);
+ noiseindev_float_islands1 = new NoiseIndev(¶ms->npindev_float_islands1, seed, csize.X, csize.Y, csize.Z);
+ noiseindev_float_islands2 = new NoiseIndev(¶ms->npindev_float_islands2, seed, csize.X, csize.Y, csize.Z);
+ noiseindev_float_islands3 = new NoiseIndev(¶ms->npindev_float_islands3, seed, csize.X, csize.Z);
+ noiseindev_biome = new NoiseIndev(¶ms->npindev_biome, seed, csize.X, csize.Z);
}
MapgenIndev::~MapgenIndev() {
@@ -170,46 +167,41 @@ void MapgenIndev::calculateNoise() {
}
bool MapgenIndevParams::readParams(Settings *settings) {
- freq_desert = settings->getFloat("mgv6_freq_desert");
- freq_beach = settings->getFloat("mgv6_freq_beach");
-
- npindev_terrain_base = settings->getNoiseIndevParams("mgindev_np_terrain_base");
- npindev_terrain_higher = settings->getNoiseIndevParams("mgindev_np_terrain_higher");
- npindev_steepness = settings->getNoiseIndevParams("mgindev_np_steepness");
- np_height_select = settings->getNoiseParams("mgv6_np_height_select");
- np_trees = settings->getNoiseParams("mgv6_np_trees");
- npindev_mud = settings->getNoiseIndevParams("mgindev_np_mud");
- np_beach = settings->getNoiseParams("mgv6_np_beach");
- npindev_biome = settings->getNoiseIndevParams("mgindev_np_biome");
- np_cave = settings->getNoiseParams("mgv6_np_cave");
- npindev_float_islands1 = settings->getNoiseIndevParams("mgindev_np_float_islands1");
- npindev_float_islands2 = settings->getNoiseIndevParams("mgindev_np_float_islands2");
- npindev_float_islands3 = settings->getNoiseIndevParams("mgindev_np_float_islands3");
-
- bool success =
- npindev_terrain_base && npindev_terrain_higher && npindev_steepness &&
- np_height_select && np_trees && npindev_mud &&
- np_beach && np_biome && np_cave &&
- npindev_float_islands1 && npindev_float_islands2 && npindev_float_islands3;
- return success;
+ freq_desert = settings->getFloat("mgv6_freq_desert");
+ freq_beach = settings->getFloat("mgv6_freq_beach");
+
+ bool success =
+ settings->getNoiseIndevParams("mgindev_np_terrain_base", npindev_terrain_base) &&
+ settings->getNoiseIndevParams("mgindev_np_terrain_higher", npindev_terrain_higher) &&
+ settings->getNoiseIndevParams("mgindev_np_steepness", npindev_steepness) &&
+ settings->getNoiseParams("mgv6_np_height_select", np_height_select) &&
+ settings->getNoiseParams("mgv6_np_trees", np_trees) &&
+ settings->getNoiseIndevParams("mgindev_np_mud", npindev_mud) &&
+ settings->getNoiseParams("mgv6_np_beach", np_beach) &&
+ settings->getNoiseIndevParams("mgindev_np_biome", npindev_biome) &&
+ settings->getNoiseParams("mgv6_np_cave", np_cave) &&
+ settings->getNoiseIndevParams("mgindev_np_float_islands1", npindev_float_islands1) &&
+ settings->getNoiseIndevParams("mgindev_np_float_islands2", npindev_float_islands2) &&
+ settings->getNoiseIndevParams("mgindev_np_float_islands3", npindev_float_islands3);
+ return success;
}
void MapgenIndevParams::writeParams(Settings *settings) {
- settings->setFloat("mgv6_freq_desert", freq_desert);
- settings->setFloat("mgv6_freq_beach", freq_beach);
-
- settings->setNoiseIndevParams("mgindev_np_terrain_base", npindev_terrain_base);
- settings->setNoiseIndevParams("mgindev_np_terrain_higher", npindev_terrain_higher);
- settings->setNoiseIndevParams("mgindev_np_steepness", npindev_steepness);
- settings->setNoiseParams("mgv6_np_height_select", np_height_select);
- settings->setNoiseParams("mgv6_np_trees", np_trees);
- settings->setNoiseIndevParams("mgindev_np_mud", npindev_mud);
- settings->setNoiseParams("mgv6_np_beach", np_beach);
- settings->setNoiseIndevParams("mgindev_np_biome", npindev_biome);
- settings->setNoiseParams("mgv6_np_cave", np_cave);
- settings->setNoiseIndevParams("mgindev_np_float_islands1", npindev_float_islands1);
- settings->setNoiseIndevParams("mgindev_np_float_islands2", npindev_float_islands2);
- settings->setNoiseIndevParams("mgindev_np_float_islands3", npindev_float_islands3);
+ settings->setFloat("mgv6_freq_desert", freq_desert);
+ settings->setFloat("mgv6_freq_beach", freq_beach);
+
+ settings->setNoiseIndevParams("mgindev_np_terrain_base", npindev_terrain_base);
+ settings->setNoiseIndevParams("mgindev_np_terrain_higher", npindev_terrain_higher);
+ settings->setNoiseIndevParams("mgindev_np_steepness", npindev_steepness);
+ settings->setNoiseParams("mgv6_np_height_select", np_height_select);
+ settings->setNoiseParams("mgv6_np_trees", np_trees);
+ settings->setNoiseIndevParams("mgindev_np_mud", npindev_mud);
+ settings->setNoiseParams("mgv6_np_beach", np_beach);
+ settings->setNoiseIndevParams("mgindev_np_biome", npindev_biome);
+ settings->setNoiseParams("mgv6_np_cave", np_cave);
+ settings->setNoiseIndevParams("mgindev_np_float_islands1", npindev_float_islands1);
+ settings->setNoiseIndevParams("mgindev_np_float_islands2", npindev_float_islands2);
+ settings->setNoiseIndevParams("mgindev_np_float_islands3", npindev_float_islands3);
}
diff --git a/src/mapgen_indev.h b/src/mapgen_indev.h
index 87ae39d0993798e97c2b1b3757b19fd9836203e9..cfef590412346f39038a4dc8010dfafa9a473be8 100644
--- a/src/mapgen_indev.h
+++ b/src/mapgen_indev.h
@@ -32,30 +32,33 @@ struct NoiseIndevParams : public NoiseParams {
float farscale;
float farspread;
- NoiseIndevParams(){}
- NoiseIndevParams(float offset_, float scale_, v3f spread_, int seed_, int octaves_, float persist_, float farscale_ = 1, float farspread_ = 1)
+ NoiseIndevParams() {}
+ NoiseIndevParams(float offset_, float scale_, v3f spread_,
+ int seed_, int octaves_, float persist_,
+ float farscale_ = 1, float farspread_ = 1)
{
- offset = offset_;
- scale = scale_;
- spread = spread_;
- seed = seed_;
+ offset = offset_;
+ scale = scale_;
+ spread = spread_;
+ seed = seed_;
octaves = octaves_;
persist = persist_;
- farscale = farscale_;
+ farscale = farscale_;
farspread = farspread_;
}
-
+
+ ~NoiseIndevParams() {}
};
-#define getNoiseIndevParams(x) getStruct<NoiseIndevParams>((x), "f,f,v3,s32,s32,f,f,f")
-#define setNoiseIndevParams(x, y) setStruct((x), "f,f,v3,s32,s32,f,f,f", (y))
+#define getNoiseIndevParams(x, y) getStruct((x), "f,f,v3,s32,s32,f,f,f", &(y), sizeof(y))
+#define setNoiseIndevParams(x, y) setStruct((x), "f,f,v3,s32,s32,f,f,f", &(y))
class NoiseIndev : public Noise {
- public:
+public:
NoiseIndevParams *npindev;
- //NoiseIndev() {};
+ virtual ~NoiseIndev() {};
NoiseIndev(NoiseIndevParams *np, int seed, int sx, int sy);
NoiseIndev(NoiseIndevParams *np, int seed, int sx, int sy, int sz);
void init(NoiseIndevParams *np, int seed, int sx, int sy, int sz);
@@ -77,34 +80,34 @@ extern NoiseIndevParams nparams_indev_def_float_islands;
*/
struct MapgenIndevParams : public MapgenV6Params {
- NoiseIndevParams *npindev_terrain_base;
- NoiseIndevParams *npindev_terrain_higher;
- NoiseIndevParams *npindev_steepness;
+ NoiseIndevParams npindev_terrain_base;
+ NoiseIndevParams npindev_terrain_higher;
+ NoiseIndevParams npindev_steepness;
//NoiseParams *np_height_select;
//NoiseParams *np_trees;
- NoiseIndevParams *npindev_mud;
+ NoiseIndevParams npindev_mud;
//NoiseParams *np_beach;
- NoiseIndevParams *npindev_biome;
+ NoiseIndevParams npindev_biome;
//NoiseParams *np_cave;
- NoiseIndevParams *npindev_float_islands1;
- NoiseIndevParams *npindev_float_islands2;
- NoiseIndevParams *npindev_float_islands3;
+ NoiseIndevParams npindev_float_islands1;
+ NoiseIndevParams npindev_float_islands2;
+ NoiseIndevParams npindev_float_islands3;
MapgenIndevParams() {
//freq_desert = 0.45;
//freq_beach = 0.15;
- npindev_terrain_base = &nparams_indev_def; //&nparams_indev_def_terrain_base;
- npindev_terrain_higher = &nparams_indev_def; //&nparams_indev_def_terrain_higher;
- npindev_steepness = &nparams_indev_def; //&nparams_indev_def_steepness;
+ npindev_terrain_base = nparams_indev_def; //&nparams_indev_def_terrain_base;
+ npindev_terrain_higher = nparams_indev_def; //&nparams_indev_def_terrain_higher;
+ npindev_steepness = nparams_indev_def; //&nparams_indev_def_steepness;
//np_height_select = &nparams_v6_def_height_select;
//np_trees = &nparams_v6_def_trees;
- npindev_mud = &nparams_indev_def; //&nparams_indev_def_mud;
+ npindev_mud = nparams_indev_def; //&nparams_indev_def_mud;
//np_beach = &nparams_v6_def_beach;
- npindev_biome = &nparams_indev_def; //&nparams_indev_def_biome;
+ npindev_biome = nparams_indev_def; //&nparams_indev_def_biome;
//np_cave = &nparams_v6_def_cave;
- npindev_float_islands1 = &nparams_indev_def; //&nparams_indev_def_float_islands;
- npindev_float_islands2 = &nparams_indev_def; //&nparams_indev_def_float_islands;
- npindev_float_islands3 = &nparams_indev_def; //&nparams_indev_def_float_islands;
+ npindev_float_islands1 = nparams_indev_def; //&nparams_indev_def_float_islands;
+ npindev_float_islands2 = nparams_indev_def; //&nparams_indev_def_float_islands;
+ npindev_float_islands3 = nparams_indev_def; //&nparams_indev_def_float_islands;
}
diff --git a/src/mapgen_singlenode.h b/src/mapgen_singlenode.h
index b86c9a77faf09d80eb8c99f33ac59cab8828f1ca..8b816aa25af0b25414e059b6cbeeeeea222742cd 100644
--- a/src/mapgen_singlenode.h
+++ b/src/mapgen_singlenode.h
@@ -24,8 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
struct MapgenSinglenodeParams : public MapgenParams {
- MapgenSinglenodeParams() {
- }
+ MapgenSinglenodeParams() {}
+ ~MapgenSinglenodeParams() {}
bool readParams(Settings *settings);
void writeParams(Settings *settings);
diff --git a/src/mapgen_v6.cpp b/src/mapgen_v6.cpp
index d90d142d50ed75d911c1c686ba356a7656934809..eaca33988444e3059b891d8101961a5dfbecaa99 100644
--- a/src/mapgen_v6.cpp
+++ b/src/mapgen_v6.cpp
@@ -80,18 +80,18 @@ MapgenV6::MapgenV6(int mapgenid, MapgenV6Params *params, EmergeManager *emerge)
this->ystride = csize.X; //////fix this
- np_cave = params->np_cave;
- np_humidity = params->np_humidity;
- np_trees = params->np_trees;
- np_apple_trees = params->np_apple_trees;
-
- noise_terrain_base = new Noise(params->np_terrain_base, seed, csize.X, csize.Y);
- noise_terrain_higher = new Noise(params->np_terrain_higher, seed, csize.X, csize.Y);
- noise_steepness = new Noise(params->np_steepness, seed, csize.X, csize.Y);
- noise_height_select = new Noise(params->np_height_select, seed, csize.X, csize.Y);
- noise_mud = new Noise(params->np_mud, seed, csize.X, csize.Y);
- noise_beach = new Noise(params->np_beach, seed, csize.X, csize.Y);
- noise_biome = new Noise(params->np_biome, seed, csize.X, csize.Y);
+ np_cave = ¶ms->np_cave;
+ np_humidity = ¶ms->np_humidity;
+ np_trees = ¶ms->np_trees;
+ np_apple_trees = ¶ms->np_apple_trees;
+
+ noise_terrain_base = new Noise(¶ms->np_terrain_base, seed, csize.X, csize.Y);
+ noise_terrain_higher = new Noise(¶ms->np_terrain_higher, seed, csize.X, csize.Y);
+ noise_steepness = new Noise(¶ms->np_steepness, seed, csize.X, csize.Y);
+ noise_height_select = new Noise(¶ms->np_height_select, seed, csize.X, csize.Y);
+ noise_mud = new Noise(¶ms->np_mud, seed, csize.X, csize.Y);
+ noise_beach = new Noise(¶ms->np_beach, seed, csize.X, csize.Y);
+ noise_biome = new Noise(¶ms->np_biome, seed, csize.X, csize.Y);
}
@@ -375,8 +375,6 @@ void MapgenV6::makeChunk(BlockMakeData *data) {
v3s16 blockpos = data->blockpos_requested;
v3s16 blockpos_min = data->blockpos_min;
v3s16 blockpos_max = data->blockpos_max;
- v3s16 blockpos_full_min = blockpos_min - v3s16(1,1,1);
- v3s16 blockpos_full_max = blockpos_max + v3s16(1,1,1);
// Area of central chunk
node_min = blockpos_min*MAP_BLOCKSIZE;
diff --git a/src/mapgen_v6.h b/src/mapgen_v6.h
index a0276fb591d007ea511655a8eb9e9509ead69e86..8f456fd3f1e630838d013b7afd75127c73915835 100644
--- a/src/mapgen_v6.h
+++ b/src/mapgen_v6.h
@@ -45,35 +45,36 @@ extern NoiseParams nparams_v6_def_apple_trees;
struct MapgenV6Params : public MapgenParams {
float freq_desert;
float freq_beach;
- NoiseParams *np_terrain_base;
- NoiseParams *np_terrain_higher;
- NoiseParams *np_steepness;
- NoiseParams *np_height_select;
- NoiseParams *np_mud;
- NoiseParams *np_beach;
- NoiseParams *np_biome;
- NoiseParams *np_cave;
- NoiseParams *np_humidity;
- NoiseParams *np_trees;
- NoiseParams *np_apple_trees;
+ NoiseParams np_terrain_base;
+ NoiseParams np_terrain_higher;
+ NoiseParams np_steepness;
+ NoiseParams np_height_select;
+ NoiseParams np_mud;
+ NoiseParams np_beach;
+ NoiseParams np_biome;
+ NoiseParams np_cave;
+ NoiseParams np_humidity;
+ NoiseParams np_trees;
+ NoiseParams np_apple_trees;
MapgenV6Params() {
freq_desert = 0.45;
freq_beach = 0.15;
- np_terrain_base = &nparams_v6_def_terrain_base;
- np_terrain_higher = &nparams_v6_def_terrain_higher;
- np_steepness = &nparams_v6_def_steepness;
- np_height_select = &nparams_v6_def_height_select;
- np_mud = &nparams_v6_def_mud;
- np_beach = &nparams_v6_def_beach;
- np_biome = &nparams_v6_def_biome;
- np_cave = &nparams_v6_def_cave;
- np_humidity = &nparams_v6_def_humidity;
- np_trees = &nparams_v6_def_trees;
- np_apple_trees = &nparams_v6_def_apple_trees;
-
+ np_terrain_base = nparams_v6_def_terrain_base;
+ np_terrain_higher = nparams_v6_def_terrain_higher;
+ np_steepness = nparams_v6_def_steepness;
+ np_height_select = nparams_v6_def_height_select;
+ np_mud = nparams_v6_def_mud;
+ np_beach = nparams_v6_def_beach;
+ np_biome = nparams_v6_def_biome;
+ np_cave = nparams_v6_def_cave;
+ np_humidity = nparams_v6_def_humidity;
+ np_trees = nparams_v6_def_trees;
+ np_apple_trees = nparams_v6_def_apple_trees;
}
+ ~MapgenV6Params() {}
+
bool readParams(Settings *settings);
void writeParams(Settings *settings);
};
diff --git a/src/mapgen_v7.cpp b/src/mapgen_v7.cpp
index 4bfc866e246ccaad962b2139f56e44b3055e0254..6daa5fc6abbaac2138d19a0d3fd2795f89203ad3 100644
--- a/src/mapgen_v7.cpp
+++ b/src/mapgen_v7.cpp
@@ -85,12 +85,12 @@ MapgenV7::MapgenV7(int mapgenid, MapgenV7Params *params, EmergeManager *emerge)
this->ridge_heightmap = new s16[csize.X * csize.Z];
// Terrain noise
- noise_terrain_base = new Noise(params->np_terrain_base, seed, csize.X, csize.Z);
- noise_terrain_alt = new Noise(params->np_terrain_alt, seed, csize.X, csize.Z);
- noise_terrain_mod = new Noise(params->np_terrain_mod, seed, csize.X, csize.Z);
- noise_terrain_persist = new Noise(params->np_terrain_persist, seed, csize.X, csize.Z);
- noise_height_select = new Noise(params->np_height_select, seed, csize.X, csize.Z);
- noise_ridge = new Noise(params->np_ridge, seed, csize.X, csize.Y, csize.Z);
+ noise_terrain_base = new Noise(¶ms->np_terrain_base, seed, csize.X, csize.Z);
+ noise_terrain_alt = new Noise(¶ms->np_terrain_alt, seed, csize.X, csize.Z);
+ noise_terrain_mod = new Noise(¶ms->np_terrain_mod, seed, csize.X, csize.Z);
+ noise_terrain_persist = new Noise(¶ms->np_terrain_persist, seed, csize.X, csize.Z);
+ noise_height_select = new Noise(¶ms->np_height_select, seed, csize.X, csize.Z);
+ noise_ridge = new Noise(¶ms->np_ridge, seed, csize.X, csize.Y, csize.Z);
// Biome noise
noise_heat = new Noise(bmgr->np_heat, seed, csize.X, csize.Z);
@@ -152,8 +152,6 @@ void MapgenV7::makeChunk(BlockMakeData *data) {
v3s16 blockpos_min = data->blockpos_min;
v3s16 blockpos_max = data->blockpos_max;
- v3s16 blockpos_full_min = blockpos_min - v3s16(1, 1, 1);
- v3s16 blockpos_full_max = blockpos_max + v3s16(1, 1, 1);
node_min = blockpos_min * MAP_BLOCKSIZE;
node_max = (blockpos_max + v3s16(1, 1, 1)) * MAP_BLOCKSIZE - v3s16(1, 1, 1);
full_node_min = (blockpos_min - 1) * MAP_BLOCKSIZE;
diff --git a/src/mapgen_v7.h b/src/mapgen_v7.h
index 3391098ea9c7d42876cdaa52e65ca62156504c73..b6b03689d12582810a035c5fa1997278106a92b7 100644
--- a/src/mapgen_v7.h
+++ b/src/mapgen_v7.h
@@ -30,22 +30,24 @@ extern NoiseParams nparams_v7_def_height_select;
extern NoiseParams nparams_v7_def_ridge;
struct MapgenV7Params : public MapgenParams {
- NoiseParams *np_terrain_base;
- NoiseParams *np_terrain_alt;
- NoiseParams *np_terrain_mod;
- NoiseParams *np_terrain_persist;
- NoiseParams *np_height_select;
- NoiseParams *np_ridge;
+ NoiseParams np_terrain_base;
+ NoiseParams np_terrain_alt;
+ NoiseParams np_terrain_mod;
+ NoiseParams np_terrain_persist;
+ NoiseParams np_height_select;
+ NoiseParams np_ridge;
MapgenV7Params() {
- np_terrain_base = &nparams_v7_def_terrain_base;
- np_terrain_alt = &nparams_v7_def_terrain_alt;
- np_terrain_mod = &nparams_v7_def_terrain_mod;
- np_terrain_persist = &nparams_v7_def_terrain_persist;
- np_height_select = &nparams_v7_def_height_select;
- np_ridge = &nparams_v7_def_ridge;
+ np_terrain_base = nparams_v7_def_terrain_base;
+ np_terrain_alt = nparams_v7_def_terrain_alt;
+ np_terrain_mod = nparams_v7_def_terrain_mod;
+ np_terrain_persist = nparams_v7_def_terrain_persist;
+ np_height_select = nparams_v7_def_height_select;
+ np_ridge = nparams_v7_def_ridge;
}
+ ~MapgenV7Params() {}
+
bool readParams(Settings *settings);
void writeParams(Settings *settings);
};
diff --git a/src/mods.cpp b/src/mods.cpp
index 64c3199928392d0f09b0cec2f97e98fb685918b4..9bcf73aa7c303fa35dc50a4579618f8094133327 100644
--- a/src/mods.cpp
+++ b/src/mods.cpp
@@ -220,7 +220,7 @@ ModConfiguration::ModConfiguration(std::string worldpath)
Settings worldmt_settings;
worldmt_settings.readConfigFile(worldmt.c_str());
std::vector<std::string> names = worldmt_settings.getNames();
- std::set<std::string> exclude_mod_names;
+ std::set<std::string> include_mod_names;
for(std::vector<std::string>::iterator it = names.begin();
it != names.end(); ++it)
{
@@ -229,14 +229,13 @@ ModConfiguration::ModConfiguration(std::string worldpath)
// explicitely excluded. if mod is not mentioned at all, it is
// enabled. So by default, all installed mods are enabled.
if (name.compare(0,9,"load_mod_") == 0 &&
- !worldmt_settings.getBool(name))
+ worldmt_settings.getBool(name))
{
- exclude_mod_names.insert(name.substr(9));
+ include_mod_names.insert(name.substr(9));
}
}
- // Collect all mods in gamespec.addon_mods_paths,
- // excluding those in the set exclude_mod_names
+ // Collect all mods that are also in include_mod_names
std::vector<ModSpec> addon_mods;
for(std::set<std::string>::const_iterator it_path = gamespec.addon_mods_paths.begin();
it_path != gamespec.addon_mods_paths.end(); ++it_path)
@@ -246,10 +245,13 @@ ModConfiguration::ModConfiguration(std::string worldpath)
it != addon_mods_in_path.end(); ++it)
{
ModSpec& mod = *it;
- if(exclude_mod_names.count(mod.name) == 0)
+ if(include_mod_names.count(mod.name) != 0)
addon_mods.push_back(mod);
+ else
+ worldmt_settings.setBool("load_mod_" + mod.name, false);
}
}
+ worldmt_settings.updateConfigFile(worldmt.c_str());
addMods(addon_mods);
@@ -307,7 +309,7 @@ void ModConfiguration::addMods(std::vector<ModSpec> new_mods)
// BAD CASE: name conflict in different levels.
u32 oldindex = existing_mods[mod.name];
const ModSpec &oldmod = m_unsatisfied_mods[oldindex];
- errorstream<<"WARNING: Mod name conflict detected: \""
+ actionstream<<"WARNING: Mod name conflict detected: \""
<<mod.name<<"\""<<std::endl
<<"Will not load: "<<oldmod.path<<std::endl
<<"Overridden by: "<<mod.path<<std::endl;
diff --git a/src/noise.h b/src/noise.h
index ace6d7eb4cb714e48c5aa40fa3e022f522e89c63..0bf1a2f13297ef85effe9d7620472138e410c52c 100644
--- a/src/noise.h
+++ b/src/noise.h
@@ -72,8 +72,8 @@ struct NoiseParams {
// Convenience macros for getting/setting NoiseParams in Settings
-#define getNoiseParams(x) getStruct<NoiseParams>((x), "f,f,v3,s32,s32,f")
-#define setNoiseParams(x, y) setStruct((x), "f,f,v3,s32,s32,f", (y))
+#define getNoiseParams(x, y) getStruct((x), "f,f,v3,s32,s32,f", &(y), sizeof(y))
+#define setNoiseParams(x, y) setStruct((x), "f,f,v3,s32,s32,f", &(y))
class Noise {
public:
@@ -88,7 +88,7 @@ class Noise {
Noise(NoiseParams *np, int seed, int sx, int sy);
Noise(NoiseParams *np, int seed, int sx, int sy, int sz);
- ~Noise();
+ virtual ~Noise();
virtual void init(NoiseParams *np, int seed, int sx, int sy, int sz);
void setSize(int sx, int sy);
diff --git a/src/player.cpp b/src/player.cpp
index 34f0fda089da0c3b82d0847f19a283d5c2102b10..4eb5955c089461c5632a96e184aed0742ede3188 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -81,6 +81,8 @@ Player::Player(IGameDef *gamedef):
hud_flags = HUD_FLAG_HOTBAR_VISIBLE | HUD_FLAG_HEALTHBAR_VISIBLE |
HUD_FLAG_CROSSHAIR_VISIBLE | HUD_FLAG_WIELDITEM_VISIBLE;
+
+ hud_hotbar_itemcount = HUD_HOTBAR_ITEMCOUNT_DEFAULT;
}
Player::~Player()
diff --git a/src/player.h b/src/player.h
index fade6de0189b3a72d5942ecf76fabdbb76e4ba17..d3738fd528b46b6afd28a5bfbdeacaa01d73bb2c 100644
--- a/src/player.h
+++ b/src/player.h
@@ -87,7 +87,7 @@ class Map;
class IGameDef;
struct CollisionInfo;
class PlayerSAO;
-class HudElement;
+struct HudElement;
class Player
{
@@ -250,6 +250,7 @@ class Player
std::vector<HudElement *> hud;
u32 hud_flags;
+ s32 hud_hotbar_itemcount;
protected:
IGameDef *m_gamedef;
diff --git a/src/script.cpp b/src/script.cpp
deleted file mode 100644
index 4619fa6361a8cb30adb68b3fdb468baad94dc09b..0000000000000000000000000000000000000000
--- a/src/script.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "script.h"
-#include <cstdarg>
-#include <cstring>
-#include <cstdio>
-#include <cstdlib>
-#include "log.h"
-#include <iostream>
-
-extern "C" {
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-}
-
-LuaError::LuaError(lua_State *L, const std::string &s)
-{
- m_s = "LuaError: ";
- m_s += s + "\n";
- m_s += script_get_backtrace(L);
-}
-
-std::string script_get_backtrace(lua_State *L)
-{
- std::string s;
- lua_getfield(L, LUA_GLOBALSINDEX, "debug");
- if(lua_istable(L, -1)){
- lua_getfield(L, -1, "traceback");
- if(lua_isfunction(L, -1)){
- lua_call(L, 0, 1);
- if(lua_isstring(L, -1)){
- s += lua_tostring(L, -1);
- }
- lua_pop(L, 1);
- }
- else{
- lua_pop(L, 1);
- }
- }
- lua_pop(L, 1);
- return s;
-}
-
-void script_error(lua_State *L, const char *fmt, ...)
-{
- va_list argp;
- va_start(argp, fmt);
- char buf[10000];
- vsnprintf(buf, 10000, fmt, argp);
- va_end(argp);
- //errorstream<<"SCRIPT ERROR: "<<buf;
- throw LuaError(L, buf);
-}
-
-int luaErrorHandler(lua_State *L) {
- lua_getfield(L, LUA_GLOBALSINDEX, "debug");
- if (!lua_istable(L, -1)) {
- lua_pop(L, 1);
- return 1;
- }
- lua_getfield(L, -1, "traceback");
- if (!lua_isfunction(L, -1)) {
- lua_pop(L, 2);
- return 1;
- }
- lua_pushvalue(L, 1);
- lua_pushinteger(L, 2);
- lua_call(L, 2, 1);
- return 1;
-}
-
-bool script_load(lua_State *L, const char *path)
-{
- verbosestream<<"Loading and running script from "<<path<<std::endl;
-
- lua_pushcfunction(L, luaErrorHandler);
- int errorhandler = lua_gettop(L);
-
- int ret = luaL_loadfile(L, path) || lua_pcall(L, 0, 0, errorhandler);
- if(ret){
- errorstream<<"========== ERROR FROM LUA ==========="<<std::endl;
- errorstream<<"Failed to load and run script from "<<std::endl;
- errorstream<<path<<":"<<std::endl;
- errorstream<<std::endl;
- errorstream<<lua_tostring(L, -1)<<std::endl;
- errorstream<<std::endl;
- errorstream<<"=======END OF ERROR FROM LUA ========"<<std::endl;
- lua_pop(L, 1); // Pop error message from stack
- lua_pop(L, 1); // Pop the error handler from stack
- return false;
- }
- lua_pop(L, 1); // Pop the error handler from stack
- return true;
-}
-
-lua_State* script_init()
-{
- lua_State *L = luaL_newstate();
- luaL_openlibs(L);
- return L;
-}
-
-void script_deinit(lua_State *L)
-{
- lua_close(L);
-}
-
-
diff --git a/src/script/CMakeLists.txt b/src/script/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e1a03b95ac994382514d4eb6f977ab496c3ecc17
--- /dev/null
+++ b/src/script/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_subdirectory(common)
+add_subdirectory(cpp_api)
+add_subdirectory(lua_api)
+
+set(SCRIPT_SRCS
+ ${SCRIPT_COMMON_SRCS}
+ ${SCRIPT_CPP_API_SRCS}
+ ${SCRIPT_LUA_API_SRCS}
+ PARENT_SCOPE)
diff --git a/src/script/common/CMakeLists.txt b/src/script/common/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c8f7ef7836ec2478b35e472d6bddee437efd1cb2
--- /dev/null
+++ b/src/script/common/CMakeLists.txt
@@ -0,0 +1,6 @@
+set(SCRIPT_COMMON_SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/c_content.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/c_converter.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/c_types.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/c_internal.cpp
+ PARENT_SCOPE)
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..c7966a0be83d0eac2143b4acf0a60b7dba126ba7
--- /dev/null
+++ b/src/script/common/c_content.cpp
@@ -0,0 +1,923 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+#include "common/c_content.h"
+#include "common/c_converter.h"
+#include "common/c_types.h"
+#include "nodedef.h"
+#include "itemdef.h"
+#include "object_properties.h"
+#include "cpp_api/s_node.h"
+#include "lua_api/l_object.h"
+#include "lua_api/l_item.h"
+#include "common/c_internal.h"
+#include "server.h"
+#include "log.h"
+#include "tool.h"
+#include "server.h"
+
+struct EnumString es_TileAnimationType[] =
+{
+ {TAT_NONE, "none"},
+ {TAT_VERTICAL_FRAMES, "vertical_frames"},
+ {0, NULL},
+};
+
+/******************************************************************************/
+ItemDefinition read_item_definition(lua_State* L,int index,
+ ItemDefinition default_def)
+{
+ if(index < 0)
+ index = lua_gettop(L) + 1 + index;
+
+ // Read the item definition
+ ItemDefinition def = default_def;
+
+ def.type = (ItemType)getenumfield(L, index, "type",
+ es_ItemType, ITEM_NONE);
+ getstringfield(L, index, "name", def.name);
+ getstringfield(L, index, "description", def.description);
+ getstringfield(L, index, "inventory_image", def.inventory_image);
+ getstringfield(L, index, "wield_image", def.wield_image);
+
+ lua_getfield(L, index, "wield_scale");
+ if(lua_istable(L, -1)){
+ def.wield_scale = check_v3f(L, -1);
+ }
+ lua_pop(L, 1);
+
+ def.stack_max = getintfield_default(L, index, "stack_max", def.stack_max);
+ if(def.stack_max == 0)
+ def.stack_max = 1;
+
+ lua_getfield(L, index, "on_use");
+ def.usable = lua_isfunction(L, -1);
+ lua_pop(L, 1);
+
+ getboolfield(L, index, "liquids_pointable", def.liquids_pointable);
+
+ warn_if_field_exists(L, index, "tool_digging_properties",
+ "deprecated: use tool_capabilities");
+
+ lua_getfield(L, index, "tool_capabilities");
+ if(lua_istable(L, -1)){
+ def.tool_capabilities = new ToolCapabilities(
+ read_tool_capabilities(L, -1));
+ }
+
+ // If name is "" (hand), ensure there are ToolCapabilities
+ // because it will be looked up there whenever any other item has
+ // no ToolCapabilities
+ if(def.name == "" && def.tool_capabilities == NULL){
+ def.tool_capabilities = new ToolCapabilities();
+ }
+
+ lua_getfield(L, index, "groups");
+ read_groups(L, -1, def.groups);
+ lua_pop(L, 1);
+
+ lua_getfield(L, index, "sounds");
+ if(lua_istable(L, -1)){
+ lua_getfield(L, -1, "place");
+ read_soundspec(L, -1, def.sound_place);
+ lua_pop(L, 1);
+ }
+ lua_pop(L, 1);
+
+ // Client shall immediately place this node when player places the item.
+ // Server will update the precise end result a moment later.
+ // "" = no prediction
+ getstringfield(L, index, "node_placement_prediction",
+ def.node_placement_prediction);
+
+ return def;
+}
+
+/******************************************************************************/
+void read_object_properties(lua_State *L, int index,
+ ObjectProperties *prop)
+{
+ if(index < 0)
+ index = lua_gettop(L) + 1 + index;
+ if(!lua_istable(L, index))
+ return;
+
+ prop->hp_max = getintfield_default(L, -1, "hp_max", 10);
+
+ getboolfield(L, -1, "physical", prop->physical);
+
+ getfloatfield(L, -1, "weight", prop->weight);
+
+ lua_getfield(L, -1, "collisionbox");
+ if(lua_istable(L, -1))
+ prop->collisionbox = read_aabb3f(L, -1, 1.0);
+ lua_pop(L, 1);
+
+ getstringfield(L, -1, "visual", prop->visual);
+
+ getstringfield(L, -1, "mesh", prop->mesh);
+
+ lua_getfield(L, -1, "visual_size");
+ if(lua_istable(L, -1))
+ prop->visual_size = read_v2f(L, -1);
+ lua_pop(L, 1);
+
+ lua_getfield(L, -1, "textures");
+ if(lua_istable(L, -1)){
+ prop->textures.clear();
+ int table = lua_gettop(L);
+ lua_pushnil(L);
+ while(lua_next(L, table) != 0){
+ // key at index -2 and value at index -1
+ if(lua_isstring(L, -1))
+ prop->textures.push_back(lua_tostring(L, -1));
+ else
+ prop->textures.push_back("");
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ }
+ lua_pop(L, 1);
+
+ lua_getfield(L, -1, "colors");
+ if(lua_istable(L, -1)){
+ prop->colors.clear();
+ int table = lua_gettop(L);
+ lua_pushnil(L);
+ while(lua_next(L, table) != 0){
+ // key at index -2 and value at index -1
+ if(lua_isstring(L, -1))
+ prop->colors.push_back(readARGB8(L, -1));
+ else
+ prop->colors.push_back(video::SColor(255, 255, 255, 255));
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ }
+ lua_pop(L, 1);
+
+ lua_getfield(L, -1, "spritediv");
+ if(lua_istable(L, -1))
+ prop->spritediv = read_v2s16(L, -1);
+ lua_pop(L, 1);
+
+ lua_getfield(L, -1, "initial_sprite_basepos");
+ if(lua_istable(L, -1))
+ prop->initial_sprite_basepos = read_v2s16(L, -1);
+ lua_pop(L, 1);
+
+ getboolfield(L, -1, "is_visible", prop->is_visible);
+ getboolfield(L, -1, "makes_footstep_sound", prop->makes_footstep_sound);
+ getfloatfield(L, -1, "automatic_rotate", prop->automatic_rotate);
+}
+
+/******************************************************************************/
+TileDef read_tiledef(lua_State *L, int index)
+{
+ if(index < 0)
+ index = lua_gettop(L) + 1 + index;
+
+ TileDef tiledef;
+
+ // key at index -2 and value at index
+ if(lua_isstring(L, index)){
+ // "default_lava.png"
+ tiledef.name = lua_tostring(L, index);
+ }
+ else if(lua_istable(L, index))
+ {
+ // {name="default_lava.png", animation={}}
+ tiledef.name = "";
+ getstringfield(L, index, "name", tiledef.name);
+ getstringfield(L, index, "image", tiledef.name); // MaterialSpec compat.
+ tiledef.backface_culling = getboolfield_default(
+ L, index, "backface_culling", true);
+ // animation = {}
+ lua_getfield(L, index, "animation");
+ if(lua_istable(L, -1)){
+ // {type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}
+ tiledef.animation.type = (TileAnimationType)
+ getenumfield(L, -1, "type", es_TileAnimationType,
+ TAT_NONE);
+ tiledef.animation.aspect_w =
+ getintfield_default(L, -1, "aspect_w", 16);
+ tiledef.animation.aspect_h =
+ getintfield_default(L, -1, "aspect_h", 16);
+ tiledef.animation.length =
+ getfloatfield_default(L, -1, "length", 1.0);
+ }
+ lua_pop(L, 1);
+ }
+
+ return tiledef;
+}
+
+/******************************************************************************/
+ContentFeatures read_content_features(lua_State *L, int index)
+{
+ if(index < 0)
+ index = lua_gettop(L) + 1 + index;
+
+ ContentFeatures f;
+
+ /* Cache existence of some callbacks */
+ lua_getfield(L, index, "on_construct");
+ if(!lua_isnil(L, -1)) f.has_on_construct = true;
+ lua_pop(L, 1);
+ lua_getfield(L, index, "on_destruct");
+ if(!lua_isnil(L, -1)) f.has_on_destruct = true;
+ lua_pop(L, 1);
+ lua_getfield(L, index, "after_destruct");
+ if(!lua_isnil(L, -1)) f.has_after_destruct = true;
+ lua_pop(L, 1);
+
+ lua_getfield(L, index, "on_rightclick");
+ f.rightclickable = lua_isfunction(L, -1);
+ lua_pop(L, 1);
+
+ /* Name */
+ getstringfield(L, index, "name", f.name);
+
+ /* Groups */
+ lua_getfield(L, index, "groups");
+ read_groups(L, -1, f.groups);
+ lua_pop(L, 1);
+
+ /* Visual definition */
+
+ f.drawtype = (NodeDrawType)getenumfield(L, index, "drawtype",
+ ScriptApiNode::es_DrawType,NDT_NORMAL);
+ getfloatfield(L, index, "visual_scale", f.visual_scale);
+
+ // tiles = {}
+ lua_getfield(L, index, "tiles");
+ // If nil, try the deprecated name "tile_images" instead
+ if(lua_isnil(L, -1)){
+ lua_pop(L, 1);
+ warn_if_field_exists(L, index, "tile_images",
+ "Deprecated; new name is \"tiles\".");
+ lua_getfield(L, index, "tile_images");
+ }
+ if(lua_istable(L, -1)){
+ int table = lua_gettop(L);
+ lua_pushnil(L);
+ int i = 0;
+ while(lua_next(L, table) != 0){
+ // Read tiledef from value
+ f.tiledef[i] = read_tiledef(L, -1);
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ i++;
+ if(i==6){
+ lua_pop(L, 1);
+ break;
+ }
+ }
+ // Copy last value to all remaining textures
+ if(i >= 1){
+ TileDef lasttile = f.tiledef[i-1];
+ while(i < 6){
+ f.tiledef[i] = lasttile;
+ i++;
+ }
+ }
+ }
+ lua_pop(L, 1);
+
+ // special_tiles = {}
+ lua_getfield(L, index, "special_tiles");
+ // If nil, try the deprecated name "special_materials" instead
+ if(lua_isnil(L, -1)){
+ lua_pop(L, 1);
+ warn_if_field_exists(L, index, "special_materials",
+ "Deprecated; new name is \"special_tiles\".");
+ lua_getfield(L, index, "special_materials");
+ }
+ if(lua_istable(L, -1)){
+ int table = lua_gettop(L);
+ lua_pushnil(L);
+ int i = 0;
+ while(lua_next(L, table) != 0){
+ // Read tiledef from value
+ f.tiledef_special[i] = read_tiledef(L, -1);
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ i++;
+ if(i==6){
+ lua_pop(L, 1);
+ break;
+ }
+ }
+ }
+ lua_pop(L, 1);
+
+ f.alpha = getintfield_default(L, index, "alpha", 255);
+
+ bool usealpha = getboolfield_default(L, index,
+ "use_texture_alpha", false);
+ if (usealpha)
+ f.alpha = 0;
+
+ /* Other stuff */
+
+ lua_getfield(L, index, "post_effect_color");
+ if(!lua_isnil(L, -1))
+ f.post_effect_color = readARGB8(L, -1);
+ lua_pop(L, 1);
+
+ f.param_type = (ContentParamType)getenumfield(L, index, "paramtype",
+ ScriptApiNode::es_ContentParamType, CPT_NONE);
+ f.param_type_2 = (ContentParamType2)getenumfield(L, index, "paramtype2",
+ ScriptApiNode::es_ContentParamType2, CPT2_NONE);
+
+ // Warn about some deprecated fields
+ warn_if_field_exists(L, index, "wall_mounted",
+ "deprecated: use paramtype2 = 'wallmounted'");
+ warn_if_field_exists(L, index, "light_propagates",
+ "deprecated: determined from paramtype");
+ warn_if_field_exists(L, index, "dug_item",
+ "deprecated: use 'drop' field");
+ warn_if_field_exists(L, index, "extra_dug_item",
+ "deprecated: use 'drop' field");
+ warn_if_field_exists(L, index, "extra_dug_item_rarity",
+ "deprecated: use 'drop' field");
+ warn_if_field_exists(L, index, "metadata_name",
+ "deprecated: use on_add and metadata callbacks");
+
+ // True for all ground-like things like stone and mud, false for eg. trees
+ getboolfield(L, index, "is_ground_content", f.is_ground_content);
+ f.light_propagates = (f.param_type == CPT_LIGHT);
+ getboolfield(L, index, "sunlight_propagates", f.sunlight_propagates);
+ // This is used for collision detection.
+ // Also for general solidness queries.
+ getboolfield(L, index, "walkable", f.walkable);
+ // Player can point to these
+ getboolfield(L, index, "pointable", f.pointable);
+ // Player can dig these
+ getboolfield(L, index, "diggable", f.diggable);
+ // Player can climb these
+ getboolfield(L, index, "climbable", f.climbable);
+ // Player can build on these
+ getboolfield(L, index, "buildable_to", f.buildable_to);
+ // Whether the node is non-liquid, source liquid or flowing liquid
+ f.liquid_type = (LiquidType)getenumfield(L, index, "liquidtype",
+ ScriptApiNode::es_LiquidType, LIQUID_NONE);
+ // If the content is liquid, this is the flowing version of the liquid.
+ getstringfield(L, index, "liquid_alternative_flowing",
+ f.liquid_alternative_flowing);
+ // If the content is liquid, this is the source version of the liquid.
+ getstringfield(L, index, "liquid_alternative_source",
+ f.liquid_alternative_source);
+ // Viscosity for fluid flow, ranging from 1 to 7, with
+ // 1 giving almost instantaneous propagation and 7 being
+ // the slowest possible
+ f.liquid_viscosity = getintfield_default(L, index,
+ "liquid_viscosity", f.liquid_viscosity);
+ getboolfield(L, index, "liquid_renewable", f.liquid_renewable);
+ // Amount of light the node emits
+ f.light_source = getintfield_default(L, index,
+ "light_source", f.light_source);
+ f.damage_per_second = getintfield_default(L, index,
+ "damage_per_second", f.damage_per_second);
+
+ lua_getfield(L, index, "node_box");
+ if(lua_istable(L, -1))
+ f.node_box = read_nodebox(L, -1);
+ lua_pop(L, 1);
+
+ lua_getfield(L, index, "selection_box");
+ if(lua_istable(L, -1))
+ f.selection_box = read_nodebox(L, -1);
+ lua_pop(L, 1);
+
+ // Set to true if paramtype used to be 'facedir_simple'
+ getboolfield(L, index, "legacy_facedir_simple", f.legacy_facedir_simple);
+ // Set to true if wall_mounted used to be set to true
+ getboolfield(L, index, "legacy_wallmounted", f.legacy_wallmounted);
+
+ // Sound table
+ lua_getfield(L, index, "sounds");
+ if(lua_istable(L, -1)){
+ lua_getfield(L, -1, "footstep");
+ read_soundspec(L, -1, f.sound_footstep);
+ lua_pop(L, 1);
+ lua_getfield(L, -1, "dig");
+ read_soundspec(L, -1, f.sound_dig);
+ lua_pop(L, 1);
+ lua_getfield(L, -1, "dug");
+ read_soundspec(L, -1, f.sound_dug);
+ lua_pop(L, 1);
+ }
+ lua_pop(L, 1);
+
+ return f;
+}
+
+/******************************************************************************/
+void read_server_sound_params(lua_State *L, int index,
+ ServerSoundParams ¶ms)
+{
+ if(index < 0)
+ index = lua_gettop(L) + 1 + index;
+ // Clear
+ params = ServerSoundParams();
+ if(lua_istable(L, index)){
+ getfloatfield(L, index, "gain", params.gain);
+ getstringfield(L, index, "to_player", params.to_player);
+ lua_getfield(L, index, "pos");
+ if(!lua_isnil(L, -1)){
+ v3f p = read_v3f(L, -1)*BS;
+ params.pos = p;
+ params.type = ServerSoundParams::SSP_POSITIONAL;
+ }
+ lua_pop(L, 1);
+ lua_getfield(L, index, "object");
+ if(!lua_isnil(L, -1)){
+ ObjectRef *ref = ObjectRef::checkobject(L, -1);
+ ServerActiveObject *sao = ObjectRef::getobject(ref);
+ if(sao){
+ params.object = sao->getId();
+ params.type = ServerSoundParams::SSP_OBJECT;
+ }
+ }
+ lua_pop(L, 1);
+ params.max_hear_distance = BS*getfloatfield_default(L, index,
+ "max_hear_distance", params.max_hear_distance/BS);
+ getboolfield(L, index, "loop", params.loop);
+ }
+}
+
+/******************************************************************************/
+void read_soundspec(lua_State *L, int index, SimpleSoundSpec &spec)
+{
+ if(index < 0)
+ index = lua_gettop(L) + 1 + index;
+ if(lua_isnil(L, index)){
+ } else if(lua_istable(L, index)){
+ getstringfield(L, index, "name", spec.name);
+ getfloatfield(L, index, "gain", spec.gain);
+ } else if(lua_isstring(L, index)){
+ spec.name = lua_tostring(L, index);
+ }
+}
+
+/******************************************************************************/
+NodeBox read_nodebox(lua_State *L, int index)
+{
+ NodeBox nodebox;
+ if(lua_istable(L, -1)){
+ nodebox.type = (NodeBoxType)getenumfield(L, index, "type",
+ ScriptApiNode::es_NodeBoxType, NODEBOX_REGULAR);
+
+ lua_getfield(L, index, "fixed");
+ if(lua_istable(L, -1))
+ nodebox.fixed = read_aabb3f_vector(L, -1, BS);
+ lua_pop(L, 1);
+
+ lua_getfield(L, index, "wall_top");
+ if(lua_istable(L, -1))
+ nodebox.wall_top = read_aabb3f(L, -1, BS);
+ lua_pop(L, 1);
+
+ lua_getfield(L, index, "wall_bottom");
+ if(lua_istable(L, -1))
+ nodebox.wall_bottom = read_aabb3f(L, -1, BS);
+ lua_pop(L, 1);
+
+ lua_getfield(L, index, "wall_side");
+ if(lua_istable(L, -1))
+ nodebox.wall_side = read_aabb3f(L, -1, BS);
+ lua_pop(L, 1);
+ }
+ return nodebox;
+}
+
+/******************************************************************************/
+MapNode readnode(lua_State *L, int index, INodeDefManager *ndef)
+{
+ lua_getfield(L, index, "name");
+ const char *name = luaL_checkstring(L, -1);
+ lua_pop(L, 1);
+ u8 param1;
+ lua_getfield(L, index, "param1");
+ if(lua_isnil(L, -1))
+ param1 = 0;
+ else
+ param1 = lua_tonumber(L, -1);
+ lua_pop(L, 1);
+ u8 param2;
+ lua_getfield(L, index, "param2");
+ if(lua_isnil(L, -1))
+ param2 = 0;
+ else
+ param2 = lua_tonumber(L, -1);
+ lua_pop(L, 1);
+ return MapNode(ndef, name, param1, param2);
+}
+
+/******************************************************************************/
+void pushnode(lua_State *L, const MapNode &n, INodeDefManager *ndef)
+{
+ lua_newtable(L);
+ lua_pushstring(L, ndef->get(n).name.c_str());
+ lua_setfield(L, -2, "name");
+ lua_pushnumber(L, n.getParam1());
+ lua_setfield(L, -2, "param1");
+ lua_pushnumber(L, n.getParam2());
+ lua_setfield(L, -2, "param2");
+}
+
+/******************************************************************************/
+void warn_if_field_exists(lua_State *L, int table,
+ const char *fieldname, const std::string &message)
+{
+ lua_getfield(L, table, fieldname);
+ if(!lua_isnil(L, -1)){
+//TODO find way to access backtrace fct from here
+ // infostream<<script_get_backtrace(L)<<std::endl;
+ infostream<<"WARNING: field \""<<fieldname<<"\": "
+ <<message<<std::endl;
+ }
+ lua_pop(L, 1);
+}
+
+/******************************************************************************/
+int getenumfield(lua_State *L, int table,
+ const char *fieldname, const EnumString *spec, int default_)
+{
+ int result = default_;
+ string_to_enum(spec, result,
+ getstringfield_default(L, table, fieldname, ""));
+ return result;
+}
+
+/******************************************************************************/
+bool string_to_enum(const EnumString *spec, int &result,
+ const std::string &str)
+{
+ const EnumString *esp = spec;
+ while(esp->str){
+ if(str == std::string(esp->str)){
+ result = esp->num;
+ return true;
+ }
+ esp++;
+ }
+ return false;
+}
+
+/******************************************************************************/
+ItemStack read_item(lua_State* L, int index,Server* srv)
+{
+ if(index < 0)
+ index = lua_gettop(L) + 1 + index;
+
+ if(lua_isnil(L, index))
+ {
+ return ItemStack();
+ }
+ else if(lua_isuserdata(L, index))
+ {
+ // Convert from LuaItemStack
+ LuaItemStack *o = LuaItemStack::checkobject(L, index);
+ return o->getItem();
+ }
+ else if(lua_isstring(L, index))
+ {
+ // Convert from itemstring
+ std::string itemstring = lua_tostring(L, index);
+ IItemDefManager *idef = srv->idef();
+ try
+ {
+ ItemStack item;
+ item.deSerialize(itemstring, idef);
+ return item;
+ }
+ catch(SerializationError &e)
+ {
+ infostream<<"WARNING: unable to create item from itemstring"
+ <<": "<<itemstring<<std::endl;
+ return ItemStack();
+ }
+ }
+ else if(lua_istable(L, index))
+ {
+ // Convert from table
+ IItemDefManager *idef = srv->idef();
+ std::string name = getstringfield_default(L, index, "name", "");
+ int count = getintfield_default(L, index, "count", 1);
+ int wear = getintfield_default(L, index, "wear", 0);
+ std::string metadata = getstringfield_default(L, index, "metadata", "");
+ return ItemStack(name, count, wear, metadata, idef);
+ }
+ else
+ {
+ throw LuaError(L, "Expecting itemstack, itemstring, table or nil");
+ }
+}
+
+/******************************************************************************/
+void push_tool_capabilities(lua_State *L,
+ const ToolCapabilities &toolcap)
+{
+ lua_newtable(L);
+ setfloatfield(L, -1, "full_punch_interval", toolcap.full_punch_interval);
+ setintfield(L, -1, "max_drop_level", toolcap.max_drop_level);
+ // Create groupcaps table
+ lua_newtable(L);
+ // For each groupcap
+ for(std::map<std::string, ToolGroupCap>::const_iterator
+ i = toolcap.groupcaps.begin(); i != toolcap.groupcaps.end(); i++){
+ // Create groupcap table
+ lua_newtable(L);
+ const std::string &name = i->first;
+ const ToolGroupCap &groupcap = i->second;
+ // Create subtable "times"
+ lua_newtable(L);
+ for(std::map<int, float>::const_iterator
+ i = groupcap.times.begin(); i != groupcap.times.end(); i++){
+ int rating = i->first;
+ float time = i->second;
+ lua_pushinteger(L, rating);
+ lua_pushnumber(L, time);
+ lua_settable(L, -3);
+ }
+ // Set subtable "times"
+ lua_setfield(L, -2, "times");
+ // Set simple parameters
+ setintfield(L, -1, "maxlevel", groupcap.maxlevel);
+ setintfield(L, -1, "uses", groupcap.uses);
+ // Insert groupcap table into groupcaps table
+ lua_setfield(L, -2, name.c_str());
+ }
+ // Set groupcaps table
+ lua_setfield(L, -2, "groupcaps");
+ //Create damage_groups table
+ lua_newtable(L);
+ // For each damage group
+ for(std::map<std::string, s16>::const_iterator
+ i = toolcap.damageGroups.begin(); i != toolcap.damageGroups.end(); i++){
+ // Create damage group table
+ lua_pushinteger(L, i->second);
+ lua_setfield(L, -2, i->first.c_str());
+ }
+ lua_setfield(L, -2, "damage_groups");
+}
+
+/******************************************************************************/
+void push_inventory_list(Inventory *inv, const char *name,
+ lua_State *L)
+{
+ InventoryList *invlist = inv->getList(name);
+ if(invlist == NULL){
+ lua_pushnil(L);
+ return;
+ }
+ std::vector<ItemStack> items;
+ for(u32 i=0; i<invlist->getSize(); i++)
+ items.push_back(invlist->getItem(i));
+ push_items(L, items);
+}
+
+/******************************************************************************/
+void read_inventory_list(Inventory *inv, const char *name,
+ lua_State *L, int tableindex, Server* srv,int forcesize)
+{
+ if(tableindex < 0)
+ tableindex = lua_gettop(L) + 1 + tableindex;
+ // If nil, delete list
+ if(lua_isnil(L, tableindex)){
+ inv->deleteList(name);
+ return;
+ }
+ // Otherwise set list
+ std::vector<ItemStack> items = read_items(L, tableindex,srv);
+ int listsize = (forcesize != -1) ? forcesize : items.size();
+ InventoryList *invlist = inv->addList(name, listsize);
+ int index = 0;
+ for(std::vector<ItemStack>::const_iterator
+ i = items.begin(); i != items.end(); i++){
+ if(forcesize != -1 && index == forcesize)
+ break;
+ invlist->changeItem(index, *i);
+ index++;
+ }
+ while(forcesize != -1 && index < forcesize){
+ invlist->deleteItem(index);
+ index++;
+ }
+}
+
+/******************************************************************************/
+ToolCapabilities read_tool_capabilities(
+ lua_State *L, int table)
+{
+ ToolCapabilities toolcap;
+ getfloatfield(L, table, "full_punch_interval", toolcap.full_punch_interval);
+ getintfield(L, table, "max_drop_level", toolcap.max_drop_level);
+ lua_getfield(L, table, "groupcaps");
+ if(lua_istable(L, -1)){
+ int table_groupcaps = lua_gettop(L);
+ lua_pushnil(L);
+ while(lua_next(L, table_groupcaps) != 0){
+ // key at index -2 and value at index -1
+ std::string groupname = luaL_checkstring(L, -2);
+ if(lua_istable(L, -1)){
+ int table_groupcap = lua_gettop(L);
+ // This will be created
+ ToolGroupCap groupcap;
+ // Read simple parameters
+ getintfield(L, table_groupcap, "maxlevel", groupcap.maxlevel);
+ getintfield(L, table_groupcap, "uses", groupcap.uses);
+ // DEPRECATED: maxwear
+ float maxwear = 0;
+ if(getfloatfield(L, table_groupcap, "maxwear", maxwear)){
+ if(maxwear != 0)
+ groupcap.uses = 1.0/maxwear;
+ else
+ groupcap.uses = 0;
+ infostream<<script_get_backtrace(L)<<std::endl;
+ infostream<<"WARNING: field \"maxwear\" is deprecated; "
+ <<"should replace with uses=1/maxwear"<<std::endl;
+ }
+ // Read "times" table
+ lua_getfield(L, table_groupcap, "times");
+ if(lua_istable(L, -1)){
+ int table_times = lua_gettop(L);
+ lua_pushnil(L);
+ while(lua_next(L, table_times) != 0){
+ // key at index -2 and value at index -1
+ int rating = luaL_checkinteger(L, -2);
+ float time = luaL_checknumber(L, -1);
+ groupcap.times[rating] = time;
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ }
+ lua_pop(L, 1);
+ // Insert groupcap into toolcap
+ toolcap.groupcaps[groupname] = groupcap;
+ }
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ }
+ lua_pop(L, 1);
+
+ lua_getfield(L, table, "damage_groups");
+ if(lua_istable(L, -1)){
+ int table_damage_groups = lua_gettop(L);
+ lua_pushnil(L);
+ while(lua_next(L, table_damage_groups) != 0){
+ // key at index -2 and value at index -1
+ std::string groupname = luaL_checkstring(L, -2);
+ u16 value = luaL_checkinteger(L, -1);
+ toolcap.damageGroups[groupname] = value;
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ }
+ lua_pop(L, 1);
+ return toolcap;
+}
+
+/******************************************************************************/
+void push_dig_params(lua_State *L,const DigParams ¶ms)
+{
+ lua_newtable(L);
+ setboolfield(L, -1, "diggable", params.diggable);
+ setfloatfield(L, -1, "time", params.time);
+ setintfield(L, -1, "wear", params.wear);
+}
+
+/******************************************************************************/
+void push_hit_params(lua_State *L,const HitParams ¶ms)
+{
+ lua_newtable(L);
+ setintfield(L, -1, "hp", params.hp);
+ setintfield(L, -1, "wear", params.wear);
+}
+
+/******************************************************************************/
+u32 getflagsfield(lua_State *L, int table,
+ const char *fieldname, FlagDesc *flagdesc) {
+ std::string flagstring;
+
+ flagstring = getstringfield_default(L, table, fieldname, "");
+ return readFlagString(flagstring, flagdesc);
+}
+
+/******************************************************************************/
+/* Lua Stored data! */
+/******************************************************************************/
+
+/******************************************************************************/
+void read_groups(lua_State *L, int index,
+ std::map<std::string, int> &result)
+{
+ if (!lua_istable(L,index))
+ return;
+ result.clear();
+ lua_pushnil(L);
+ if(index < 0)
+ index -= 1;
+ while(lua_next(L, index) != 0){
+ // key at index -2 and value at index -1
+ std::string name = luaL_checkstring(L, -2);
+ int rating = luaL_checkinteger(L, -1);
+ result[name] = rating;
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+}
+
+/******************************************************************************/
+void push_items(lua_State *L, const std::vector<ItemStack> &items)
+{
+ // Get the table insert function
+ lua_getglobal(L, "table");
+ lua_getfield(L, -1, "insert");
+ int table_insert = lua_gettop(L);
+ // Create and fill table
+ lua_newtable(L);
+ int table = lua_gettop(L);
+ for(u32 i=0; i<items.size(); i++){
+ ItemStack item = items[i];
+ lua_pushvalue(L, table_insert);
+ lua_pushvalue(L, table);
+ LuaItemStack::create(L, item);
+ if(lua_pcall(L, 2, 0, 0))
+ script_error(L, "error: %s", lua_tostring(L, -1));
+ }
+ lua_remove(L, -2); // Remove table
+ lua_remove(L, -2); // Remove insert
+}
+
+/******************************************************************************/
+std::vector<ItemStack> read_items(lua_State *L, int index,Server* srv)
+{
+ if(index < 0)
+ index = lua_gettop(L) + 1 + index;
+
+ std::vector<ItemStack> items;
+ luaL_checktype(L, index, LUA_TTABLE);
+ lua_pushnil(L);
+ while(lua_next(L, index) != 0){
+ // key at index -2 and value at index -1
+ items.push_back(read_item(L, -1, srv));
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ return items;
+}
+
+/******************************************************************************/
+void luaentity_get(lua_State *L, u16 id)
+{
+ // Get minetest.luaentities[i]
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "luaentities");
+ luaL_checktype(L, -1, LUA_TTABLE);
+ lua_pushnumber(L, id);
+ lua_gettable(L, -2);
+ lua_remove(L, -2); // luaentities
+ lua_remove(L, -2); // minetest
+}
+
+/******************************************************************************/
+NoiseParams *read_noiseparams(lua_State *L, int index)
+{
+ if (index < 0)
+ index = lua_gettop(L) + 1 + index;
+
+ if (!lua_istable(L, index))
+ return NULL;
+
+ NoiseParams *np = new NoiseParams;
+
+ np->offset = getfloatfield_default(L, index, "offset", 0.0);
+ np->scale = getfloatfield_default(L, index, "scale", 0.0);
+ lua_getfield(L, index, "spread");
+ np->spread = read_v3f(L, -1);
+ lua_pop(L, 1);
+ np->seed = getintfield_default(L, index, "seed", 0);
+ np->octaves = getintfield_default(L, index, "octaves", 0);
+ np->persist = getfloatfield_default(L, index, "persist", 0.0);
+
+ return np;
+}
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
new file mode 100644
index 0000000000000000000000000000000000000000..251a72e27b3b0f62fe9585c5dc08649180ee7ce8
--- /dev/null
+++ b/src/script/common/c_content.h
@@ -0,0 +1,146 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+
+/******************************************************************************/
+/******************************************************************************/
+/* WARNING!!!! do NOT add this header in any include file or any code file */
+/* not being a script/modapi file!!!!!!!! */
+/******************************************************************************/
+/******************************************************************************/
+
+#ifndef C_CONTENT_H_
+#define C_CONTENT_H_
+
+extern "C" {
+#include <lua.h>
+}
+
+#include <iostream>
+#include <map>
+#include <vector>
+
+#include "irrlichttypes_bloated.h"
+#include "util/string.h"
+
+class MapNode;
+class INodeDefManager;
+class PointedThing;
+class ItemStack;
+class ItemDefinition;
+class ToolCapabilities;
+class ObjectProperties;
+class SimpleSoundSpec;
+class ServerSoundParams;
+class Inventory;
+class NodeBox;
+class ContentFeatures;
+class TileDef;
+class Server;
+struct DigParams;
+struct HitParams;
+struct EnumString;
+struct NoiseParams;
+
+
+ContentFeatures read_content_features (lua_State *L, int index);
+TileDef read_tiledef (lua_State *L, int index);
+void read_soundspec (lua_State *L, int index,
+ SimpleSoundSpec &spec);
+NodeBox read_nodebox (lua_State *L, int index);
+
+void read_server_sound_params (lua_State *L, int index,
+ ServerSoundParams ¶ms);
+
+void push_dig_params (lua_State *L,const DigParams ¶ms);
+void push_hit_params (lua_State *L,const HitParams ¶ms);
+
+ItemStack read_item (lua_State *L, int index, Server* srv);
+
+
+ToolCapabilities read_tool_capabilities (lua_State *L,
+ int table);
+void push_tool_capabilities (lua_State *L,
+ const ToolCapabilities &prop);
+
+ItemDefinition read_item_definition (lua_State *L,
+ int index,
+ ItemDefinition default_def);
+void read_object_properties (lua_State *L,
+ int index,
+ ObjectProperties *prop);
+
+//TODO fix parameter oreder!
+void push_inventory_list (Inventory *inv,
+ const char *name,
+ lua_State *L);
+void read_inventory_list (Inventory *inv,
+ const char *name,
+ lua_State *L,
+ int tableindex,
+ Server* srv,
+ int forcesize=-1);
+
+MapNode readnode (lua_State *L,
+ int index,
+ INodeDefManager *ndef);
+void pushnode (lua_State *L,
+ const MapNode &n,
+ INodeDefManager *ndef);
+
+NodeBox read_nodebox (lua_State *L, int index);
+
+void read_groups (lua_State *L,
+ int index,
+ std::map<std::string, int> &result);
+
+//TODO rename to "read_enum_field"
+int getenumfield (lua_State *L,
+ int table,
+ const char *fieldname,
+ const EnumString *spec,
+ int default_);
+
+u32 getflagsfield (lua_State *L, int table,
+ const char *fieldname,
+ FlagDesc *flagdesc);
+
+void push_items (lua_State *L,
+ const std::vector<ItemStack> &items);
+
+std::vector<ItemStack> read_items (lua_State *L,
+ int index,
+ Server* srv);
+
+void read_soundspec (lua_State *L,
+ int index,
+ SimpleSoundSpec &spec);
+
+
+bool string_to_enum (const EnumString *spec,
+ int &result,
+ const std::string &str);
+
+NoiseParams* read_noiseparams (lua_State *L, int index);
+
+void luaentity_get (lua_State *L,u16 id);
+
+extern struct EnumString es_TileAnimationType[];
+
+#endif /* C_CONTENT_H_ */
diff --git a/src/scriptapi_types.cpp b/src/script/common/c_converter.cpp
similarity index 86%
rename from src/scriptapi_types.cpp
rename to src/script/common/c_converter.cpp
index f304511080c57c2fda5b7e504a84cf15da265bf0..65c3654ae29154a20a209ecde84ec06691022452 100644
--- a/src/scriptapi_types.cpp
+++ b/src/script/common/c_converter.cpp
@@ -17,19 +17,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "scriptapi.h"
-#include "scriptapi_types.h"
-
extern "C" {
-#include <lauxlib.h>
+#include "lua.h"
+#include "lauxlib.h"
}
#include "util/numeric.h"
-#include "nodedef.h"
-
-/*
- C struct <-> Lua table converter functions
-*/
+#include "common/c_converter.h"
+#include "constants.h"
void push_v3f(lua_State *L, v3f p)
{
@@ -147,7 +142,7 @@ v3s16 check_v3s16(lua_State *L, int index)
video::SColor readARGB8(lua_State *L, int index)
{
- video::SColor color;
+ video::SColor color(0);
luaL_checktype(L, index, LUA_TTABLE);
lua_getfield(L, index, "a");
if(lua_isnumber(L, -1))
@@ -345,44 +340,4 @@ void setboolfield(lua_State *L, int table,
lua_setfield(L, table, fieldname);
}
-u32 getflagsfield(lua_State *L, int table,
- const char *fieldname, FlagDesc *flagdesc) {
- std::string flagstring;
-
- flagstring = getstringfield_default(L, table, fieldname, "");
- return readFlagString(flagstring, flagdesc);
-}
-
-/* minetest specific types */
-MapNode readnode(lua_State *L, int index, INodeDefManager *ndef)
-{
- lua_getfield(L, index, "name");
- const char *name = luaL_checkstring(L, -1);
- lua_pop(L, 1);
- u8 param1;
- lua_getfield(L, index, "param1");
- if(lua_isnil(L, -1))
- param1 = 0;
- else
- param1 = lua_tonumber(L, -1);
- lua_pop(L, 1);
- u8 param2;
- lua_getfield(L, index, "param2");
- if(lua_isnil(L, -1))
- param2 = 0;
- else
- param2 = lua_tonumber(L, -1);
- lua_pop(L, 1);
- return MapNode(ndef, name, param1, param2);
-}
-void pushnode(lua_State *L, const MapNode &n, INodeDefManager *ndef)
-{
- lua_newtable(L);
- lua_pushstring(L, ndef->get(n).name.c_str());
- lua_setfield(L, -2, "name");
- lua_pushnumber(L, n.getParam1());
- lua_setfield(L, -2, "param1");
- lua_pushnumber(L, n.getParam2());
- lua_setfield(L, -2, "param2");
-}
diff --git a/src/scriptapi_types.h b/src/script/common/c_converter.h
similarity index 59%
rename from src/scriptapi_types.h
rename to src/script/common/c_converter.h
index dd0b125e6920ad18a3af4064be1fbffd77751e88..ab0083124da31bd629e3b2c465d91a3cf40b3bd9 100644
--- a/src/scriptapi_types.h
+++ b/src/script/common/c_converter.h
@@ -1,5 +1,5 @@
/*
-Minetest-c55
+Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
@@ -17,16 +17,21 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LUA_TYPES_H_
-#define LUA_TYPES_H_
-#include <iostream>
-#include <map>
+/******************************************************************************/
+/******************************************************************************/
+/* WARNING!!!! do NOT add this header in any include file or any code file */
+/* not being a script/modapi file!!!!!!!! */
+/******************************************************************************/
+/******************************************************************************/
+#ifndef C_CONVERTER_H_
+#define C_CONVERTER_H_
+
#include <vector>
+#include <map>
#include "irrlichttypes_bloated.h"
-#include "porting.h"
-#include "map.h"
+#include "common/c_types.h"
extern "C" {
#include <lua.h>
@@ -51,8 +56,6 @@ bool getboolfield(lua_State *L, int table,
const char *fieldname, bool &result);
bool getfloatfield(lua_State *L, int table,
const char *fieldname, float &result);
-u32 getflagsfield(lua_State *L, int table,
- const char *fieldname, FlagDesc *flagdesc);
std::string checkstringfield(lua_State *L, int table,
const char *fieldname);
@@ -65,26 +68,29 @@ void setboolfield(lua_State *L, int table,
const char *fieldname, bool value);
-v3f checkFloatPos (lua_State *L, int index);
-v3f check_v3f (lua_State *L, int index);
-v3s16 check_v3s16 (lua_State *L, int index);
+v3f checkFloatPos (lua_State *L, int index);
+v3f check_v3f (lua_State *L, int index);
+v3s16 check_v3s16 (lua_State *L, int index);
-v3f read_v3f (lua_State *L, int index);
-v2f read_v2f (lua_State *L, int index);
-v2s16 read_v2s16 (lua_State *L, int index);
-video::SColor readARGB8 (lua_State *L, int index);
-aabb3f read_aabb3f (lua_State *L, int index, f32 scale);
-v3s16 read_v3s16 (lua_State *L, int index);
+v3f read_v3f (lua_State *L, int index);
+v2f read_v2f (lua_State *L, int index);
+v2s16 read_v2s16 (lua_State *L, int index);
+video::SColor readARGB8 (lua_State *L, int index);
+aabb3f read_aabb3f (lua_State *L, int index, f32 scale);
+v3s16 read_v3s16 (lua_State *L, int index);
std::vector<aabb3f>
- read_aabb3f_vector (lua_State *L, int index, f32 scale);
+ read_aabb3f_vector (lua_State *L, int index, f32 scale);
+
+void push_v3s16 (lua_State *L, v3s16 p);
+void pushFloatPos (lua_State *L, v3f p);
+void push_v3f (lua_State *L, v3f p);
+void push_v2f (lua_State *L, v2f p);
-void push_v3s16 (lua_State *L, v3s16 p);
-void pushFloatPos (lua_State *L, v3f p);
-void push_v3f (lua_State *L, v3f p);
-void push_v2f (lua_State *L, v2f p);
-MapNode readnode(lua_State *L, int index, INodeDefManager *ndef);
-void pushnode(lua_State *L, const MapNode &n, INodeDefManager *ndef);
+void warn_if_field_exists (lua_State *L,
+ int table,
+ const char *fieldname,
+ const std::string &message);
-#endif /* LUA_TYPES_H_ */
+#endif /* C_CONVERTER_H_ */
diff --git a/src/script/common/c_internal.cpp b/src/script/common/c_internal.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..42e9fb3e1e66a02943fd67f3cc4b670148478b45
--- /dev/null
+++ b/src/script/common/c_internal.cpp
@@ -0,0 +1,65 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "common/c_internal.h"
+#include "server.h"
+#include "cpp_api/scriptapi.h"
+
+ScriptApi* get_scriptapi(lua_State *L)
+{
+ // Get server from registry
+ lua_getfield(L, LUA_REGISTRYINDEX, "scriptapi");
+ ScriptApi* sapi_ptr = (ScriptApi*) lua_touserdata(L, -1);
+ lua_pop(L, 1);
+ return sapi_ptr;
+}
+
+std::string script_get_backtrace(lua_State *L)
+{
+ std::string s;
+ lua_getfield(L, LUA_GLOBALSINDEX, "debug");
+ if(lua_istable(L, -1)){
+ lua_getfield(L, -1, "traceback");
+ if(lua_isfunction(L, -1)){
+ lua_call(L, 0, 1);
+ if(lua_isstring(L, -1)){
+ s += lua_tostring(L, -1);
+ }
+ lua_pop(L, 1);
+ }
+ else{
+ lua_pop(L, 1);
+ }
+ }
+ lua_pop(L, 1);
+ return s;
+}
+
+void script_error(lua_State* L,const char *fmt, ...)
+{
+ va_list argp;
+ va_start(argp, fmt);
+ char buf[10000];
+ vsnprintf(buf, 10000, fmt, argp);
+ va_end(argp);
+ //errorstream<<"SCRIPT ERROR: "<<buf;
+ throw LuaError(L, buf);
+}
+
+
diff --git a/src/script/common/c_internal.h b/src/script/common/c_internal.h
new file mode 100644
index 0000000000000000000000000000000000000000..dafde5843aa6a3e8670283faaf7acaf8cd033318
--- /dev/null
+++ b/src/script/common/c_internal.h
@@ -0,0 +1,60 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+/******************************************************************************/
+/******************************************************************************/
+/* WARNING!!!! do NOT add this header in any include file or any code file */
+/* not being a modapi file!!!!!!!! */
+/******************************************************************************/
+/******************************************************************************/
+
+#ifndef C_INTERNAL_H_
+#define C_INTERNAL_H_
+
+class Server;
+class ScriptApi;
+#include <iostream>
+
+#include "lua_api/l_base.h"
+
+extern "C" {
+#include "lua.h"
+}
+
+#define luamethod(class, name) {#name, class::l_##name}
+#define STACK_TO_SERVER(L) get_scriptapi(L)->getServer()
+#define API_FCT(name) registerFunction(L,#name,l_##name,top)
+
+#define REGISTER_LUA_REF(cln) \
+class ModApi_##cln : public ModApiBase { \
+ public: \
+ ModApi_##cln() : ModApiBase() {}; \
+ bool Initialize(lua_State* L, int top) { \
+ cln::Register(L); \
+ return true; \
+ }; \
+}; \
+ModApi_##cln macro_generated_prototype__##cln;
+
+
+ScriptApi* get_scriptapi (lua_State *L);
+std::string script_get_backtrace (lua_State *L);
+void script_error (lua_State *L, const char *fmt, ...);
+
+#endif /* C_INTERNAL_H_ */
diff --git a/src/scriptapi_content.h b/src/script/common/c_types.cpp
similarity index 60%
rename from src/scriptapi_content.h
rename to src/script/common/c_types.cpp
index 801f3856e4461415d2c6d5fdf63dfed58cc90e1c..ac724c42c84d9ce73758c7e5f07ea2e4f2030e39 100644
--- a/src/scriptapi_content.h
+++ b/src/script/common/c_types.cpp
@@ -1,5 +1,5 @@
/*
-Minetest-c55
+Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
@@ -17,21 +17,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LUA_CONTENT_H_
-#define LUA_CONTENT_H_
+#include <iostream>
-extern "C" {
-#include <lua.h>
-}
-
-#include "nodedef.h"
+#include "common/c_types.h"
+#include "common/c_internal.h"
+#include "itemdef.h"
-ContentFeatures read_content_features (lua_State *L, int index);
-TileDef read_tiledef (lua_State *L, int index);
-void read_soundspec (lua_State *L, int index,
- SimpleSoundSpec &spec);
-NodeBox read_nodebox (lua_State *L, int index);
-
-extern struct EnumString es_TileAnimationType[];
+LuaError::LuaError(lua_State *L, const std::string &s)
+{
+ m_s = "LuaError: ";
+ m_s += s + "\n";
+ m_s += script_get_backtrace(L);
+}
-#endif /* LUA_CONTENT_H_ */
+struct EnumString es_ItemType[] =
+ {
+ {ITEM_NONE, "none"},
+ {ITEM_NODE, "node"},
+ {ITEM_CRAFT, "craft"},
+ {ITEM_TOOL, "tool"},
+ {0, NULL},
+ };
diff --git a/src/script/common/c_types.h b/src/script/common/c_types.h
new file mode 100644
index 0000000000000000000000000000000000000000..7df869432553df24781e7e0476451c114a24ccc8
--- /dev/null
+++ b/src/script/common/c_types.h
@@ -0,0 +1,90 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef C_TYPES_H_
+#define C_TYPES_H_
+
+extern "C" {
+#include "lua.h"
+}
+
+#include <iostream>
+
+struct EnumString
+{
+ int num;
+ const char *str;
+};
+
+class StackUnroller
+{
+private:
+ lua_State *m_lua;
+ int m_original_top;
+public:
+ StackUnroller(lua_State *L):
+ m_lua(L),
+ m_original_top(-1)
+ {
+ m_original_top = lua_gettop(m_lua); // store stack height
+ }
+ ~StackUnroller()
+ {
+ lua_settop(m_lua, m_original_top); // restore stack height
+ }
+};
+
+class ModNameStorer
+{
+private:
+ lua_State *L;
+public:
+ ModNameStorer(lua_State *L_, const std::string modname):
+ L(L_)
+ {
+ // Store current modname in registry
+ lua_pushstring(L, modname.c_str());
+ lua_setfield(L, LUA_REGISTRYINDEX, "minetest_current_modname");
+ }
+ ~ModNameStorer()
+ {
+ // Clear current modname in registry
+ lua_pushnil(L);
+ lua_setfield(L, LUA_REGISTRYINDEX, "minetest_current_modname");
+ }
+};
+
+class LuaError : public std::exception
+{
+public:
+ LuaError(lua_State *L, const std::string &s);
+
+ virtual ~LuaError() throw()
+ {}
+ virtual const char * what() const throw()
+ {
+ return m_s.c_str();
+ }
+ std::string m_s;
+};
+
+
+extern EnumString es_ItemType[];
+
+#endif /* C_TYPES_H_ */
diff --git a/src/script/cpp_api/CMakeLists.txt b/src/script/cpp_api/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6f5b51a4952c8095870c4137da0d6364008785c8
--- /dev/null
+++ b/src/script/cpp_api/CMakeLists.txt
@@ -0,0 +1,11 @@
+set(SCRIPT_CPP_API_SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/s_base.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/s_entity.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/s_env.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/s_inventory.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/s_item.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/s_node.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/s_nodemeta.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/s_player.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/scriptapi.cpp
+ PARENT_SCOPE)
diff --git a/src/script/cpp_api/s_base.cpp b/src/script/cpp_api/s_base.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e2e586357e22d179919e8d17a741e49983f5e39f
--- /dev/null
+++ b/src/script/cpp_api/s_base.cpp
@@ -0,0 +1,264 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include <stdio.h>
+#include <cstdarg>
+
+extern "C" {
+#include "lua.h"
+#include "lauxlib.h"
+}
+
+#include "cpp_api/s_base.h"
+#include "lua_api/l_object.h"
+#include "serverobject.h"
+
+ScriptApiBase::ScriptApiBase() :
+ m_luastackmutex(),
+#ifdef LOCK_DEBUG
+ m_locked(false),
+#endif
+ m_luastack(0),
+ m_server(0),
+ m_environment(0)
+{
+
+}
+
+
+void ScriptApiBase::realityCheck()
+{
+ int top = lua_gettop(m_luastack);
+ if(top >= 30){
+ dstream<<"Stack is over 30:"<<std::endl;
+ stackDump(dstream);
+ scriptError("Stack is over 30 (reality check)");
+ }
+}
+
+void ScriptApiBase::scriptError(const char *fmt, ...)
+{
+ va_list argp;
+ va_start(argp, fmt);
+ char buf[10000];
+ vsnprintf(buf, 10000, fmt, argp);
+ va_end(argp);
+ //errorstream<<"SCRIPT ERROR: "<<buf;
+ throw LuaError(m_luastack, buf);
+}
+
+void ScriptApiBase::stackDump(std::ostream &o)
+{
+ int i;
+ int top = lua_gettop(m_luastack);
+ for (i = 1; i <= top; i++) { /* repeat for each level */
+ int t = lua_type(m_luastack, i);
+ switch (t) {
+
+ case LUA_TSTRING: /* strings */
+ o<<"\""<<lua_tostring(m_luastack, i)<<"\"";
+ break;
+
+ case LUA_TBOOLEAN: /* booleans */
+ o<<(lua_toboolean(m_luastack, i) ? "true" : "false");
+ break;
+
+ case LUA_TNUMBER: /* numbers */ {
+ char buf[10];
+ snprintf(buf, 10, "%g", lua_tonumber(m_luastack, i));
+ o<<buf;
+ break; }
+
+ default: /* other values */
+ o<<lua_typename(m_luastack, t);
+ break;
+
+ }
+ o<<" ";
+ }
+ o<<std::endl;
+}
+
+// Push the list of callbacks (a lua table).
+// Then push nargs arguments.
+// Then call this function, which
+// - runs the callbacks
+// - removes the table and arguments from the lua stack
+// - pushes the return value, computed depending on mode
+void ScriptApiBase::runCallbacks(int nargs,RunCallbacksMode mode)
+{
+ lua_State *L = getStack();
+
+ // Insert the return value into the lua stack, below the table
+ assert(lua_gettop(L) >= nargs + 1);
+ lua_pushnil(L);
+ lua_insert(L, -(nargs + 1) - 1);
+ // Stack now looks like this:
+ // ... <return value = nil> <table> <arg#1> <arg#2> ... <arg#n>
+
+ int rv = lua_gettop(L) - nargs - 1;
+ int table = rv + 1;
+ int arg = table + 1;
+
+ luaL_checktype(L, table, LUA_TTABLE);
+
+ // Foreach
+ lua_pushnil(L);
+ bool first_loop = true;
+ while(lua_next(L, table) != 0){
+ // key at index -2 and value at index -1
+ luaL_checktype(L, -1, LUA_TFUNCTION);
+ // Call function
+ for(int i = 0; i < nargs; i++)
+ lua_pushvalue(L, arg+i);
+ if(lua_pcall(L, nargs, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+
+ // Move return value to designated space in stack
+ // Or pop it
+ if(first_loop){
+ // Result of first callback is always moved
+ lua_replace(L, rv);
+ first_loop = false;
+ } else {
+ // Otherwise, what happens depends on the mode
+ if(mode == RUN_CALLBACKS_MODE_FIRST)
+ lua_pop(L, 1);
+ else if(mode == RUN_CALLBACKS_MODE_LAST)
+ lua_replace(L, rv);
+ else if(mode == RUN_CALLBACKS_MODE_AND ||
+ mode == RUN_CALLBACKS_MODE_AND_SC){
+ if((bool)lua_toboolean(L, rv) == true &&
+ (bool)lua_toboolean(L, -1) == false)
+ lua_replace(L, rv);
+ else
+ lua_pop(L, 1);
+ }
+ else if(mode == RUN_CALLBACKS_MODE_OR ||
+ mode == RUN_CALLBACKS_MODE_OR_SC){
+ if((bool)lua_toboolean(L, rv) == false &&
+ (bool)lua_toboolean(L, -1) == true)
+ lua_replace(L, rv);
+ else
+ lua_pop(L, 1);
+ }
+ else
+ assert(0);
+ }
+
+ // Handle short circuit modes
+ if(mode == RUN_CALLBACKS_MODE_AND_SC &&
+ (bool)lua_toboolean(L, rv) == false)
+ break;
+ else if(mode == RUN_CALLBACKS_MODE_OR_SC &&
+ (bool)lua_toboolean(L, rv) == true)
+ break;
+
+ // value removed, keep key for next iteration
+ }
+
+ // Remove stuff from stack, leaving only the return value
+ lua_settop(L, rv);
+
+ // Fix return value in case no callbacks were called
+ if(first_loop){
+ if(mode == RUN_CALLBACKS_MODE_AND ||
+ mode == RUN_CALLBACKS_MODE_AND_SC){
+ lua_pop(L, 1);
+ lua_pushboolean(L, true);
+ }
+ else if(mode == RUN_CALLBACKS_MODE_OR ||
+ mode == RUN_CALLBACKS_MODE_OR_SC){
+ lua_pop(L, 1);
+ lua_pushboolean(L, false);
+ }
+ }
+}
+
+void ScriptApiBase::addObjectReference(ServerActiveObject *cobj)
+{
+ SCRIPTAPI_PRECHECKHEADER
+ //infostream<<"scriptapi_add_object_reference: id="<<cobj->getId()<<std::endl;
+
+ // Create object on stack
+ ObjectRef::create(L, cobj); // Puts ObjectRef (as userdata) on stack
+ int object = lua_gettop(L);
+
+ // Get minetest.object_refs table
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "object_refs");
+ luaL_checktype(L, -1, LUA_TTABLE);
+ int objectstable = lua_gettop(L);
+
+ // object_refs[id] = object
+ lua_pushnumber(L, cobj->getId()); // Push id
+ lua_pushvalue(L, object); // Copy object to top of stack
+ lua_settable(L, objectstable);
+}
+
+void ScriptApiBase::removeObjectReference(ServerActiveObject *cobj)
+{
+ SCRIPTAPI_PRECHECKHEADER
+ //infostream<<"scriptapi_rm_object_reference: id="<<cobj->getId()<<std::endl;
+
+ // Get minetest.object_refs table
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "object_refs");
+ luaL_checktype(L, -1, LUA_TTABLE);
+ int objectstable = lua_gettop(L);
+
+ // Get object_refs[id]
+ lua_pushnumber(L, cobj->getId()); // Push id
+ lua_gettable(L, objectstable);
+ // Set object reference to NULL
+ ObjectRef::set_null(L);
+ lua_pop(L, 1); // pop object
+
+ // Set object_refs[id] = nil
+ lua_pushnumber(L, cobj->getId()); // Push id
+ lua_pushnil(L);
+ lua_settable(L, objectstable);
+}
+
+// Creates a new anonymous reference if cobj=NULL or id=0
+void ScriptApiBase::objectrefGetOrCreate(
+ ServerActiveObject *cobj)
+{
+ lua_State *L = getStack();
+
+ if(cobj == NULL || cobj->getId() == 0){
+ ObjectRef::create(L, cobj);
+ } else {
+ objectrefGet(cobj->getId());
+ }
+}
+
+void ScriptApiBase::objectrefGet(u16 id)
+{
+ lua_State *L = getStack();
+
+ // Get minetest.object_refs[i]
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "object_refs");
+ luaL_checktype(L, -1, LUA_TTABLE);
+ lua_pushnumber(L, id);
+ lua_gettable(L, -2);
+ lua_remove(L, -2); // object_refs
+ lua_remove(L, -2); // minetest
+}
diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
new file mode 100644
index 0000000000000000000000000000000000000000..da4e17d894723c4ac104b6e8900d9fefbd15cc55
--- /dev/null
+++ b/src/script/cpp_api/s_base.h
@@ -0,0 +1,167 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef S_BASE_H_
+#define S_BASE_H_
+
+#include <iostream>
+
+#include "irrlichttypes.h"
+#include "jmutex.h"
+#include "jmutexautolock.h"
+#include "common/c_types.h"
+#include "debug.h"
+
+#define LOCK_DEBUG
+
+class Server;
+class Environment;
+class ServerActiveObject;
+class LuaABM;
+class InvRef;
+class ModApiBase;
+class ModApiEnvMod;
+class ObjectRef;
+class NodeMetaRef;
+
+
+/* definitions */
+// What scriptapi_run_callbacks does with the return values of callbacks.
+// Regardless of the mode, if only one callback is defined,
+// its return value is the total return value.
+// Modes only affect the case where 0 or >= 2 callbacks are defined.
+enum RunCallbacksMode
+{
+ // Returns the return value of the first callback
+ // Returns nil if list of callbacks is empty
+ RUN_CALLBACKS_MODE_FIRST,
+ // Returns the return value of the last callback
+ // Returns nil if list of callbacks is empty
+ RUN_CALLBACKS_MODE_LAST,
+ // If any callback returns a false value, the first such is returned
+ // Otherwise, the first callback's return value (trueish) is returned
+ // Returns true if list of callbacks is empty
+ RUN_CALLBACKS_MODE_AND,
+ // Like above, but stops calling callbacks (short circuit)
+ // after seeing the first false value
+ RUN_CALLBACKS_MODE_AND_SC,
+ // If any callback returns a true value, the first such is returned
+ // Otherwise, the first callback's return value (falseish) is returned
+ // Returns false if list of callbacks is empty
+ RUN_CALLBACKS_MODE_OR,
+ // Like above, but stops calling callbacks (short circuit)
+ // after seeing the first true value
+ RUN_CALLBACKS_MODE_OR_SC,
+ // Note: "a true value" and "a false value" refer to values that
+ // are converted by lua_toboolean to true or false, respectively.
+};
+
+
+class ScriptApiBase {
+public:
+
+ /* object */
+ void addObjectReference(ServerActiveObject *cobj);
+ void removeObjectReference(ServerActiveObject *cobj);
+
+ ScriptApiBase();
+
+protected:
+ friend class LuaABM;
+ friend class InvRef;
+ friend class ObjectRef;
+ friend class NodeMetaRef;
+ friend class ModApiBase;
+ friend class ModApiEnvMod;
+
+
+ inline lua_State* getStack()
+ { return m_luastack; }
+
+ bool setStack(lua_State* stack) {
+ if (m_luastack == 0) {
+ m_luastack = stack;
+ return true;
+ }
+ return false;
+ }
+
+ void realityCheck();
+ void scriptError(const char *fmt, ...);
+ void stackDump(std::ostream &o);
+ void runCallbacks(int nargs,RunCallbacksMode mode);
+
+ inline Server* getServer() { return m_server; }
+ void setServer(Server* server) { m_server = server; }
+
+ Environment* getEnv() { return m_environment; }
+ void setEnv(Environment* env) { m_environment = env; }
+
+ void objectrefGetOrCreate(ServerActiveObject *cobj);
+ void objectrefGet(u16 id);
+
+ JMutex m_luastackmutex;
+#ifdef LOCK_DEBUG
+ bool m_locked;
+#endif
+private:
+ lua_State* m_luastack;
+
+ Server* m_server;
+ Environment* m_environment;
+
+
+};
+
+#ifdef LOCK_DEBUG
+class LockChecker {
+public:
+ LockChecker(bool* variable) {
+ assert(*variable == false);
+
+ m_variable = variable;
+ *m_variable = true;
+ }
+ ~LockChecker() {
+ *m_variable = false;
+ }
+private:
+bool* m_variable;
+};
+
+#define LOCK_CHECK LockChecker(&(this->m_locked))
+#else
+#define LOCK_CHECK while(0)
+#endif
+
+#define LUA_STACK_AUTOLOCK JMutexAutoLock(this->m_luastackmutex)
+
+#define SCRIPTAPI_PRECHECKHEADER \
+ LUA_STACK_AUTOLOCK; \
+ LOCK_CHECK; \
+ realityCheck(); \
+ lua_State *L = getStack(); \
+ assert(lua_checkstack(L, 20)); \
+ StackUnroller stack_unroller(L);
+
+#define PLAYER_TO_SA(p) p->getEnv()->getScriptIface()
+#define ENV_TO_SA(env) env->getScriptIface()
+#define SERVER_TO_SA(srv) srv->getScriptIface()
+
+#endif /* S_BASE_H_ */
diff --git a/src/scriptapi_entity.cpp b/src/script/cpp_api/s_entity.cpp
similarity index 72%
rename from src/scriptapi_entity.cpp
rename to src/script/cpp_api/s_entity.cpp
index c15f801a633a42eb68e06bdeb00752c419c8749d..2a5a6066d559eed04bec914d84be9444a35f2174 100644
--- a/src/scriptapi_entity.cpp
+++ b/src/script/cpp_api/s_entity.cpp
@@ -17,43 +17,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "scriptapi.h"
-#include "scriptapi_entity.h"
+#include "cpp_api/s_entity.h"
+#include "log.h"
+#include "object_properties.h"
+#include "common/c_converter.h"
+#include "common/c_content.h"
extern "C" {
-#include <lauxlib.h>
+#include "lauxlib.h"
}
-#include "log.h"
-#include "script.h"
-#include "scriptapi_types.h"
-#include "scriptapi_object.h"
-#include "scriptapi_common.h"
-
-
-void luaentity_get(lua_State *L, u16 id)
+bool ScriptApiEntity::luaentity_Add(u16 id, const char *name)
{
- // Get minetest.luaentities[i]
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "luaentities");
- luaL_checktype(L, -1, LUA_TTABLE);
- lua_pushnumber(L, id);
- lua_gettable(L, -2);
- lua_remove(L, -2); // luaentities
- lua_remove(L, -2); // minetest
-}
+ SCRIPTAPI_PRECHECKHEADER
-/*
- luaentity
-*/
-
-bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
verbosestream<<"scriptapi_luaentity_add: id="<<id<<" name=\""
<<name<<"\""<<std::endl;
- StackUnroller stack_unroller(L);
// Get minetest.registered_entities[name]
lua_getglobal(L, "minetest");
@@ -80,7 +59,7 @@ bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name)
// Add object reference
// This should be userdata with metatable ObjectRef
- objectref_get(L, id);
+ objectrefGet(id);
luaL_checktype(L, -1, LUA_TUSERDATA);
if(!luaL_checkudata(L, -1, "ObjectRef"))
luaL_typerror(L, -1, "ObjectRef");
@@ -97,16 +76,15 @@ bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name)
return true;
}
-void scriptapi_luaentity_activate(lua_State *L, u16 id,
+void ScriptApiEntity::luaentity_Activate(u16 id,
const std::string &staticdata, u32 dtime_s)
{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
+ SCRIPTAPI_PRECHECKHEADER
+
verbosestream<<"scriptapi_luaentity_activate: id="<<id<<std::endl;
- StackUnroller stack_unroller(L);
// Get minetest.luaentities[id]
- luaentity_get(L, id);
+ luaentity_get(L,id);
int object = lua_gettop(L);
// Get on_activate function
@@ -119,15 +97,15 @@ void scriptapi_luaentity_activate(lua_State *L, u16 id,
lua_pushinteger(L, dtime_s);
// Call with 3 arguments, 0 results
if(lua_pcall(L, 3, 0, 0))
- script_error(L, "error running function on_activate: %s\n",
+ scriptError("error running function on_activate: %s\n",
lua_tostring(L, -1));
}
}
-void scriptapi_luaentity_rm(lua_State *L, u16 id)
+void ScriptApiEntity::luaentity_Remove(u16 id)
{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
+ SCRIPTAPI_PRECHECKHEADER
+
verbosestream<<"scriptapi_luaentity_rm: id="<<id<<std::endl;
// Get minetest.luaentities table
@@ -144,15 +122,14 @@ void scriptapi_luaentity_rm(lua_State *L, u16 id)
lua_pop(L, 2); // pop luaentities, minetest
}
-std::string scriptapi_luaentity_get_staticdata(lua_State *L, u16 id)
+std::string ScriptApiEntity::luaentity_GetStaticdata(u16 id)
{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
+ SCRIPTAPI_PRECHECKHEADER
+
//infostream<<"scriptapi_luaentity_get_staticdata: id="<<id<<std::endl;
- StackUnroller stack_unroller(L);
// Get minetest.luaentities[id]
- luaentity_get(L, id);
+ luaentity_get(L,id);
int object = lua_gettop(L);
// Get get_staticdata function
@@ -165,7 +142,7 @@ std::string scriptapi_luaentity_get_staticdata(lua_State *L, u16 id)
lua_pushvalue(L, object); // self
// Call with 1 arguments, 1 results
if(lua_pcall(L, 1, 1, 0))
- script_error(L, "error running function get_staticdata: %s\n",
+ scriptError("error running function get_staticdata: %s\n",
lua_tostring(L, -1));
size_t len=0;
@@ -173,16 +150,15 @@ std::string scriptapi_luaentity_get_staticdata(lua_State *L, u16 id)
return std::string(s, len);
}
-void scriptapi_luaentity_get_properties(lua_State *L, u16 id,
+void ScriptApiEntity::luaentity_GetProperties(u16 id,
ObjectProperties *prop)
{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
+ SCRIPTAPI_PRECHECKHEADER
+
//infostream<<"scriptapi_luaentity_get_properties: id="<<id<<std::endl;
- StackUnroller stack_unroller(L);
// Get minetest.luaentities[id]
- luaentity_get(L, id);
+ luaentity_get(L,id);
//int object = lua_gettop(L);
// Set default values that differ from ObjectProperties defaults
@@ -214,15 +190,14 @@ void scriptapi_luaentity_get_properties(lua_State *L, u16 id,
lua_pop(L, 1);
}
-void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime)
+void ScriptApiEntity::luaentity_Step(u16 id, float dtime)
{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
+ SCRIPTAPI_PRECHECKHEADER
+
//infostream<<"scriptapi_luaentity_step: id="<<id<<std::endl;
- StackUnroller stack_unroller(L);
// Get minetest.luaentities[id]
- luaentity_get(L, id);
+ luaentity_get(L,id);
int object = lua_gettop(L);
// State: object is at top of stack
// Get step function
@@ -234,22 +209,21 @@ void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime)
lua_pushnumber(L, dtime); // dtime
// Call with 2 arguments, 0 results
if(lua_pcall(L, 2, 0, 0))
- script_error(L, "error running function 'on_step': %s\n", lua_tostring(L, -1));
+ scriptError("error running function 'on_step': %s\n", lua_tostring(L, -1));
}
// Calls entity:on_punch(ObjectRef puncher, time_from_last_punch,
// tool_capabilities, direction)
-void scriptapi_luaentity_punch(lua_State *L, u16 id,
+void ScriptApiEntity::luaentity_Punch(u16 id,
ServerActiveObject *puncher, float time_from_last_punch,
const ToolCapabilities *toolcap, v3f dir)
{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
+ SCRIPTAPI_PRECHECKHEADER
+
//infostream<<"scriptapi_luaentity_step: id="<<id<<std::endl;
- StackUnroller stack_unroller(L);
// Get minetest.luaentities[id]
- luaentity_get(L, id);
+ luaentity_get(L,id);
int object = lua_gettop(L);
// State: object is at top of stack
// Get function
@@ -258,26 +232,25 @@ void scriptapi_luaentity_punch(lua_State *L, u16 id,
return;
luaL_checktype(L, -1, LUA_TFUNCTION);
lua_pushvalue(L, object); // self
- objectref_get_or_create(L, puncher); // Clicker reference
+ objectrefGetOrCreate(puncher); // Clicker reference
lua_pushnumber(L, time_from_last_punch);
push_tool_capabilities(L, *toolcap);
push_v3f(L, dir);
// Call with 5 arguments, 0 results
if(lua_pcall(L, 5, 0, 0))
- script_error(L, "error running function 'on_punch': %s\n", lua_tostring(L, -1));
+ scriptError("error running function 'on_punch': %s\n", lua_tostring(L, -1));
}
// Calls entity:on_rightclick(ObjectRef clicker)
-void scriptapi_luaentity_rightclick(lua_State *L, u16 id,
+void ScriptApiEntity::luaentity_Rightclick(u16 id,
ServerActiveObject *clicker)
{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
+ SCRIPTAPI_PRECHECKHEADER
+
//infostream<<"scriptapi_luaentity_step: id="<<id<<std::endl;
- StackUnroller stack_unroller(L);
// Get minetest.luaentities[id]
- luaentity_get(L, id);
+ luaentity_get(L,id);
int object = lua_gettop(L);
// State: object is at top of stack
// Get function
@@ -286,8 +259,9 @@ void scriptapi_luaentity_rightclick(lua_State *L, u16 id,
return;
luaL_checktype(L, -1, LUA_TFUNCTION);
lua_pushvalue(L, object); // self
- objectref_get_or_create(L, clicker); // Clicker reference
+ objectrefGetOrCreate(clicker); // Clicker reference
// Call with 2 arguments, 0 results
if(lua_pcall(L, 2, 0, 0))
- script_error(L, "error running function 'on_rightclick': %s\n", lua_tostring(L, -1));
+ scriptError("error running function 'on_rightclick': %s\n", lua_tostring(L, -1));
}
+
diff --git a/src/script/cpp_api/s_entity.h b/src/script/cpp_api/s_entity.h
new file mode 100644
index 0000000000000000000000000000000000000000..b95b6b4b4105c5a197ef9a183a077173cf56b50f
--- /dev/null
+++ b/src/script/cpp_api/s_entity.h
@@ -0,0 +1,50 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef S_ENTITY_H_
+#define S_ENTITY_H_
+
+#include "cpp_api/s_base.h"
+#include "irr_v3d.h"
+
+class ObjectProperties;
+class ToolCapabilities;
+
+class ScriptApiEntity
+ : virtual public ScriptApiBase
+{
+public:
+ bool luaentity_Add(u16 id, const char *name);
+ void luaentity_Activate(u16 id,
+ const std::string &staticdata, u32 dtime_s);
+ void luaentity_Remove(u16 id);
+ std::string luaentity_GetStaticdata(u16 id);
+ void luaentity_GetProperties(u16 id,
+ ObjectProperties *prop);
+ void luaentity_Step(u16 id, float dtime);
+ void luaentity_Punch(u16 id,
+ ServerActiveObject *puncher, float time_from_last_punch,
+ const ToolCapabilities *toolcap, v3f dir);
+ void luaentity_Rightclick(u16 id,
+ ServerActiveObject *clicker);
+};
+
+
+
+#endif /* S_ENTITY_H_ */
diff --git a/src/script/cpp_api/s_env.cpp b/src/script/cpp_api/s_env.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..334d196bc68c2c49875cc22960179781dca9d69d
--- /dev/null
+++ b/src/script/cpp_api/s_env.cpp
@@ -0,0 +1,132 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "cpp_api/s_env.h"
+#include "common/c_converter.h"
+#include "log.h"
+#include "environment.h"
+#include "lua_api/l_env.h"
+
+extern "C" {
+#include "lauxlib.h"
+}
+
+void ScriptApiEnv::environment_OnGenerated(v3s16 minp, v3s16 maxp,
+ u32 blockseed)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Get minetest.registered_on_generateds
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_on_generateds");
+ // Call callbacks
+ push_v3s16(L, minp);
+ push_v3s16(L, maxp);
+ lua_pushnumber(L, blockseed);
+ runCallbacks(3, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void ScriptApiEnv::environment_Step(float dtime)
+{
+ SCRIPTAPI_PRECHECKHEADER
+ //infostream<<"scriptapi_environment_step"<<std::endl;
+
+ // Get minetest.registered_globalsteps
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_globalsteps");
+ // Call callbacks
+ lua_pushnumber(L, dtime);
+ runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void ScriptApiEnv::initializeEnvironment(ServerEnvironment *env)
+{
+ SCRIPTAPI_PRECHECKHEADER
+ verbosestream<<"scriptapi_add_environment"<<std::endl;
+ setEnv(env);
+
+ /*
+ Add ActiveBlockModifiers to environment
+ */
+
+ // Get minetest.registered_abms
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_abms");
+ luaL_checktype(L, -1, LUA_TTABLE);
+ int registered_abms = lua_gettop(L);
+
+ if(lua_istable(L, registered_abms)){
+ int table = lua_gettop(L);
+ lua_pushnil(L);
+ while(lua_next(L, table) != 0){
+ // key at index -2 and value at index -1
+ int id = lua_tonumber(L, -2);
+ int current_abm = lua_gettop(L);
+
+ std::set<std::string> trigger_contents;
+ lua_getfield(L, current_abm, "nodenames");
+ if(lua_istable(L, -1)){
+ int table = lua_gettop(L);
+ lua_pushnil(L);
+ while(lua_next(L, table) != 0){
+ // key at index -2 and value at index -1
+ luaL_checktype(L, -1, LUA_TSTRING);
+ trigger_contents.insert(lua_tostring(L, -1));
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ } else if(lua_isstring(L, -1)){
+ trigger_contents.insert(lua_tostring(L, -1));
+ }
+ lua_pop(L, 1);
+
+ std::set<std::string> required_neighbors;
+ lua_getfield(L, current_abm, "neighbors");
+ if(lua_istable(L, -1)){
+ int table = lua_gettop(L);
+ lua_pushnil(L);
+ while(lua_next(L, table) != 0){
+ // key at index -2 and value at index -1
+ luaL_checktype(L, -1, LUA_TSTRING);
+ required_neighbors.insert(lua_tostring(L, -1));
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ } else if(lua_isstring(L, -1)){
+ required_neighbors.insert(lua_tostring(L, -1));
+ }
+ lua_pop(L, 1);
+
+ float trigger_interval = 10.0;
+ getfloatfield(L, current_abm, "interval", trigger_interval);
+
+ int trigger_chance = 50;
+ getintfield(L, current_abm, "chance", trigger_chance);
+
+ LuaABM *abm = new LuaABM(L, id, trigger_contents,
+ required_neighbors, trigger_interval, trigger_chance);
+
+ env->addActiveBlockModifier(abm);
+
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ }
+ lua_pop(L, 1);
+}
diff --git a/src/script.h b/src/script/cpp_api/s_env.h
similarity index 59%
rename from src/script.h
rename to src/script/cpp_api/s_env.h
index dbacae5aea7085652dbf60b87e6abd07d3a59759..c5b739eb4ec9b869be66bc4c943486c6e890ad97 100644
--- a/src/script.h
+++ b/src/script/cpp_api/s_env.h
@@ -17,33 +17,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef SCRIPT_HEADER
-#define SCRIPT_HEADER
+#ifndef S_ENV_H_
+#define S_ENV_H_
-#include <exception>
-#include <string>
+#include "cpp_api/s_base.h"
+#include "irr_v3d.h"
-typedef struct lua_State lua_State;
+class ServerEnvironment;
-class LuaError : public std::exception
+class ScriptApiEnv
+ : virtual public ScriptApiBase
{
public:
- LuaError(lua_State *L, const std::string &s);
-
- virtual ~LuaError() throw()
- {}
- virtual const char * what() const throw()
- {
- return m_s.c_str();
- }
- std::string m_s;
-};
-
-lua_State* script_init();
-void script_deinit(lua_State *L);
-std::string script_get_backtrace(lua_State *L);
-void script_error(lua_State *L, const char *fmt, ...);
-bool script_load(lua_State *L, const char *path);
+ // On environment step
+ void environment_Step(float dtime);
+ // After generating a piece of map
+ void environment_OnGenerated(v3s16 minp, v3s16 maxp,u32 blockseed);
-#endif
+ void initializeEnvironment(ServerEnvironment *env);
+};
+#endif /* S_ENV_H_ */
diff --git a/src/script/cpp_api/s_inventory.cpp b/src/script/cpp_api/s_inventory.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..2402d198c1ca6a5d6c2c73c42d16bec98a83c511
--- /dev/null
+++ b/src/script/cpp_api/s_inventory.cpp
@@ -0,0 +1,260 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "cpp_api/s_inventory.h"
+#include "inventorymanager.h"
+#include "lua_api/l_inventory.h"
+#include "lua_api/l_item.h"
+#include "log.h"
+
+// Return number of accepted items to be moved
+int ScriptApiDetached::detached_inventory_AllowMove(
+ const std::string &name,
+ const std::string &from_list, int from_index,
+ const std::string &to_list, int to_index,
+ int count, ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Push callback function on stack
+ if(!getDetachedInventoryCallback(name, "allow_move"))
+ return count;
+
+ // function(inv, from_list, from_index, to_list, to_index, count, player)
+ // inv
+ InventoryLocation loc;
+ loc.setDetached(name);
+ InvRef::create(L, loc);
+ // from_list
+ lua_pushstring(L, from_list.c_str());
+ // from_index
+ lua_pushinteger(L, from_index + 1);
+ // to_list
+ lua_pushstring(L, to_list.c_str());
+ // to_index
+ lua_pushinteger(L, to_index + 1);
+ // count
+ lua_pushinteger(L, count);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 7, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ if(!lua_isnumber(L, -1))
+ throw LuaError(L, "allow_move should return a number");
+ return luaL_checkinteger(L, -1);
+}
+
+// Return number of accepted items to be put
+int ScriptApiDetached::detached_inventory_AllowPut(
+ const std::string &name,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Push callback function on stack
+ if(!getDetachedInventoryCallback(name, "allow_put"))
+ return stack.count; // All will be accepted
+
+ // Call function(inv, listname, index, stack, player)
+ // inv
+ InventoryLocation loc;
+ loc.setDetached(name);
+ InvRef::create(L, loc);
+ // listname
+ lua_pushstring(L, listname.c_str());
+ // index
+ lua_pushinteger(L, index + 1);
+ // stack
+ LuaItemStack::create(L, stack);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 5, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ if(!lua_isnumber(L, -1))
+ throw LuaError(L, "allow_put should return a number");
+ return luaL_checkinteger(L, -1);
+}
+
+// Return number of accepted items to be taken
+int ScriptApiDetached::detached_inventory_AllowTake(
+ const std::string &name,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Push callback function on stack
+ if(!getDetachedInventoryCallback(name, "allow_take"))
+ return stack.count; // All will be accepted
+
+ // Call function(inv, listname, index, stack, player)
+ // inv
+ InventoryLocation loc;
+ loc.setDetached(name);
+ InvRef::create(L, loc);
+ // listname
+ lua_pushstring(L, listname.c_str());
+ // index
+ lua_pushinteger(L, index + 1);
+ // stack
+ LuaItemStack::create(L, stack);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 5, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ if(!lua_isnumber(L, -1))
+ throw LuaError(L, "allow_take should return a number");
+ return luaL_checkinteger(L, -1);
+}
+
+// Report moved items
+void ScriptApiDetached::detached_inventory_OnMove(
+ const std::string &name,
+ const std::string &from_list, int from_index,
+ const std::string &to_list, int to_index,
+ int count, ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Push callback function on stack
+ if(!getDetachedInventoryCallback(name, "on_move"))
+ return;
+
+ // function(inv, from_list, from_index, to_list, to_index, count, player)
+ // inv
+ InventoryLocation loc;
+ loc.setDetached(name);
+ InvRef::create(L, loc);
+ // from_list
+ lua_pushstring(L, from_list.c_str());
+ // from_index
+ lua_pushinteger(L, from_index + 1);
+ // to_list
+ lua_pushstring(L, to_list.c_str());
+ // to_index
+ lua_pushinteger(L, to_index + 1);
+ // count
+ lua_pushinteger(L, count);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 7, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
+// Report put items
+void ScriptApiDetached::detached_inventory_OnPut(
+ const std::string &name,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Push callback function on stack
+ if(!getDetachedInventoryCallback(name, "on_put"))
+ return;
+
+ // Call function(inv, listname, index, stack, player)
+ // inv
+ InventoryLocation loc;
+ loc.setDetached(name);
+ InvRef::create(L, loc);
+ // listname
+ lua_pushstring(L, listname.c_str());
+ // index
+ lua_pushinteger(L, index + 1);
+ // stack
+ LuaItemStack::create(L, stack);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 5, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
+// Report taken items
+void ScriptApiDetached::detached_inventory_OnTake(
+ const std::string &name,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Push callback function on stack
+ if(!getDetachedInventoryCallback(name, "on_take"))
+ return;
+
+ // Call function(inv, listname, index, stack, player)
+ // inv
+ InventoryLocation loc;
+ loc.setDetached(name);
+ InvRef::create(L, loc);
+ // listname
+ lua_pushstring(L, listname.c_str());
+ // index
+ lua_pushinteger(L, index + 1);
+ // stack
+ LuaItemStack::create(L, stack);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 5, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
+// Retrieves minetest.detached_inventories[name][callbackname]
+// If that is nil or on error, return false and stack is unchanged
+// If that is a function, returns true and pushes the
+// function onto the stack
+bool ScriptApiDetached::getDetachedInventoryCallback(
+ const std::string &name, const char *callbackname)
+{
+ lua_State *L = getStack();
+
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "detached_inventories");
+ lua_remove(L, -2);
+ luaL_checktype(L, -1, LUA_TTABLE);
+ lua_getfield(L, -1, name.c_str());
+ lua_remove(L, -2);
+ // Should be a table
+ if(lua_type(L, -1) != LUA_TTABLE)
+ {
+ errorstream<<"Item \""<<name<<"\" not defined"<<std::endl;
+ lua_pop(L, 1);
+ return false;
+ }
+ lua_getfield(L, -1, callbackname);
+ lua_remove(L, -2);
+ // Should be a function or nil
+ if(lua_type(L, -1) == LUA_TFUNCTION)
+ {
+ return true;
+ }
+ else if(lua_isnil(L, -1))
+ {
+ lua_pop(L, 1);
+ return false;
+ }
+ else
+ {
+ errorstream<<"Detached inventory \""<<name<<"\" callback \""
+ <<callbackname<<"\" is not a function"<<std::endl;
+ lua_pop(L, 1);
+ return false;
+ }
+}
diff --git a/src/script/cpp_api/s_inventory.h b/src/script/cpp_api/s_inventory.h
new file mode 100644
index 0000000000000000000000000000000000000000..bf3b5de85c62376b08e192c14d12d8cc23499bdd
--- /dev/null
+++ b/src/script/cpp_api/s_inventory.h
@@ -0,0 +1,71 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef S_INVENTORY_H_
+#define S_INVENTORY_H_
+
+#include "cpp_api/s_base.h"
+
+class ItemStack;
+
+class ScriptApiDetached
+ : virtual public ScriptApiBase
+{
+public:
+ /* Detached inventory callbacks */
+ // Return number of accepted items to be moved
+ int detached_inventory_AllowMove(
+ const std::string &name,
+ const std::string &from_list, int from_index,
+ const std::string &to_list, int to_index,
+ int count, ServerActiveObject *player);
+ // Return number of accepted items to be put
+ int detached_inventory_AllowPut(
+ const std::string &name,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player);
+ // Return number of accepted items to be taken
+ int detached_inventory_AllowTake(
+ const std::string &name,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player);
+ // Report moved items
+ void detached_inventory_OnMove(
+ const std::string &name,
+ const std::string &from_list, int from_index,
+ const std::string &to_list, int to_index,
+ int count, ServerActiveObject *player);
+ // Report put items
+ void detached_inventory_OnPut(
+ const std::string &name,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player);
+ // Report taken items
+ void detached_inventory_OnTake(
+ const std::string &name,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player);
+private:
+ bool getDetachedInventoryCallback(
+ const std::string &name, const char *callbackname);
+};
+
+
+
+#endif /* S_INVENTORY_H_ */
diff --git a/src/script/cpp_api/s_item.cpp b/src/script/cpp_api/s_item.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..6937ebbebf21529c8c57e98fe6bc167228e1d9c4
--- /dev/null
+++ b/src/script/cpp_api/s_item.cpp
@@ -0,0 +1,164 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "cpp_api/s_item.h"
+#include "common/c_converter.h"
+#include "common/c_content.h"
+#include "lua_api/l_item.h"
+#include "server.h"
+
+bool ScriptApiItem::item_OnDrop(ItemStack &item,
+ ServerActiveObject *dropper, v3f pos)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Push callback function on stack
+ if(!getItemCallback(item.name.c_str(), "on_drop"))
+ return false;
+
+ // Call function
+ LuaItemStack::create(L, item);
+ objectrefGetOrCreate(dropper);
+ pushFloatPos(L, pos);
+ if(lua_pcall(L, 3, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ if(!lua_isnil(L, -1))
+ item = read_item(L,-1, getServer());
+ return true;
+}
+
+bool ScriptApiItem::item_OnPlace(ItemStack &item,
+ ServerActiveObject *placer, const PointedThing &pointed)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Push callback function on stack
+ if(!getItemCallback(item.name.c_str(), "on_place"))
+ return false;
+
+ // Call function
+ LuaItemStack::create(L, item);
+ objectrefGetOrCreate(placer);
+ pushPointedThing(pointed);
+ if(lua_pcall(L, 3, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ if(!lua_isnil(L, -1))
+ item = read_item(L,-1, getServer());
+ return true;
+}
+
+bool ScriptApiItem::item_OnUse(ItemStack &item,
+ ServerActiveObject *user, const PointedThing &pointed)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Push callback function on stack
+ if(!getItemCallback(item.name.c_str(), "on_use"))
+ return false;
+
+ // Call function
+ LuaItemStack::create(L, item);
+ objectrefGetOrCreate(user);
+ pushPointedThing(pointed);
+ if(lua_pcall(L, 3, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ if(!lua_isnil(L, -1))
+ item = read_item(L,-1, getServer());
+ return true;
+}
+
+// Retrieves minetest.registered_items[name][callbackname]
+// If that is nil or on error, return false and stack is unchanged
+// If that is a function, returns true and pushes the
+// function onto the stack
+// If minetest.registered_items[name] doesn't exist, minetest.nodedef_default
+// is tried instead so unknown items can still be manipulated to some degree
+bool ScriptApiItem::getItemCallback(const char *name, const char *callbackname)
+{
+ lua_State* L = getStack();
+
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_items");
+ lua_remove(L, -2);
+ luaL_checktype(L, -1, LUA_TTABLE);
+ lua_getfield(L, -1, name);
+ lua_remove(L, -2);
+ // Should be a table
+ if(lua_type(L, -1) != LUA_TTABLE)
+ {
+ // Report error and clean up
+ errorstream<<"Item \""<<name<<"\" not defined"<<std::endl;
+ lua_pop(L, 1);
+
+ // Try minetest.nodedef_default instead
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "nodedef_default");
+ lua_remove(L, -2);
+ luaL_checktype(L, -1, LUA_TTABLE);
+ }
+ lua_getfield(L, -1, callbackname);
+ lua_remove(L, -2);
+ // Should be a function or nil
+ if(lua_type(L, -1) == LUA_TFUNCTION)
+ {
+ return true;
+ }
+ else if(lua_isnil(L, -1))
+ {
+ lua_pop(L, 1);
+ return false;
+ }
+ else
+ {
+ errorstream<<"Item \""<<name<<"\" callback \""
+ <<callbackname<<" is not a function"<<std::endl;
+ lua_pop(L, 1);
+ return false;
+ }
+}
+
+void ScriptApiItem::pushPointedThing(const PointedThing& pointed)
+{
+ lua_State* L = getStack();
+
+ lua_newtable(L);
+ if(pointed.type == POINTEDTHING_NODE)
+ {
+ lua_pushstring(L, "node");
+ lua_setfield(L, -2, "type");
+ push_v3s16(L, pointed.node_undersurface);
+ lua_setfield(L, -2, "under");
+ push_v3s16(L, pointed.node_abovesurface);
+ lua_setfield(L, -2, "above");
+ }
+ else if(pointed.type == POINTEDTHING_OBJECT)
+ {
+ lua_pushstring(L, "object");
+ lua_setfield(L, -2, "type");
+ objectrefGet(pointed.object_id);
+ lua_setfield(L, -2, "ref");
+ }
+ else
+ {
+ lua_pushstring(L, "nothing");
+ lua_setfield(L, -2, "type");
+ }
+}
+
+
diff --git a/src/script/cpp_api/s_item.h b/src/script/cpp_api/s_item.h
new file mode 100644
index 0000000000000000000000000000000000000000..28ac444f678b4445afcae3739f7dd20e75b60222
--- /dev/null
+++ b/src/script/cpp_api/s_item.h
@@ -0,0 +1,55 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef S_ITEM_H_
+#define S_ITEM_H_
+
+#include "cpp_api/s_base.h"
+#include "irr_v3d.h"
+
+class PointedThing;
+class ItemStack;
+class ServerActiveObject;
+class ItemDefinition;
+class LuaItemStack;
+class ModApiItemMod;
+
+class ScriptApiItem
+: virtual public ScriptApiBase
+{
+public:
+ bool item_OnDrop(ItemStack &item,
+ ServerActiveObject *dropper, v3f pos);
+ bool item_OnPlace(ItemStack &item,
+ ServerActiveObject *placer, const PointedThing &pointed);
+ bool item_OnUse(ItemStack &item,
+ ServerActiveObject *user, const PointedThing &pointed);
+
+protected:
+ friend class LuaItemStack;
+ friend class ModApiItemMod;
+
+ bool getItemCallback(const char *name, const char *callbackname);
+private:
+ void pushPointedThing(const PointedThing& pointed);
+
+};
+
+
+#endif /* S_ITEM_H_ */
diff --git a/src/script/cpp_api/s_node.cpp b/src/script/cpp_api/s_node.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..969e2f4d92bfc05ffb820f8b5a5fbf85a07fe506
--- /dev/null
+++ b/src/script/cpp_api/s_node.cpp
@@ -0,0 +1,233 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "cpp_api/s_node.h"
+#include "common/c_converter.h"
+#include "common/c_content.h"
+#include "nodedef.h"
+#include "server.h"
+
+
+struct EnumString ScriptApiNode::es_DrawType[] =
+ {
+ {NDT_NORMAL, "normal"},
+ {NDT_AIRLIKE, "airlike"},
+ {NDT_LIQUID, "liquid"},
+ {NDT_FLOWINGLIQUID, "flowingliquid"},
+ {NDT_GLASSLIKE, "glasslike"},
+ {NDT_GLASSLIKE_FRAMED, "glasslike_framed"},
+ {NDT_ALLFACES, "allfaces"},
+ {NDT_ALLFACES_OPTIONAL, "allfaces_optional"},
+ {NDT_TORCHLIKE, "torchlike"},
+ {NDT_SIGNLIKE, "signlike"},
+ {NDT_PLANTLIKE, "plantlike"},
+ {NDT_FENCELIKE, "fencelike"},
+ {NDT_RAILLIKE, "raillike"},
+ {NDT_NODEBOX, "nodebox"},
+ {0, NULL},
+ };
+
+struct EnumString ScriptApiNode::es_ContentParamType2[] =
+ {
+ {CPT2_NONE, "none"},
+ {CPT2_FULL, "full"},
+ {CPT2_FLOWINGLIQUID, "flowingliquid"},
+ {CPT2_FACEDIR, "facedir"},
+ {CPT2_WALLMOUNTED, "wallmounted"},
+ {0, NULL},
+ };
+
+struct EnumString ScriptApiNode::es_LiquidType[] =
+ {
+ {LIQUID_NONE, "none"},
+ {LIQUID_FLOWING, "flowing"},
+ {LIQUID_SOURCE, "source"},
+ {0, NULL},
+ };
+
+struct EnumString ScriptApiNode::es_ContentParamType[] =
+ {
+ {CPT_NONE, "none"},
+ {CPT_LIGHT, "light"},
+ {0, NULL},
+ };
+
+struct EnumString ScriptApiNode::es_NodeBoxType[] =
+ {
+ {NODEBOX_REGULAR, "regular"},
+ {NODEBOX_FIXED, "fixed"},
+ {NODEBOX_WALLMOUNTED, "wallmounted"},
+ {0, NULL},
+ };
+
+ScriptApiNode::ScriptApiNode() {
+}
+
+ScriptApiNode::~ScriptApiNode() {
+}
+
+bool ScriptApiNode::node_on_punch(v3s16 p, MapNode node,
+ ServerActiveObject *puncher)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(), "on_punch"))
+ return false;
+
+ // Call function
+ push_v3s16(L, p);
+ pushnode(L, node, ndef);
+ objectrefGetOrCreate(puncher);
+ if(lua_pcall(L, 3, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ return true;
+}
+
+bool ScriptApiNode::node_on_dig(v3s16 p, MapNode node,
+ ServerActiveObject *digger)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(), "on_dig"))
+ return false;
+
+ // Call function
+ push_v3s16(L, p);
+ pushnode(L, node, ndef);
+ objectrefGetOrCreate(digger);
+ if(lua_pcall(L, 3, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ return true;
+}
+
+void ScriptApiNode::node_on_construct(v3s16 p, MapNode node)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(), "on_construct"))
+ return;
+
+ // Call function
+ push_v3s16(L, p);
+ if(lua_pcall(L, 1, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
+void ScriptApiNode::node_on_destruct(v3s16 p, MapNode node)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(), "on_destruct"))
+ return;
+
+ // Call function
+ push_v3s16(L, p);
+ if(lua_pcall(L, 1, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
+void ScriptApiNode::node_after_destruct(v3s16 p, MapNode node)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(), "after_destruct"))
+ return;
+
+ // Call function
+ push_v3s16(L, p);
+ pushnode(L, node, ndef);
+ if(lua_pcall(L, 2, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
+bool ScriptApiNode::node_on_timer(v3s16 p, MapNode node, f32 dtime)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(), "on_timer"))
+ return false;
+
+ // Call function
+ push_v3s16(L, p);
+ lua_pushnumber(L,dtime);
+ if(lua_pcall(L, 2, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ if((bool)lua_isboolean(L,-1) && (bool)lua_toboolean(L,-1) == true)
+ return true;
+
+ return false;
+}
+
+void ScriptApiNode::node_on_receive_fields(v3s16 p,
+ const std::string &formname,
+ const std::map<std::string, std::string> &fields,
+ ServerActiveObject *sender)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // If node doesn't exist, we don't know what callback to call
+ MapNode node = getEnv()->getMap().getNodeNoEx(p);
+ if(node.getContent() == CONTENT_IGNORE)
+ return;
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(), "on_receive_fields"))
+ return;
+
+ // Call function
+ // param 1
+ push_v3s16(L, p);
+ // param 2
+ lua_pushstring(L, formname.c_str());
+ // param 3
+ lua_newtable(L);
+ for(std::map<std::string, std::string>::const_iterator
+ i = fields.begin(); i != fields.end(); i++){
+ const std::string &name = i->first;
+ const std::string &value = i->second;
+ lua_pushstring(L, name.c_str());
+ lua_pushlstring(L, value.c_str(), value.size());
+ lua_settable(L, -3);
+ }
+ // param 4
+ objectrefGetOrCreate(sender);
+ if(lua_pcall(L, 4, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
diff --git a/src/script/cpp_api/s_node.h b/src/script/cpp_api/s_node.h
new file mode 100644
index 0000000000000000000000000000000000000000..bff6072b9df9c813d3443265cfdf700031c9ce10
--- /dev/null
+++ b/src/script/cpp_api/s_node.h
@@ -0,0 +1,62 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef S_NODE_H_
+#define S_NODE_H_
+
+#include <map>
+
+#include "irr_v3d.h"
+#include "cpp_api/s_base.h"
+#include "cpp_api/s_nodemeta.h"
+
+class MapNode;
+class ServerActiveObject;
+
+class ScriptApiNode
+ : virtual public ScriptApiBase,
+ public ScriptApiNodemeta
+{
+public:
+ ScriptApiNode();
+ virtual ~ScriptApiNode();
+
+ bool node_on_punch(v3s16 p, MapNode node,
+ ServerActiveObject *puncher);
+ bool node_on_dig(v3s16 p, MapNode node,
+ ServerActiveObject *digger);
+ void node_on_construct(v3s16 p, MapNode node);
+ void node_on_destruct(v3s16 p, MapNode node);
+ void node_after_destruct(v3s16 p, MapNode node);
+ bool node_on_timer(v3s16 p, MapNode node, f32 dtime);
+ void node_on_receive_fields(v3s16 p,
+ const std::string &formname,
+ const std::map<std::string, std::string> &fields,
+ ServerActiveObject *sender);
+public:
+ static struct EnumString es_DrawType[];
+ static struct EnumString es_ContentParamType[];
+ static struct EnumString es_ContentParamType2[];
+ static struct EnumString es_LiquidType[];
+ static struct EnumString es_NodeBoxType[];
+};
+
+
+
+#endif /* S_NODE_H_ */
diff --git a/src/script/cpp_api/s_nodemeta.cpp b/src/script/cpp_api/s_nodemeta.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..56cea8e5f99d35a3b18ce72dee46d00544f2c767
--- /dev/null
+++ b/src/script/cpp_api/s_nodemeta.cpp
@@ -0,0 +1,261 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "cpp_api/s_nodemeta.h"
+#include "common/c_converter.h"
+#include "nodedef.h"
+#include "mapnode.h"
+#include "server.h"
+#include "lua_api/l_item.h"
+
+extern "C" {
+#include "lauxlib.h"
+}
+
+// Return number of accepted items to be moved
+int ScriptApiNodemeta::nodemeta_inventory_AllowMove(v3s16 p,
+ const std::string &from_list, int from_index,
+ const std::string &to_list, int to_index,
+ int count, ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // If node doesn't exist, we don't know what callback to call
+ MapNode node = getEnv()->getMap().getNodeNoEx(p);
+ if(node.getContent() == CONTENT_IGNORE)
+ return 0;
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(),
+ "allow_metadata_inventory_move"))
+ return count;
+
+ // function(pos, from_list, from_index, to_list, to_index, count, player)
+ // pos
+ push_v3s16(L, p);
+ // from_list
+ lua_pushstring(L, from_list.c_str());
+ // from_index
+ lua_pushinteger(L, from_index + 1);
+ // to_list
+ lua_pushstring(L, to_list.c_str());
+ // to_index
+ lua_pushinteger(L, to_index + 1);
+ // count
+ lua_pushinteger(L, count);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 7, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ if(!lua_isnumber(L, -1))
+ throw LuaError(L, "allow_metadata_inventory_move should return a number");
+ return luaL_checkinteger(L, -1);
+}
+
+// Return number of accepted items to be put
+int ScriptApiNodemeta::nodemeta_inventory_AllowPut(v3s16 p,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // If node doesn't exist, we don't know what callback to call
+ MapNode node = getEnv()->getMap().getNodeNoEx(p);
+ if(node.getContent() == CONTENT_IGNORE)
+ return 0;
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(),
+ "allow_metadata_inventory_put"))
+ return stack.count;
+
+ // Call function(pos, listname, index, stack, player)
+ // pos
+ push_v3s16(L, p);
+ // listname
+ lua_pushstring(L, listname.c_str());
+ // index
+ lua_pushinteger(L, index + 1);
+ // stack
+ LuaItemStack::create(L, stack);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 5, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ if(!lua_isnumber(L, -1))
+ throw LuaError(L, "allow_metadata_inventory_put should return a number");
+ return luaL_checkinteger(L, -1);
+}
+
+// Return number of accepted items to be taken
+int ScriptApiNodemeta::nodemeta_inventory_AllowTake(v3s16 p,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // If node doesn't exist, we don't know what callback to call
+ MapNode node = getEnv()->getMap().getNodeNoEx(p);
+ if(node.getContent() == CONTENT_IGNORE)
+ return 0;
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(),
+ "allow_metadata_inventory_take"))
+ return stack.count;
+
+ // Call function(pos, listname, index, count, player)
+ // pos
+ push_v3s16(L, p);
+ // listname
+ lua_pushstring(L, listname.c_str());
+ // index
+ lua_pushinteger(L, index + 1);
+ // stack
+ LuaItemStack::create(L, stack);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 5, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ if(!lua_isnumber(L, -1))
+ throw LuaError(L, "allow_metadata_inventory_take should return a number");
+ return luaL_checkinteger(L, -1);
+}
+
+// Report moved items
+void ScriptApiNodemeta::nodemeta_inventory_OnMove(v3s16 p,
+ const std::string &from_list, int from_index,
+ const std::string &to_list, int to_index,
+ int count, ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // If node doesn't exist, we don't know what callback to call
+ MapNode node = getEnv()->getMap().getNodeNoEx(p);
+ if(node.getContent() == CONTENT_IGNORE)
+ return;
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(),
+ "on_metadata_inventory_move"))
+ return;
+
+ // function(pos, from_list, from_index, to_list, to_index, count, player)
+ // pos
+ push_v3s16(L, p);
+ // from_list
+ lua_pushstring(L, from_list.c_str());
+ // from_index
+ lua_pushinteger(L, from_index + 1);
+ // to_list
+ lua_pushstring(L, to_list.c_str());
+ // to_index
+ lua_pushinteger(L, to_index + 1);
+ // count
+ lua_pushinteger(L, count);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 7, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
+// Report put items
+void ScriptApiNodemeta::nodemeta_inventory_OnPut(v3s16 p,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // If node doesn't exist, we don't know what callback to call
+ MapNode node = getEnv()->getMap().getNodeNoEx(p);
+ if(node.getContent() == CONTENT_IGNORE)
+ return;
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(),
+ "on_metadata_inventory_put"))
+ return;
+
+ // Call function(pos, listname, index, stack, player)
+ // pos
+ push_v3s16(L, p);
+ // listname
+ lua_pushstring(L, listname.c_str());
+ // index
+ lua_pushinteger(L, index + 1);
+ // stack
+ LuaItemStack::create(L, stack);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 5, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
+// Report taken items
+void ScriptApiNodemeta::nodemeta_inventory_OnTake(v3s16 p,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ INodeDefManager *ndef = getServer()->ndef();
+
+ // If node doesn't exist, we don't know what callback to call
+ MapNode node = getEnv()->getMap().getNodeNoEx(p);
+ if(node.getContent() == CONTENT_IGNORE)
+ return;
+
+ // Push callback function on stack
+ if(!getItemCallback(ndef->get(node).name.c_str(),
+ "on_metadata_inventory_take"))
+ return;
+
+ // Call function(pos, listname, index, stack, player)
+ // pos
+ push_v3s16(L, p);
+ // listname
+ lua_pushstring(L, listname.c_str());
+ // index
+ lua_pushinteger(L, index + 1);
+ // stack
+ LuaItemStack::create(L, stack);
+ // player
+ objectrefGetOrCreate(player);
+ if(lua_pcall(L, 5, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
+ScriptApiNodemeta::ScriptApiNodemeta() {
+}
+
+ScriptApiNodemeta::~ScriptApiNodemeta() {
+}
+
+
+
diff --git a/src/script/cpp_api/s_nodemeta.h b/src/script/cpp_api/s_nodemeta.h
new file mode 100644
index 0000000000000000000000000000000000000000..9be126c62c3d591682df85fca16754e4ae977126
--- /dev/null
+++ b/src/script/cpp_api/s_nodemeta.h
@@ -0,0 +1,67 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef S_NODEMETA_H_
+#define S_NODEMETA_H_
+
+#include "cpp_api/s_base.h"
+#include "cpp_api/s_item.h"
+#include "irr_v3d.h"
+
+class ItemStack;
+
+class ScriptApiNodemeta
+ : virtual public ScriptApiBase,
+ public ScriptApiItem
+{
+public:
+ ScriptApiNodemeta();
+ virtual ~ScriptApiNodemeta();
+
+ // Return number of accepted items to be moved
+ int nodemeta_inventory_AllowMove(v3s16 p,
+ const std::string &from_list, int from_index,
+ const std::string &to_list, int to_index,
+ int count, ServerActiveObject *player);
+ // Return number of accepted items to be put
+ int nodemeta_inventory_AllowPut(v3s16 p,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player);
+ // Return number of accepted items to be taken
+ int nodemeta_inventory_AllowTake(v3s16 p,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player);
+ // Report moved items
+ void nodemeta_inventory_OnMove(v3s16 p,
+ const std::string &from_list, int from_index,
+ const std::string &to_list, int to_index,
+ int count, ServerActiveObject *player);
+ // Report put items
+ void nodemeta_inventory_OnPut(v3s16 p,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player);
+ // Report taken items
+ void nodemeta_inventory_OnTake(v3s16 p,
+ const std::string &listname, int index, ItemStack &stack,
+ ServerActiveObject *player);
+private:
+
+};
+
+#endif /* S_NODEMETA_H_ */
diff --git a/src/script/cpp_api/s_player.cpp b/src/script/cpp_api/s_player.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..e736d745de4053c6c822773613ead4e665cbcb86
--- /dev/null
+++ b/src/script/cpp_api/s_player.cpp
@@ -0,0 +1,113 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "cpp_api/s_player.h"
+
+void ScriptApiPlayer::on_newplayer(ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Get minetest.registered_on_newplayers
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_on_newplayers");
+ // Call callbacks
+ objectrefGetOrCreate(player);
+ runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void ScriptApiPlayer::on_dieplayer(ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Get minetest.registered_on_dieplayers
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_on_dieplayers");
+ // Call callbacks
+ objectrefGetOrCreate(player);
+ runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
+}
+
+bool ScriptApiPlayer::on_respawnplayer(ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Get minetest.registered_on_respawnplayers
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_on_respawnplayers");
+ // Call callbacks
+ objectrefGetOrCreate(player);
+ runCallbacks(1, RUN_CALLBACKS_MODE_OR);
+ bool positioning_handled_by_some = lua_toboolean(L, -1);
+ return positioning_handled_by_some;
+}
+
+void ScriptApiPlayer::on_joinplayer(ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Get minetest.registered_on_joinplayers
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_on_joinplayers");
+ // Call callbacks
+ objectrefGetOrCreate(player);
+ runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void ScriptApiPlayer::on_leaveplayer(ServerActiveObject *player)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Get minetest.registered_on_leaveplayers
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_on_leaveplayers");
+ // Call callbacks
+ objectrefGetOrCreate(player);
+ runCallbacks(1, RUN_CALLBACKS_MODE_FIRST);
+}
+
+void ScriptApiPlayer::on_playerReceiveFields(ServerActiveObject *player,
+ const std::string &formname,
+ const std::map<std::string, std::string> &fields)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Get minetest.registered_on_chat_messages
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_on_player_receive_fields");
+ // Call callbacks
+ // param 1
+ objectrefGetOrCreate(player);
+ // param 2
+ lua_pushstring(L, formname.c_str());
+ // param 3
+ lua_newtable(L);
+ for(std::map<std::string, std::string>::const_iterator
+ i = fields.begin(); i != fields.end(); i++){
+ const std::string &name = i->first;
+ const std::string &value = i->second;
+ lua_pushstring(L, name.c_str());
+ lua_pushlstring(L, value.c_str(), value.size());
+ lua_settable(L, -3);
+ }
+ runCallbacks(3, RUN_CALLBACKS_MODE_OR_SC);
+}
+ScriptApiPlayer::~ScriptApiPlayer() {
+}
+
+
diff --git a/src/script/cpp_api/s_player.h b/src/script/cpp_api/s_player.h
new file mode 100644
index 0000000000000000000000000000000000000000..663e3c2abc851c5281f7f52e1778072e0f6abae1
--- /dev/null
+++ b/src/script/cpp_api/s_player.h
@@ -0,0 +1,44 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef S_PLAYER_H_
+#define S_PLAYER_H_
+
+#include "cpp_api/s_base.h"
+
+
+class ScriptApiPlayer
+ : virtual public ScriptApiBase
+{
+public:
+ virtual ~ScriptApiPlayer();
+
+ void on_newplayer(ServerActiveObject *player);
+ void on_dieplayer(ServerActiveObject *player);
+ bool on_respawnplayer(ServerActiveObject *player);
+ void on_joinplayer(ServerActiveObject *player);
+ void on_leaveplayer(ServerActiveObject *player);
+
+ void on_playerReceiveFields(ServerActiveObject *player,
+ const std::string &formname,
+ const std::map<std::string, std::string> &fields);
+};
+
+
+#endif /* S_PLAYER_H_ */
diff --git a/src/script/cpp_api/scriptapi.cpp b/src/script/cpp_api/scriptapi.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b6d376b1f30e286590febbb29c4f5b8ef87b8e8b
--- /dev/null
+++ b/src/script/cpp_api/scriptapi.cpp
@@ -0,0 +1,291 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+extern "C" {
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
+}
+
+
+#include "scriptapi.h"
+#include "common/c_converter.h"
+#include "lua_api/l_base.h"
+#include "log.h"
+#include "mods.h"
+
+int script_ErrorHandler(lua_State *L) {
+ lua_getfield(L, LUA_GLOBALSINDEX, "debug");
+ if (!lua_istable(L, -1)) {
+ lua_pop(L, 1);
+ return 1;
+ }
+ lua_getfield(L, -1, "traceback");
+ if (!lua_isfunction(L, -1)) {
+ lua_pop(L, 2);
+ return 1;
+ }
+ lua_pushvalue(L, 1);
+ lua_pushinteger(L, 2);
+ lua_call(L, 2, 1);
+ return 1;
+}
+
+
+bool ScriptApi::getAuth(const std::string &playername,
+ std::string *dst_password, std::set<std::string> *dst_privs)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ getAuthHandler();
+ lua_getfield(L, -1, "get_auth");
+ if(lua_type(L, -1) != LUA_TFUNCTION)
+ throw LuaError(L, "Authentication handler missing get_auth");
+ lua_pushstring(L, playername.c_str());
+ if(lua_pcall(L, 1, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+
+ // nil = login not allowed
+ if(lua_isnil(L, -1))
+ return false;
+ luaL_checktype(L, -1, LUA_TTABLE);
+
+ std::string password;
+ bool found = getstringfield(L, -1, "password", password);
+ if(!found)
+ throw LuaError(L, "Authentication handler didn't return password");
+ if(dst_password)
+ *dst_password = password;
+
+ lua_getfield(L, -1, "privileges");
+ if(!lua_istable(L, -1))
+ throw LuaError(L,
+ "Authentication handler didn't return privilege table");
+ if(dst_privs)
+ readPrivileges(-1, *dst_privs);
+ lua_pop(L, 1);
+
+ return true;
+}
+
+void ScriptApi::getAuthHandler()
+{
+ lua_State *L = getStack();
+
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_auth_handler");
+ if(lua_isnil(L, -1)){
+ lua_pop(L, 1);
+ lua_getfield(L, -1, "builtin_auth_handler");
+ }
+ if(lua_type(L, -1) != LUA_TTABLE)
+ throw LuaError(L, "Authentication handler table not valid");
+}
+
+void ScriptApi::readPrivileges(int index,std::set<std::string> &result)
+{
+ lua_State *L = getStack();
+
+ result.clear();
+ lua_pushnil(L);
+ if(index < 0)
+ index -= 1;
+ while(lua_next(L, index) != 0){
+ // key at index -2 and value at index -1
+ std::string key = luaL_checkstring(L, -2);
+ bool value = lua_toboolean(L, -1);
+ if(value)
+ result.insert(key);
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+}
+
+void ScriptApi::createAuth(const std::string &playername,
+ const std::string &password)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ getAuthHandler();
+ lua_getfield(L, -1, "create_auth");
+ if(lua_type(L, -1) != LUA_TFUNCTION)
+ throw LuaError(L, "Authentication handler missing create_auth");
+ lua_pushstring(L, playername.c_str());
+ lua_pushstring(L, password.c_str());
+ if(lua_pcall(L, 2, 0, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+}
+
+bool ScriptApi::setPassword(const std::string &playername,
+ const std::string &password)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ getAuthHandler();
+ lua_getfield(L, -1, "set_password");
+ if(lua_type(L, -1) != LUA_TFUNCTION)
+ throw LuaError(L, "Authentication handler missing set_password");
+ lua_pushstring(L, playername.c_str());
+ lua_pushstring(L, password.c_str());
+ if(lua_pcall(L, 2, 1, 0))
+ scriptError("error: %s", lua_tostring(L, -1));
+ return lua_toboolean(L, -1);
+}
+
+bool ScriptApi::on_chat_message(const std::string &name,
+ const std::string &message)
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Get minetest.registered_on_chat_messages
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_on_chat_messages");
+ // Call callbacks
+ lua_pushstring(L, name.c_str());
+ lua_pushstring(L, message.c_str());
+ runCallbacks(2, RUN_CALLBACKS_MODE_OR_SC);
+ bool ate = lua_toboolean(L, -1);
+ return ate;
+}
+
+void ScriptApi::on_shutdown()
+{
+ SCRIPTAPI_PRECHECKHEADER
+
+ // Get registered shutdown hooks
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_on_shutdown");
+ // Call callbacks
+ runCallbacks(0, RUN_CALLBACKS_MODE_FIRST);
+}
+
+bool ScriptApi::loadMod(const std::string &scriptpath,const std::string &modname)
+{
+ ModNameStorer modnamestorer(getStack(), modname);
+
+ if(!string_allowed(modname, MODNAME_ALLOWED_CHARS)){
+ errorstream<<"Error loading mod \""<<modname
+ <<"\": modname does not follow naming conventions: "
+ <<"Only chararacters [a-z0-9_] are allowed."<<std::endl;
+ return false;
+ }
+
+ bool success = false;
+
+ try{
+ success = scriptLoad(scriptpath.c_str());
+ }
+ catch(LuaError &e){
+ errorstream<<"Error loading mod \""<<modname
+ <<"\": "<<e.what()<<std::endl;
+ }
+
+ return success;
+}
+
+ScriptApi::ScriptApi() {
+ assert("Invalid call to default constructor of scriptapi!" == 0);
+}
+
+ScriptApi::ScriptApi(Server* server)
+{
+
+ setServer(server);
+ setStack(luaL_newstate());
+ assert(getStack());
+
+ //TODO add security
+
+ luaL_openlibs(getStack());
+
+ SCRIPTAPI_PRECHECKHEADER
+
+ lua_pushlightuserdata(L, this);
+ lua_setfield(L, LUA_REGISTRYINDEX, "scriptapi");
+
+ lua_newtable(L);
+ lua_setglobal(L, "minetest");
+
+
+ for (std::vector<ModApiBase*>::iterator i = m_mod_api_modules->begin();
+ i != m_mod_api_modules->end(); i++) {
+ //initializers are called within minetest global table!
+ lua_getglobal(L, "minetest");
+ int top = lua_gettop(L);
+ bool ModInitializedSuccessfull = (*i)->Initialize(L,top);
+ assert(ModInitializedSuccessfull);
+ }
+
+ infostream << "SCRIPTAPI: initialized " << m_mod_api_modules->size()
+ << " modules" << std::endl;
+
+ // Get the main minetest table
+ lua_getglobal(L, "minetest");
+
+ // Add tables to minetest
+ lua_newtable(L);
+ lua_setfield(L, -2, "object_refs");
+
+ lua_newtable(L);
+ lua_setfield(L, -2, "luaentities");
+}
+
+ScriptApi::~ScriptApi() {
+ lua_close(getStack());
+}
+
+bool ScriptApi::scriptLoad(const char *path)
+{
+ lua_State* L = getStack();
+ setStack(0);
+
+ verbosestream<<"Loading and running script from "<<path<<std::endl;
+
+ lua_pushcfunction(L, script_ErrorHandler);
+ int errorhandler = lua_gettop(L);
+
+ int ret = luaL_loadfile(L, path) || lua_pcall(L, 0, 0, errorhandler);
+ if(ret){
+ errorstream<<"========== ERROR FROM LUA ==========="<<std::endl;
+ errorstream<<"Failed to load and run script from "<<std::endl;
+ errorstream<<path<<":"<<std::endl;
+ errorstream<<std::endl;
+ errorstream<<lua_tostring(L, -1)<<std::endl;
+ errorstream<<std::endl;
+ errorstream<<"=======END OF ERROR FROM LUA ========"<<std::endl;
+ lua_pop(L, 1); // Pop error message from stack
+ lua_pop(L, 1); // Pop the error handler from stack
+ return false;
+ }
+ lua_pop(L, 1); // Pop the error handler from stack
+ return true;
+}
+
+bool ScriptApi::registerModApiModule(ModApiBase* ptr) {
+ if (ScriptApi::m_mod_api_modules == 0)
+ ScriptApi::m_mod_api_modules = new std::vector<ModApiBase*>();
+
+ assert(ScriptApi::m_mod_api_modules != 0);
+
+ ScriptApi::m_mod_api_modules->push_back(ptr);
+
+ return true;
+}
+
+std::vector<ModApiBase*>* ScriptApi::m_mod_api_modules = 0;
diff --git a/src/script/cpp_api/scriptapi.h b/src/script/cpp_api/scriptapi.h
new file mode 100644
index 0000000000000000000000000000000000000000..bbd0bdda7c5738b02192dc70722f50556f2d4f56
--- /dev/null
+++ b/src/script/cpp_api/scriptapi.h
@@ -0,0 +1,82 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef SCRIPTAPI_H_
+#define SCRIPTAPI_H_
+
+#include <map>
+#include <set>
+#include <vector>
+
+#include "cpp_api/s_base.h"
+#include "cpp_api/s_player.h"
+#include "cpp_api/s_env.h"
+#include "cpp_api/s_node.h"
+#include "cpp_api/s_inventory.h"
+#include "cpp_api/s_entity.h"
+
+class ModApiBase;
+
+/*****************************************************************************/
+/* Scriptapi <-> Core Interface */
+/*****************************************************************************/
+
+class ScriptApi
+ : virtual public ScriptApiBase,
+ public ScriptApiPlayer,
+ public ScriptApiEnv,
+ public ScriptApiNode,
+ public ScriptApiDetached,
+ public ScriptApiEntity
+{
+public:
+ ScriptApi();
+ ScriptApi(Server* server);
+ ~ScriptApi();
+
+ // Returns true if script handled message
+ bool on_chat_message(const std::string &name, const std::string &message);
+
+ /* server */
+ void on_shutdown();
+
+ /* auth */
+ bool getAuth(const std::string &playername,
+ std::string *dst_password, std::set<std::string> *dst_privs);
+ void createAuth(const std::string &playername,
+ const std::string &password);
+ bool setPassword(const std::string &playername,
+ const std::string &password);
+
+ /** register a lua api module to scriptapi */
+ static bool registerModApiModule(ModApiBase* prototype);
+ /** load a mod **/
+ bool loadMod(const std::string &scriptpath,const std::string &modname);
+
+private:
+ void getAuthHandler();
+ void readPrivileges(int index,std::set<std::string> &result);
+
+ bool scriptLoad(const char *path);
+
+ static std::vector<ModApiBase*>* m_mod_api_modules;
+
+};
+
+#endif /* SCRIPTAPI_H_ */
diff --git a/src/script/lua_api/CMakeLists.txt b/src/script/lua_api/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..7610ce8f1d08fcb13d8307b2f0546425f9c258dd
--- /dev/null
+++ b/src/script/lua_api/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(SCRIPT_LUA_API_SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/l_base.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/l_craft.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/l_env.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/l_inventory.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/l_item.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/luaapi.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/l_nodemeta.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/l_nodetimer.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/l_noise.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/l_object.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/l_particles.cpp
+ PARENT_SCOPE)
diff --git a/src/script/lua_api/l_base.cpp b/src/script/lua_api/l_base.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b1766e6df6652e9c18aa0f0f5d792c4218894317
--- /dev/null
+++ b/src/script/lua_api/l_base.cpp
@@ -0,0 +1,63 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "cpp_api/scriptapi.h"
+#include "lua_api/l_base.h"
+#include "common/c_internal.h"
+#include "log.h"
+
+extern "C" {
+#include "lua.h"
+}
+
+ModApiBase::ModApiBase() {
+ ScriptApi::registerModApiModule(this);
+}
+
+Server* ModApiBase::getServer(lua_State* L) {
+ return get_scriptapi(L)->getServer();
+}
+
+Environment* ModApiBase::getEnv(lua_State* L) {
+ return get_scriptapi(L)->getEnv();
+}
+
+bool ModApiBase::registerFunction( lua_State* L,
+ const char* name,
+ lua_CFunction fct,
+ int top
+ ) {
+ //TODO check presence first!
+
+ lua_pushstring(L,name);
+ lua_pushcfunction(L,fct);
+ lua_settable(L, top);
+
+ return true;
+}
+
+struct EnumString es_BiomeTerrainType[] =
+{
+ {BIOME_TERRAIN_NORMAL, "normal"},
+ {BIOME_TERRAIN_LIQUID, "liquid"},
+ {BIOME_TERRAIN_NETHER, "nether"},
+ {BIOME_TERRAIN_AETHER, "aether"},
+ {BIOME_TERRAIN_FLAT, "flat"},
+ {0, NULL},
+};
diff --git a/src/script/lua_api/l_base.h b/src/script/lua_api/l_base.h
new file mode 100644
index 0000000000000000000000000000000000000000..f2e0d59a9ecfc55e542e4f84f27163c55f939eda
--- /dev/null
+++ b/src/script/lua_api/l_base.h
@@ -0,0 +1,63 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef L_BASE_H_
+#define L_BASE_H_
+
+#include "biome.h"
+#include "common/c_types.h"
+
+extern "C" {
+#include "lua.h"
+}
+
+extern struct EnumString es_BiomeTerrainType[];
+
+class ScriptApi;
+class Server;
+class Environment;
+
+typedef class ModApiBase {
+
+public:
+ ModApiBase();
+
+ virtual bool Initialize(lua_State* L, int top) = 0;
+ virtual ~ModApiBase() {};
+
+protected:
+ static Server* getServer( lua_State* L);
+ static Environment* getEnv( lua_State* L);
+ static bool registerFunction( lua_State* L,
+ const char* name,
+ lua_CFunction fct,
+ int top
+ );
+} ModApiBase;
+
+#if (defined(WIN32) || defined(_WIN32_WCE))
+#define NO_MAP_LOCK_REQUIRED
+#else
+#include "main.h"
+#include "profiler.h"
+#define NO_MAP_LOCK_REQUIRED ScopeProfiler nolocktime(g_profiler,"Scriptapi: unlockable time",SPT_ADD)
+//#define NO_ENVLOCK_REQUIRED assert(getServer(L).m_env_mutex.IsLocked() == false)
+#endif
+
+#endif /* L_BASE_H_ */
diff --git a/src/scriptapi_craft.cpp b/src/script/lua_api/l_craft.cpp
similarity index 86%
rename from src/scriptapi_craft.cpp
rename to src/script/lua_api/l_craft.cpp
index 459908237e84c10bcaae43d20f9599ace79426f3..a32fb9dffb7880a528cf3900e006a3c1d8b607fd 100644
--- a/src/scriptapi_craft.cpp
+++ b/src/script/lua_api/l_craft.cpp
@@ -17,20 +17,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "scriptapi.h"
-#include "scriptapi_craft.h"
+
+#include "lua_api/l_craft.h"
+#include "common/c_internal.h"
+#include "common/c_converter.h"
+#include "common/c_content.h"
+#include "server.h"
+#include "lua_api/l_item.h"
extern "C" {
-#include <lauxlib.h>
+#include "lauxlib.h"
}
-#include "script.h"
-#include "scriptapi_types.h"
-#include "scriptapi_common.h"
-#include "scriptapi_item.h"
+ModApiCraft::ModApiCraft()
+ : ModApiBase() {
+}
-struct EnumString es_CraftMethod[] =
+struct EnumString ModApiCraft::es_CraftMethod[] =
{
{CRAFT_METHOD_NORMAL, "normal"},
{CRAFT_METHOD_COOKING, "cooking"},
@@ -40,7 +44,7 @@ struct EnumString es_CraftMethod[] =
// helper for register_craft
-bool read_craft_recipe_shaped(lua_State *L, int index,
+bool ModApiCraft::readCraftRecipeShaped(lua_State *L, int index,
int &width, std::vector<std::string> &recipe)
{
if(index < 0)
@@ -81,7 +85,7 @@ bool read_craft_recipe_shaped(lua_State *L, int index,
}
// helper for register_craft
-bool read_craft_recipe_shapeless(lua_State *L, int index,
+bool ModApiCraft::readCraftRecipeShapeless(lua_State *L, int index,
std::vector<std::string> &recipe)
{
if(index < 0)
@@ -103,7 +107,7 @@ bool read_craft_recipe_shapeless(lua_State *L, int index,
}
// helper for register_craft
-bool read_craft_replacements(lua_State *L, int index,
+bool ModApiCraft::readCraftReplacements(lua_State *L, int index,
CraftReplacements &replacements)
{
if(index < 0)
@@ -135,15 +139,16 @@ bool read_craft_replacements(lua_State *L, int index,
return true;
}
// register_craft({output=item, recipe={{item00,item10},{item01,item11}})
-int l_register_craft(lua_State *L)
+int ModApiCraft::l_register_craft(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
//infostream<<"register_craft"<<std::endl;
luaL_checktype(L, 1, LUA_TTABLE);
int table = 1;
// Get the writable craft definition manager from the server
IWritableCraftDefManager *craftdef =
- get_server(L)->getWritableCraftDefManager();
+ getServer(L)->getWritableCraftDefManager();
std::string type = getstringfield_default(L, table, "type", "shaped");
@@ -161,7 +166,7 @@ int l_register_craft(lua_State *L)
if(lua_isnil(L, -1))
throw LuaError(L, "Crafting definition is missing a recipe"
" (output=\"" + output + "\")");
- if(!read_craft_recipe_shaped(L, -1, width, recipe))
+ if(!readCraftRecipeShaped(L, -1, width, recipe))
throw LuaError(L, "Invalid crafting recipe"
" (output=\"" + output + "\")");
@@ -169,7 +174,7 @@ int l_register_craft(lua_State *L)
lua_getfield(L, table, "replacements");
if(!lua_isnil(L, -1))
{
- if(!read_craft_replacements(L, -1, replacements))
+ if(!readCraftReplacements(L, -1, replacements))
throw LuaError(L, "Invalid replacements"
" (output=\"" + output + "\")");
}
@@ -193,7 +198,7 @@ int l_register_craft(lua_State *L)
throw LuaError(L, "Crafting definition (shapeless)"
" is missing a recipe"
" (output=\"" + output + "\")");
- if(!read_craft_recipe_shapeless(L, -1, recipe))
+ if(!readCraftRecipeShapeless(L, -1, recipe))
throw LuaError(L, "Invalid crafting recipe"
" (output=\"" + output + "\")");
@@ -201,7 +206,7 @@ int l_register_craft(lua_State *L)
lua_getfield(L, table, "replacements");
if(!lua_isnil(L, -1))
{
- if(!read_craft_replacements(L, -1, replacements))
+ if(!readCraftReplacements(L, -1, replacements))
throw LuaError(L, "Invalid replacements"
" (output=\"" + output + "\")");
}
@@ -242,7 +247,7 @@ int l_register_craft(lua_State *L)
lua_getfield(L, table, "replacements");
if(!lua_isnil(L, -1))
{
- if(!read_craft_replacements(L, -1, replacements))
+ if(!readCraftReplacements(L, -1, replacements))
throw LuaError(L, "Invalid replacements"
" (cooking output=\"" + output + "\")");
}
@@ -266,7 +271,7 @@ int l_register_craft(lua_State *L)
lua_getfield(L, table, "replacements");
if(!lua_isnil(L, -1))
{
- if(!read_craft_replacements(L, -1, replacements))
+ if(!readCraftReplacements(L, -1, replacements))
throw LuaError(L, "Invalid replacements"
" (fuel recipe=\"" + recipe + "\")");
}
@@ -285,8 +290,10 @@ int l_register_craft(lua_State *L)
}
// get_craft_result(input)
-int l_get_craft_result(lua_State *L)
+int ModApiCraft::l_get_craft_result(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
+
int input_i = 1;
std::string method_s = getstringfield_default(L, input_i, "method", "normal");
enum CraftMethod method = (CraftMethod)getenumfield(L, input_i, "method",
@@ -297,10 +304,10 @@ int l_get_craft_result(lua_State *L)
width = luaL_checkinteger(L, -1);
lua_pop(L, 1);
lua_getfield(L, input_i, "items");
- std::vector<ItemStack> items = read_items(L, -1);
+ std::vector<ItemStack> items = read_items(L, -1,getServer(L));
lua_pop(L, 1); // items
- IGameDef *gdef = get_server(L);
+ IGameDef *gdef = getServer(L);
ICraftDefManager *cdef = gdef->cdef();
CraftInput input(method, width, items);
CraftOutput output;
@@ -328,13 +335,15 @@ int l_get_craft_result(lua_State *L)
}
// get_craft_recipe(result item)
-int l_get_craft_recipe(lua_State *L)
+int ModApiCraft::l_get_craft_recipe(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
+
int k = 1;
int input_i = 1;
std::string o_item = luaL_checkstring(L,input_i);
- IGameDef *gdef = get_server(L);
+ IGameDef *gdef = getServer(L);
ICraftDefManager *cdef = gdef->cdef();
CraftInput input;
CraftOutput output(o_item,0);
@@ -379,10 +388,12 @@ int l_get_craft_recipe(lua_State *L)
}
// get_all_craft_recipes(result item)
-int l_get_all_craft_recipes(lua_State *L)
+int ModApiCraft::l_get_all_craft_recipes(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
+
std::string o_item = luaL_checkstring(L,1);
- IGameDef *gdef = get_server(L);
+ IGameDef *gdef = getServer(L);
ICraftDefManager *cdef = gdef->cdef();
CraftInput input;
CraftOutput output(o_item,0);
@@ -423,8 +434,8 @@ int l_get_all_craft_recipes(lua_State *L)
{
if (i->empty())
continue;
- lua_pushinteger(L, k);
- lua_pushstring(L, i->name.c_str());
+ lua_pushinteger(L,k);
+ lua_pushstring(L,i->name.c_str());
lua_settable(L, -3);
}
lua_setfield(L, -2, "items");
@@ -451,3 +462,16 @@ int l_get_all_craft_recipes(lua_State *L)
}
return 1;
}
+
+bool ModApiCraft::Initialize(lua_State* L, int top) {
+ bool retval = true;
+
+ retval &= API_FCT(get_all_craft_recipes);
+ retval &= API_FCT(get_craft_recipe);
+ retval &= API_FCT(get_craft_result);
+ retval &= API_FCT(register_craft);
+
+ return retval;
+}
+
+ModApiCraft modapicraft_prototype;
diff --git a/src/script/lua_api/l_craft.h b/src/script/lua_api/l_craft.h
new file mode 100644
index 0000000000000000000000000000000000000000..d8319199decb98d8a9b7fc09221bb0ebd427677b
--- /dev/null
+++ b/src/script/lua_api/l_craft.h
@@ -0,0 +1,52 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef L_CRAFT_H_
+#define L_CRAFT_H_
+
+#include <vector>
+
+extern "C" {
+#include <lua.h>
+}
+
+#include "lua_api/l_base.h"
+#include "craftdef.h"
+
+class ModApiCraft : public ModApiBase {
+public:
+ ModApiCraft();
+ bool Initialize(lua_State* L, int top);
+private:
+ static int l_register_craft(lua_State *L);
+ static int l_get_craft_recipe(lua_State *L);
+ static int l_get_all_craft_recipes(lua_State *L);
+ static int l_get_craft_result(lua_State *L);
+
+ static bool readCraftReplacements(lua_State *L, int index,
+ CraftReplacements &replacements);
+ static bool readCraftRecipeShapeless(lua_State *L, int index,
+ std::vector<std::string> &recipe);
+ static bool readCraftRecipeShaped(lua_State *L, int index,
+ int &width, std::vector<std::string> &recipe);
+
+ static struct EnumString es_CraftMethod[];
+};
+
+#endif /* L_CRAFT_H_ */
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..58cf337edf9a4760c7ac3c1abf97d75e6ee1bd16
--- /dev/null
+++ b/src/script/lua_api/l_env.cpp
@@ -0,0 +1,687 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include "cpp_api/scriptapi.h"
+#include "lua_api/l_base.h"
+#include "lua_api/l_env.h"
+#include "environment.h"
+#include "server.h"
+#include "daynightratio.h"
+#include "util/pointedthing.h"
+#include "content_sao.h"
+
+#include "common/c_converter.h"
+#include "common/c_content.h"
+#include "common/c_internal.h"
+#include "lua_api/l_nodemeta.h"
+#include "lua_api/l_nodetimer.h"
+#include "lua_api/l_noise.h"
+#include "treegen.h"
+#include "pathfinder.h"
+
+
+#define GET_ENV_PTR ServerEnvironment* env = \
+ dynamic_cast<ServerEnvironment*>(getEnv(L)); \
+ if( env == NULL) return 0
+
+void LuaABM::trigger(ServerEnvironment *env, v3s16 p, MapNode n,
+ u32 active_object_count, u32 active_object_count_wider)
+{
+ ScriptApi* scriptIface = SERVER_TO_SA(env);
+ scriptIface->realityCheck();
+
+ lua_State* L = scriptIface->getStack();
+ assert(lua_checkstack(L, 20));
+ StackUnroller stack_unroller(L);
+
+ // Get minetest.registered_abms
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "registered_abms");
+ luaL_checktype(L, -1, LUA_TTABLE);
+ int registered_abms = lua_gettop(L);
+
+ // Get minetest.registered_abms[m_id]
+ lua_pushnumber(L, m_id);
+ lua_gettable(L, registered_abms);
+ if(lua_isnil(L, -1))
+ assert(0);
+
+ // Call action
+ luaL_checktype(L, -1, LUA_TTABLE);
+ lua_getfield(L, -1, "action");
+ luaL_checktype(L, -1, LUA_TFUNCTION);
+ push_v3s16(L, p);
+ pushnode(L, n, env->getGameDef()->ndef());
+ lua_pushnumber(L, active_object_count);
+ lua_pushnumber(L, active_object_count_wider);
+ if(lua_pcall(L, 4, 0, 0))
+ script_error(L, "error: %s", lua_tostring(L, -1));
+}
+
+// Exported functions
+
+// minetest.set_node(pos, node)
+// pos = {x=num, y=num, z=num}
+int ModApiEnvMod::l_set_node(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ INodeDefManager *ndef = env->getGameDef()->ndef();
+ // parameters
+ v3s16 pos = read_v3s16(L, 1);
+ MapNode n = readnode(L, 2, ndef);
+ // Do it
+ bool succeeded = env->setNode(pos, n);
+ lua_pushboolean(L, succeeded);
+ return 1;
+}
+
+int ModApiEnvMod::l_add_node(lua_State *L)
+{
+ return l_set_node(L);
+}
+
+// minetest.remove_node(pos)
+// pos = {x=num, y=num, z=num}
+int ModApiEnvMod::l_remove_node(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // parameters
+ v3s16 pos = read_v3s16(L, 1);
+ // Do it
+ bool succeeded = env->removeNode(pos);
+ lua_pushboolean(L, succeeded);
+ return 1;
+}
+
+// minetest.get_node(pos)
+// pos = {x=num, y=num, z=num}
+int ModApiEnvMod::l_get_node(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // pos
+ v3s16 pos = read_v3s16(L, 1);
+ // Do it
+ MapNode n = env->getMap().getNodeNoEx(pos);
+ // Return node
+ pushnode(L, n, env->getGameDef()->ndef());
+ return 1;
+}
+
+// minetest.get_node_or_nil(pos)
+// pos = {x=num, y=num, z=num}
+int ModApiEnvMod::l_get_node_or_nil(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // pos
+ v3s16 pos = read_v3s16(L, 1);
+ // Do it
+ try{
+ MapNode n = env->getMap().getNode(pos);
+ // Return node
+ pushnode(L, n, env->getGameDef()->ndef());
+ return 1;
+ } catch(InvalidPositionException &e)
+ {
+ lua_pushnil(L);
+ return 1;
+ }
+}
+
+// minetest.get_node_light(pos, timeofday)
+// pos = {x=num, y=num, z=num}
+// timeofday: nil = current time, 0 = night, 0.5 = day
+int ModApiEnvMod::l_get_node_light(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // Do it
+ v3s16 pos = read_v3s16(L, 1);
+ u32 time_of_day = env->getTimeOfDay();
+ if(lua_isnumber(L, 2))
+ time_of_day = 24000.0 * lua_tonumber(L, 2);
+ time_of_day %= 24000;
+ u32 dnr = time_to_daynight_ratio(time_of_day, true);
+ try{
+ MapNode n = env->getMap().getNode(pos);
+ INodeDefManager *ndef = env->getGameDef()->ndef();
+ lua_pushinteger(L, n.getLightBlend(dnr, ndef));
+ return 1;
+ } catch(InvalidPositionException &e)
+ {
+ lua_pushnil(L);
+ return 1;
+ }
+}
+
+// minetest.place_node(pos, node)
+// pos = {x=num, y=num, z=num}
+int ModApiEnvMod::l_place_node(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ v3s16 pos = read_v3s16(L, 1);
+ MapNode n = readnode(L, 2, env->getGameDef()->ndef());
+
+ // Don't attempt to load non-loaded area as of now
+ MapNode n_old = env->getMap().getNodeNoEx(pos);
+ if(n_old.getContent() == CONTENT_IGNORE){
+ lua_pushboolean(L, false);
+ return 1;
+ }
+ // Create item to place
+ INodeDefManager *ndef = getServer(L)->ndef();
+ IItemDefManager *idef = getServer(L)->idef();
+ ItemStack item(ndef->get(n).name, 1, 0, "", idef);
+ // Make pointed position
+ PointedThing pointed;
+ pointed.type = POINTEDTHING_NODE;
+ pointed.node_abovesurface = pos;
+ pointed.node_undersurface = pos + v3s16(0,-1,0);
+ // Place it with a NULL placer (appears in Lua as a non-functional
+ // ObjectRef)
+ bool success = get_scriptapi(L)->item_OnPlace(item, NULL, pointed);
+ lua_pushboolean(L, success);
+ return 1;
+}
+
+// minetest.dig_node(pos)
+// pos = {x=num, y=num, z=num}
+int ModApiEnvMod::l_dig_node(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ v3s16 pos = read_v3s16(L, 1);
+
+ // Don't attempt to load non-loaded area as of now
+ MapNode n = env->getMap().getNodeNoEx(pos);
+ if(n.getContent() == CONTENT_IGNORE){
+ lua_pushboolean(L, false);
+ return 1;
+ }
+ // Dig it out with a NULL digger (appears in Lua as a
+ // non-functional ObjectRef)
+ bool success = get_scriptapi(L)->node_on_dig(pos, n, NULL);
+ lua_pushboolean(L, success);
+ return 1;
+}
+
+// minetest.punch_node(pos)
+// pos = {x=num, y=num, z=num}
+int ModApiEnvMod::l_punch_node(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ v3s16 pos = read_v3s16(L, 1);
+
+ // Don't attempt to load non-loaded area as of now
+ MapNode n = env->getMap().getNodeNoEx(pos);
+ if(n.getContent() == CONTENT_IGNORE){
+ lua_pushboolean(L, false);
+ return 1;
+ }
+ // Punch it with a NULL puncher (appears in Lua as a non-functional
+ // ObjectRef)
+ bool success = get_scriptapi(L)->node_on_punch(pos, n, NULL);
+ lua_pushboolean(L, success);
+ return 1;
+}
+
+// minetest.get_meta(pos)
+int ModApiEnvMod::l_get_meta(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // Do it
+ v3s16 p = read_v3s16(L, 1);
+ NodeMetaRef::create(L, p, env);
+ return 1;
+}
+
+// minetest.get_node_timer(pos)
+int ModApiEnvMod::l_get_node_timer(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // Do it
+ v3s16 p = read_v3s16(L, 1);
+ NodeTimerRef::create(L, p, env);
+ return 1;
+}
+
+// minetest.add_entity(pos, entityname) -> ObjectRef or nil
+// pos = {x=num, y=num, z=num}
+int ModApiEnvMod::l_add_entity(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // pos
+ v3f pos = checkFloatPos(L, 1);
+ // content
+ const char *name = luaL_checkstring(L, 2);
+ // Do it
+ ServerActiveObject *obj = new LuaEntitySAO(env, pos, name, "");
+ int objectid = env->addActiveObject(obj);
+ // If failed to add, return nothing (reads as nil)
+ if(objectid == 0)
+ return 0;
+ // Return ObjectRef
+ get_scriptapi(L)->objectrefGetOrCreate(obj);
+ return 1;
+}
+
+// minetest.add_item(pos, itemstack or itemstring or table) -> ObjectRef or nil
+// pos = {x=num, y=num, z=num}
+int ModApiEnvMod::l_add_item(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // pos
+ //v3f pos = checkFloatPos(L, 1);
+ // item
+ ItemStack item = read_item(L, 2,getServer(L));
+ if(item.empty() || !item.isKnown(getServer(L)->idef()))
+ return 0;
+ // Use minetest.spawn_item to spawn a __builtin:item
+ lua_getglobal(L, "minetest");
+ lua_getfield(L, -1, "spawn_item");
+ if(lua_isnil(L, -1))
+ return 0;
+ lua_pushvalue(L, 1);
+ lua_pushstring(L, item.getItemString().c_str());
+ if(lua_pcall(L, 2, 1, 0))
+ script_error(L, "error: %s", lua_tostring(L, -1));
+ return 1;
+ /*lua_pushvalue(L, 1);
+ lua_pushstring(L, "__builtin:item");
+ lua_pushstring(L, item.getItemString().c_str());
+ return l_add_entity(L);*/
+ /*// Do it
+ ServerActiveObject *obj = createItemSAO(env, pos, item.getItemString());
+ int objectid = env->addActiveObject(obj);
+ // If failed to add, return nothing (reads as nil)
+ if(objectid == 0)
+ return 0;
+ // Return ObjectRef
+ objectrefGetOrCreate(L, obj);
+ return 1;*/
+}
+
+// minetest.get_player_by_name(name)
+int ModApiEnvMod::l_get_player_by_name(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // Do it
+ const char *name = luaL_checkstring(L, 1);
+ Player *player = env->getPlayer(name);
+ if(player == NULL){
+ lua_pushnil(L);
+ return 1;
+ }
+ PlayerSAO *sao = player->getPlayerSAO();
+ if(sao == NULL){
+ lua_pushnil(L);
+ return 1;
+ }
+ // Put player on stack
+ get_scriptapi(L)->objectrefGetOrCreate(sao);
+ return 1;
+}
+
+// minetest.get_objects_inside_radius(pos, radius)
+int ModApiEnvMod::l_get_objects_inside_radius(lua_State *L)
+{
+ // Get the table insert function
+ lua_getglobal(L, "table");
+ lua_getfield(L, -1, "insert");
+ int table_insert = lua_gettop(L);
+
+ GET_ENV_PTR;
+
+ // Do it
+ v3f pos = checkFloatPos(L, 1);
+ float radius = luaL_checknumber(L, 2) * BS;
+ std::set<u16> ids = env->getObjectsInsideRadius(pos, radius);
+ lua_newtable(L);
+ int table = lua_gettop(L);
+ for(std::set<u16>::const_iterator
+ i = ids.begin(); i != ids.end(); i++){
+ ServerActiveObject *obj = env->getActiveObject(*i);
+ // Insert object reference into table
+ lua_pushvalue(L, table_insert);
+ lua_pushvalue(L, table);
+ get_scriptapi(L)->objectrefGetOrCreate(obj);
+ if(lua_pcall(L, 2, 0, 0))
+ script_error(L, "error: %s", lua_tostring(L, -1));
+ }
+ return 1;
+}
+
+// minetest.set_timeofday(val)
+// val = 0...1
+int ModApiEnvMod::l_set_timeofday(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // Do it
+ float timeofday_f = luaL_checknumber(L, 1);
+ assert(timeofday_f >= 0.0 && timeofday_f <= 1.0);
+ int timeofday_mh = (int)(timeofday_f * 24000.0);
+ // This should be set directly in the environment but currently
+ // such changes aren't immediately sent to the clients, so call
+ // the server instead.
+ //env->setTimeOfDay(timeofday_mh);
+ getServer(L)->setTimeOfDay(timeofday_mh);
+ return 0;
+}
+
+// minetest.get_timeofday() -> 0...1
+int ModApiEnvMod::l_get_timeofday(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ // Do it
+ int timeofday_mh = env->getTimeOfDay();
+ float timeofday_f = (float)timeofday_mh / 24000.0;
+ lua_pushnumber(L, timeofday_f);
+ return 1;
+}
+
+
+// minetest.find_node_near(pos, radius, nodenames) -> pos or nil
+// nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
+int ModApiEnvMod::l_find_node_near(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ INodeDefManager *ndef = getServer(L)->ndef();
+ v3s16 pos = read_v3s16(L, 1);
+ int radius = luaL_checkinteger(L, 2);
+ std::set<content_t> filter;
+ if(lua_istable(L, 3)){
+ int table = 3;
+ lua_pushnil(L);
+ while(lua_next(L, table) != 0){
+ // key at index -2 and value at index -1
+ luaL_checktype(L, -1, LUA_TSTRING);
+ ndef->getIds(lua_tostring(L, -1), filter);
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ } else if(lua_isstring(L, 3)){
+ ndef->getIds(lua_tostring(L, 3), filter);
+ }
+
+ for(int d=1; d<=radius; d++){
+ std::list<v3s16> list;
+ getFacePositions(list, d);
+ for(std::list<v3s16>::iterator i = list.begin();
+ i != list.end(); ++i){
+ v3s16 p = pos + (*i);
+ content_t c = env->getMap().getNodeNoEx(p).getContent();
+ if(filter.count(c) != 0){
+ push_v3s16(L, p);
+ return 1;
+ }
+ }
+ }
+ return 0;
+}
+
+// minetest.find_nodes_in_area(minp, maxp, nodenames) -> list of positions
+// nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
+int ModApiEnvMod::l_find_nodes_in_area(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ INodeDefManager *ndef = getServer(L)->ndef();
+ v3s16 minp = read_v3s16(L, 1);
+ v3s16 maxp = read_v3s16(L, 2);
+ std::set<content_t> filter;
+ if(lua_istable(L, 3)){
+ int table = 3;
+ lua_pushnil(L);
+ while(lua_next(L, table) != 0){
+ // key at index -2 and value at index -1
+ luaL_checktype(L, -1, LUA_TSTRING);
+ ndef->getIds(lua_tostring(L, -1), filter);
+ // removes value, keeps key for next iteration
+ lua_pop(L, 1);
+ }
+ } else if(lua_isstring(L, 3)){
+ ndef->getIds(lua_tostring(L, 3), filter);
+ }
+
+ // Get the table insert function
+ lua_getglobal(L, "table");
+ lua_getfield(L, -1, "insert");
+ int table_insert = lua_gettop(L);
+
+ lua_newtable(L);
+ int table = lua_gettop(L);
+ for(s16 x=minp.X; x<=maxp.X; x++)
+ for(s16 y=minp.Y; y<=maxp.Y; y++)
+ for(s16 z=minp.Z; z<=maxp.Z; z++)
+ {
+ v3s16 p(x,y,z);
+ content_t c = env->getMap().getNodeNoEx(p).getContent();
+ if(filter.count(c) != 0){
+ lua_pushvalue(L, table_insert);
+ lua_pushvalue(L, table);
+ push_v3s16(L, p);
+ if(lua_pcall(L, 2, 0, 0))
+ script_error(L, "error: %s", lua_tostring(L, -1));
+ }
+ }
+ return 1;
+}
+
+// minetest.get_perlin(seeddiff, octaves, persistence, scale)
+// returns world-specific PerlinNoise
+int ModApiEnvMod::l_get_perlin(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ int seeddiff = luaL_checkint(L, 1);
+ int octaves = luaL_checkint(L, 2);
+ float persistence = luaL_checknumber(L, 3);
+ float scale = luaL_checknumber(L, 4);
+
+ LuaPerlinNoise *n = new LuaPerlinNoise(seeddiff + int(env->getServerMap().getSeed()), octaves, persistence, scale);
+ *(void **)(lua_newuserdata(L, sizeof(void *))) = n;
+ luaL_getmetatable(L, "PerlinNoise");
+ lua_setmetatable(L, -2);
+ return 1;
+}
+
+// minetest.get_perlin_map(noiseparams, size)
+// returns world-specific PerlinNoiseMap
+int ModApiEnvMod::l_get_perlin_map(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ NoiseParams *np = read_noiseparams(L, 1);
+ if (!np)
+ return 0;
+ v3s16 size = read_v3s16(L, 2);
+
+ int seed = (int)(env->getServerMap().getSeed());
+ LuaPerlinNoiseMap *n = new LuaPerlinNoiseMap(np, seed, size);
+ *(void **)(lua_newuserdata(L, sizeof(void *))) = n;
+ luaL_getmetatable(L, "PerlinNoiseMap");
+ lua_setmetatable(L, -2);
+ return 1;
+}
+
+// minetest.clear_objects()
+// clear all objects in the environment
+int ModApiEnvMod::l_clear_objects(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ env->clearAllObjects();
+ return 0;
+}
+
+// minetest.line_of_sight(pos1, pos2, stepsize) -> true/false
+int ModApiEnvMod::l_line_of_sight(lua_State *L) {
+ float stepsize = 1.0;
+
+ GET_ENV_PTR;
+
+ // read position 1 from lua
+ v3f pos1 = checkFloatPos(L, 2);
+ // read position 2 from lua
+ v3f pos2 = checkFloatPos(L, 2);
+ //read step size from lua
+ if(lua_isnumber(L, 3))
+ stepsize = lua_tonumber(L, 3);
+
+ return (env->line_of_sight(pos1,pos2,stepsize));
+}
+
+// minetest.find_path(pos1, pos2, searchdistance,
+// max_jump, max_drop, algorithm) -> table containing path
+int ModApiEnvMod::l_find_path(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ v3s16 pos1 = read_v3s16(L, 2);
+ v3s16 pos2 = read_v3s16(L, 3);
+ unsigned int searchdistance = luaL_checkint(L, 4);
+ unsigned int max_jump = luaL_checkint(L, 5);
+ unsigned int max_drop = luaL_checkint(L, 6);
+ algorithm algo = A_PLAIN_NP;
+ if(! lua_isnil(L, 7)) {
+ std::string algorithm = luaL_checkstring(L,7);
+
+ if (algorithm == "A*")
+ algo = A_PLAIN;
+
+ if (algorithm == "Dijkstra")
+ algo = DIJKSTRA;
+ }
+
+ std::vector<v3s16> path =
+ get_Path(env,pos1,pos2,searchdistance,max_jump,max_drop,algo);
+
+ if (path.size() > 0)
+ {
+ lua_newtable(L);
+ int top = lua_gettop(L);
+ unsigned int index = 1;
+ for (std::vector<v3s16>::iterator i = path.begin(); i != path.end();i++)
+ {
+ lua_pushnumber(L,index);
+ push_v3s16(L, *i);
+ lua_settable(L, top);
+ index++;
+ }
+ return 1;
+ }
+
+ return 0;
+}
+
+// minetest.spawn_tree(pos, treedef)
+int ModApiEnvMod::l_spawn_tree(lua_State *L)
+{
+ GET_ENV_PTR;
+
+ v3s16 p0 = read_v3s16(L, 1);
+
+ treegen::TreeDef tree_def;
+ std::string trunk,leaves,fruit;
+ INodeDefManager *ndef = env->getGameDef()->ndef();
+
+ if(lua_istable(L, 2))
+ {
+ getstringfield(L, 2, "axiom", tree_def.initial_axiom);
+ getstringfield(L, 2, "rules_a", tree_def.rules_a);
+ getstringfield(L, 2, "rules_b", tree_def.rules_b);
+ getstringfield(L, 2, "rules_c", tree_def.rules_c);
+ getstringfield(L, 2, "rules_d", tree_def.rules_d);
+ getstringfield(L, 2, "trunk", trunk);
+ tree_def.trunknode=ndef->getId(trunk);
+ getstringfield(L, 2, "leaves", leaves);
+ tree_def.leavesnode=ndef->getId(leaves);
+ tree_def.leaves2_chance=0;
+ getstringfield(L, 2, "leaves2", leaves);
+ if (leaves !="")
+ {
+ tree_def.leaves2node=ndef->getId(leaves);
+ getintfield(L, 2, "leaves2_chance", tree_def.leaves2_chance);
+ }
+ getintfield(L, 2, "angle", tree_def.angle);
+ getintfield(L, 2, "iterations", tree_def.iterations);
+ getintfield(L, 2, "random_level", tree_def.iterations_random_level);
+ getstringfield(L, 2, "trunk_type", tree_def.trunk_type);
+ getboolfield(L, 2, "thin_branches", tree_def.thin_branches);
+ tree_def.fruit_chance=0;
+ getstringfield(L, 2, "fruit", fruit);
+ if (fruit != "")
+ {
+ tree_def.fruitnode=ndef->getId(fruit);
+ getintfield(L, 2, "fruit_chance",tree_def.fruit_chance);
+ }
+ getintfield(L, 2, "seed", tree_def.seed);
+ }
+ else
+ return 0;
+ treegen::spawn_ltree (env, p0, ndef, tree_def);
+ return 1;
+}
+
+bool ModApiEnvMod::Initialize(lua_State *L,int top)
+{
+
+ bool retval = true;
+
+ retval &= API_FCT(set_node);
+ retval &= API_FCT(add_node);
+ retval &= API_FCT(add_item);
+ retval &= API_FCT(remove_node);
+ retval &= API_FCT(get_node);
+ retval &= API_FCT(get_node_or_nil);
+ retval &= API_FCT(get_node_light);
+ retval &= API_FCT(place_node);
+ retval &= API_FCT(dig_node);
+ retval &= API_FCT(punch_node);
+ retval &= API_FCT(add_entity);
+ retval &= API_FCT(get_meta);
+ retval &= API_FCT(get_node_timer);
+ retval &= API_FCT(get_player_by_name);
+ retval &= API_FCT(get_objects_inside_radius);
+ retval &= API_FCT(set_timeofday);
+ retval &= API_FCT(get_timeofday);
+ retval &= API_FCT(find_node_near);
+ retval &= API_FCT(find_nodes_in_area);
+ retval &= API_FCT(get_perlin);
+ retval &= API_FCT(get_perlin_map);
+ retval &= API_FCT(clear_objects);
+ retval &= API_FCT(spawn_tree);
+
+ return retval;
+}
+
+ModApiEnvMod modapienv_prototype;
diff --git a/src/scriptapi_env.h b/src/script/lua_api/l_env.h
similarity index 51%
rename from src/scriptapi_env.h
rename to src/script/lua_api/l_env.h
index 2b7ea95737b18d2290354d41ba1cc0e03b845009..61ecaecc852095ca7340ff6e68f90278e029c574 100644
--- a/src/scriptapi_env.h
+++ b/src/script/lua_api/l_env.h
@@ -1,5 +1,5 @@
/*
-Minetest-c55
+Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LUA_ENVIRONMENT_H_
-#define LUA_ENVIRONMENT_H_
+#ifndef L_ENV_H_
+#define L_ENV_H_
extern "C" {
#include <lua.h>
@@ -26,145 +26,147 @@ extern "C" {
}
#include "environment.h"
+#include "lua_api/l_base.h"
-/*
- EnvRef
-*/
-
-class EnvRef
+class ModApiEnvMod
+ :public ModApiBase
{
private:
- ServerEnvironment *m_env;
-
- static const char className[];
- static const luaL_reg methods[];
-
- static int gc_object(lua_State *L) ;
-
- static EnvRef *checkobject(lua_State *L, int narg);
-
- // Exported functions
-
- // EnvRef:set_node(pos, node)
+ // minetest.set_node(pos, node)
// pos = {x=num, y=num, z=num}
static int l_set_node(lua_State *L);
static int l_add_node(lua_State *L);
- // EnvRef:remove_node(pos)
+ // minetest.remove_node(pos)
// pos = {x=num, y=num, z=num}
static int l_remove_node(lua_State *L);
- // EnvRef:get_node(pos)
+ // minetest.get_node(pos)
// pos = {x=num, y=num, z=num}
static int l_get_node(lua_State *L);
- // EnvRef:get_node_or_nil(pos)
+ // minetest.get_node_or_nil(pos)
// pos = {x=num, y=num, z=num}
static int l_get_node_or_nil(lua_State *L);
- // EnvRef:get_node_light(pos, timeofday)
+ // minetest.get_node_light(pos, timeofday)
// pos = {x=num, y=num, z=num}
// timeofday: nil = current time, 0 = night, 0.5 = day
static int l_get_node_light(lua_State *L);
- // EnvRef:place_node(pos, node)
+ // minetest.place_node(pos, node)
// pos = {x=num, y=num, z=num}
static int l_place_node(lua_State *L);
- // EnvRef:dig_node(pos)
+ // minetest.dig_node(pos)
// pos = {x=num, y=num, z=num}
static int l_dig_node(lua_State *L);
- // EnvRef:punch_node(pos)
+ // minetest.punch_node(pos)
// pos = {x=num, y=num, z=num}
static int l_punch_node(lua_State *L);
- // EnvRef:get_meta(pos)
+ // minetest.get_meta(pos)
static int l_get_meta(lua_State *L);
- // EnvRef:get_node_timer(pos)
+ // minetest.get_node_timer(pos)
static int l_get_node_timer(lua_State *L);
- // EnvRef:add_entity(pos, entityname) -> ObjectRef or nil
+ // minetest.add_entity(pos, entityname) -> ObjectRef or nil
// pos = {x=num, y=num, z=num}
static int l_add_entity(lua_State *L);
- // EnvRef:add_item(pos, itemstack or itemstring or table) -> ObjectRef or nil
+ // minetest.add_item(pos, itemstack or itemstring or table) -> ObjectRef or nil
// pos = {x=num, y=num, z=num}
static int l_add_item(lua_State *L);
- // EnvRef:add_rat(pos)
- // pos = {x=num, y=num, z=num}
- static int l_add_rat(lua_State *L);
-
- // EnvRef:add_firefly(pos)
- // pos = {x=num, y=num, z=num}
- static int l_add_firefly(lua_State *L);
-
- // EnvRef:get_player_by_name(name)
+ // minetest.get_player_by_name(name)
static int l_get_player_by_name(lua_State *L);
- // EnvRef:get_objects_inside_radius(pos, radius)
+ // minetest.get_objects_inside_radius(pos, radius)
static int l_get_objects_inside_radius(lua_State *L);
- // EnvRef:set_timeofday(val)
+ // minetest.set_timeofday(val)
// val = 0...1
static int l_set_timeofday(lua_State *L);
- // EnvRef:get_timeofday() -> 0...1
+ // minetest.get_timeofday() -> 0...1
static int l_get_timeofday(lua_State *L);
- // EnvRef:find_node_near(pos, radius, nodenames) -> pos or nil
+ // minetest.find_node_near(pos, radius, nodenames) -> pos or nil
// nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
static int l_find_node_near(lua_State *L);
- // EnvRef:find_nodes_in_area(minp, maxp, nodenames) -> list of positions
+ // minetest.find_nodes_in_area(minp, maxp, nodenames) -> list of positions
// nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
static int l_find_nodes_in_area(lua_State *L);
- // EnvRef:get_perlin(seeddiff, octaves, persistence, scale)
- // returns world-specific PerlinNoise
+ // minetest.get_perlin(seeddiff, octaves, persistence, scale)
+ // returns world-specific PerlinNoise
static int l_get_perlin(lua_State *L);
- // EnvRef:get_perlin_map(noiseparams, size)
- // returns world-specific PerlinNoiseMap
+ // minetest.get_perlin_map(noiseparams, size)
+ // returns world-specific PerlinNoiseMap
static int l_get_perlin_map(lua_State *L);
- // EnvRef:clear_objects()
+ // minetest.clear_objects()
// clear all objects in the environment
static int l_clear_objects(lua_State *L);
+ // minetest.spawn_tree(pos, treedef)
static int l_spawn_tree(lua_State *L);
-
+ // minetest.line_of_sight(pos1, pos2, stepsize) -> true/false
static int l_line_of_sight(lua_State *L);
- //find a path between two positions
+ // minetest.find_path(pos1, pos2, searchdistance,
+ // max_jump, max_drop, algorithm) -> table containing path
static int l_find_path(lua_State *L);
public:
- EnvRef(ServerEnvironment *env);
-
- ~EnvRef();
-
- // Creates an EnvRef and leaves it on top of stack
- // Not callable from Lua; all references are created on the C side.
- static void create(lua_State *L, ServerEnvironment *env);
+ bool Initialize(lua_State *L, int top);
+};
- static void set_null(lua_State *L);
+class LuaABM : public ActiveBlockModifier
+{
+private:
+ int m_id;
- static void Register(lua_State *L);
+ std::set<std::string> m_trigger_contents;
+ std::set<std::string> m_required_neighbors;
+ float m_trigger_interval;
+ u32 m_trigger_chance;
+public:
+ LuaABM(lua_State *L, int id,
+ const std::set<std::string> &trigger_contents,
+ const std::set<std::string> &required_neighbors,
+ float trigger_interval, u32 trigger_chance):
+ m_id(id),
+ m_trigger_contents(trigger_contents),
+ m_required_neighbors(required_neighbors),
+ m_trigger_interval(trigger_interval),
+ m_trigger_chance(trigger_chance)
+ {
+ }
+ virtual std::set<std::string> getTriggerContents()
+ {
+ return m_trigger_contents;
+ }
+ virtual std::set<std::string> getRequiredNeighbors()
+ {
+ return m_required_neighbors;
+ }
+ virtual float getTriggerInterval()
+ {
+ return m_trigger_interval;
+ }
+ virtual u32 getTriggerChance()
+ {
+ return m_trigger_chance;
+ }
+ virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n,
+ u32 active_object_count, u32 active_object_count_wider);
};
-/*****************************************************************************/
-/* Minetest interface */
-/*****************************************************************************/
-// On environment step
-void scriptapi_environment_step(lua_State *L, float dtime);
-// After generating a piece of map
-void scriptapi_environment_on_generated(lua_State *L, v3s16 minp, v3s16 maxp,
- u32 blockseed);
-void scriptapi_add_environment(lua_State *L, ServerEnvironment *env);
-
-#endif /* LUA_ENVIRONMENT_H_ */
+#endif /* L_ENV_H_ */
diff --git a/src/scriptapi_inventory.cpp b/src/script/lua_api/l_inventory.cpp
similarity index 52%
rename from src/scriptapi_inventory.cpp
rename to src/script/lua_api/l_inventory.cpp
index bb40748dbd622544b3e10fc56d6ee700dd019f4e..1404c3c8a026fcbf00ca6c57506f1cda50aeab8b 100644
--- a/src/scriptapi_inventory.cpp
+++ b/src/script/lua_api/l_inventory.cpp
@@ -17,17 +17,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "scriptapi.h"
-#include "scriptapi_inventory.h"
+#include "cpp_api/scriptapi.h"
+#include "common/c_converter.h"
+#include "common/c_content.h"
+#include "lua_api/l_inventory.h"
+#include "lua_api/l_item.h"
+#include "common/c_internal.h"
#include "server.h"
-#include "script.h"
#include "log.h"
-#include "scriptapi_types.h"
-#include "scriptapi_common.h"
-#include "scriptapi_inventory.h"
-#include "scriptapi_item.h"
-#include "scriptapi_object.h"
-
+#include "inventorymanager.h"
/*
InvRef
@@ -42,12 +40,13 @@ InvRef* InvRef::checkobject(lua_State *L, int narg)
Inventory* InvRef::getinv(lua_State *L, InvRef *ref)
{
- return get_server(L)->getInventory(ref->m_loc);
+ return STACK_TO_SERVER(L)->getInventory(ref->m_loc);
}
InventoryList* InvRef::getlist(lua_State *L, InvRef *ref,
const char *listname)
{
+ NO_MAP_LOCK_REQUIRED;
Inventory *inv = getinv(L, ref);
if(!inv)
return NULL;
@@ -57,7 +56,7 @@ InventoryList* InvRef::getlist(lua_State *L, InvRef *ref,
void InvRef::reportInventoryChange(lua_State *L, InvRef *ref)
{
// Inform other things that the inventory has changed
- get_server(L)->setInventoryModified(ref->m_loc);
+ STACK_TO_SERVER(L)->setInventoryModified(ref->m_loc);
}
// Exported functions
@@ -72,6 +71,7 @@ int InvRef::gc_object(lua_State *L) {
// is_empty(self, listname) -> true/false
int InvRef::l_is_empty(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
InventoryList *list = getlist(L, ref, listname);
@@ -86,6 +86,7 @@ int InvRef::l_is_empty(lua_State *L)
// get_size(self, listname)
int InvRef::l_get_size(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
InventoryList *list = getlist(L, ref, listname);
@@ -100,6 +101,7 @@ int InvRef::l_get_size(lua_State *L)
// get_width(self, listname)
int InvRef::l_get_width(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
InventoryList *list = getlist(L, ref, listname);
@@ -114,6 +116,7 @@ int InvRef::l_get_width(lua_State *L)
// set_size(self, listname, size)
int InvRef::l_set_size(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
int newsize = luaL_checknumber(L, 3);
@@ -136,6 +139,7 @@ int InvRef::l_set_size(lua_State *L)
// set_width(self, listname, size)
int InvRef::l_set_width(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
int newwidth = luaL_checknumber(L, 3);
@@ -153,6 +157,7 @@ int InvRef::l_set_width(lua_State *L)
// get_stack(self, listname, i) -> itemstack
int InvRef::l_get_stack(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
int i = luaL_checknumber(L, 3) - 1;
@@ -167,10 +172,11 @@ int InvRef::l_get_stack(lua_State *L)
// set_stack(self, listname, i, stack) -> true/false
int InvRef::l_set_stack(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
int i = luaL_checknumber(L, 3) - 1;
- ItemStack newitem = read_item(L, 4);
+ ItemStack newitem = read_item(L, 4,STACK_TO_SERVER(L));
InventoryList *list = getlist(L, ref, listname);
if(list != NULL && i >= 0 && i < (int) list->getSize()){
list->changeItem(i, newitem);
@@ -185,25 +191,27 @@ int InvRef::l_set_stack(lua_State *L)
// get_list(self, listname) -> list or nil
int InvRef::l_get_list(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
Inventory *inv = getinv(L, ref);
- inventory_get_list_to_lua(inv, listname, L);
+ push_inventory_list(inv, listname, L);
return 1;
}
// set_list(self, listname, list)
int InvRef::l_set_list(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
Inventory *inv = getinv(L, ref);
InventoryList *list = inv->getList(listname);
if(list)
- inventory_set_list_from_lua(inv, listname, L, 3,
- list->getSize());
+ read_inventory_list(inv, listname, L, 3,
+ STACK_TO_SERVER(L),list->getSize());
else
- inventory_set_list_from_lua(inv, listname, L, 3);
+ read_inventory_list(inv, listname, L, 3,STACK_TO_SERVER(L));
reportInventoryChange(L, ref);
return 0;
}
@@ -212,9 +220,10 @@ int InvRef::l_set_list(lua_State *L)
// Returns the leftover stack
int InvRef::l_add_item(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
- ItemStack item = read_item(L, 3);
+ ItemStack item = read_item(L, 3,STACK_TO_SERVER(L));
InventoryList *list = getlist(L, ref, listname);
if(list){
ItemStack leftover = list->addItem(item);
@@ -231,9 +240,10 @@ int InvRef::l_add_item(lua_State *L)
// Returns true if the item completely fits into the list
int InvRef::l_room_for_item(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
- ItemStack item = read_item(L, 3);
+ ItemStack item = read_item(L, 3,STACK_TO_SERVER(L));
InventoryList *list = getlist(L, ref, listname);
if(list){
lua_pushboolean(L, list->roomForItem(item));
@@ -247,9 +257,10 @@ int InvRef::l_room_for_item(lua_State *L)
// Returns true if the list contains the given count of the given item name
int InvRef::l_contains_item(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
- ItemStack item = read_item(L, 3);
+ ItemStack item = read_item(L, 3, STACK_TO_SERVER(L));
InventoryList *list = getlist(L, ref, listname);
if(list){
lua_pushboolean(L, list->containsItem(item));
@@ -263,9 +274,10 @@ int InvRef::l_contains_item(lua_State *L)
// Returns the items that were actually removed
int InvRef::l_remove_item(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const char *listname = luaL_checkstring(L, 2);
- ItemStack item = read_item(L, 3);
+ ItemStack item = read_item(L, 3,STACK_TO_SERVER(L));
InventoryList *list = getlist(L, ref, listname);
if(list){
ItemStack removed = list->removeItem(item);
@@ -281,6 +293,7 @@ int InvRef::l_remove_item(lua_State *L)
// get_location() -> location (like minetest.get_inventory(location))
int InvRef::l_get_location(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *ref = checkobject(L, 1);
const InventoryLocation &loc = ref->m_loc;
switch(loc.type){
@@ -293,10 +306,10 @@ int InvRef::l_get_location(lua_State *L)
return 1;
case InventoryLocation::NODEMETA:
lua_newtable(L);
- lua_pushstring(L, "nodemeta");
+ lua_pushstring(L, "node");
lua_setfield(L, -2, "type");
push_v3s16(L, loc.p);
- lua_setfield(L, -2, "name");
+ lua_setfield(L, -2, "pos");
return 1;
case InventoryLocation::DETACHED:
lua_newtable(L);
@@ -329,6 +342,7 @@ InvRef::~InvRef()
// Not callable from Lua; all references are created on the C side.
void InvRef::create(lua_State *L, const InventoryLocation &loc)
{
+ NO_MAP_LOCK_REQUIRED;
InvRef *o = new InvRef(loc);
*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
luaL_getmetatable(L, className);
@@ -336,6 +350,7 @@ void InvRef::create(lua_State *L, const InventoryLocation &loc)
}
void InvRef::createPlayer(lua_State *L, Player *player)
{
+ NO_MAP_LOCK_REQUIRED;
InventoryLocation loc;
loc.setPlayer(player->getName());
create(L, loc);
@@ -394,328 +409,48 @@ const luaL_reg InvRef::methods[] = {
{0,0}
};
-void inventory_get_list_to_lua(Inventory *inv, const char *name,
- lua_State *L)
-{
- InventoryList *invlist = inv->getList(name);
- if(invlist == NULL){
- lua_pushnil(L);
- return;
- }
- std::vector<ItemStack> items;
- for(u32 i=0; i<invlist->getSize(); i++)
- items.push_back(invlist->getItem(i));
- push_items(L, items);
-}
-
-void inventory_set_list_from_lua(Inventory *inv, const char *name,
- lua_State *L, int tableindex, int forcesize)
-{
- if(tableindex < 0)
- tableindex = lua_gettop(L) + 1 + tableindex;
- // If nil, delete list
- if(lua_isnil(L, tableindex)){
- inv->deleteList(name);
- return;
- }
- // Otherwise set list
- std::vector<ItemStack> items = read_items(L, tableindex);
- int listsize = (forcesize != -1) ? forcesize : items.size();
- InventoryList *invlist = inv->addList(name, listsize);
- int index = 0;
- for(std::vector<ItemStack>::const_iterator
- i = items.begin(); i != items.end(); i++){
- if(forcesize != -1 && index == forcesize)
- break;
- invlist->changeItem(index, *i);
- index++;
- }
- while(forcesize != -1 && index < forcesize){
- invlist->deleteItem(index);
- index++;
- }
-}
-
// get_inventory(location)
-int l_get_inventory(lua_State *L)
+int ModApiInventory::l_get_inventory(lua_State *L)
{
InventoryLocation loc;
std::string type = checkstringfield(L, 1, "type");
- if(type == "player"){
- std::string name = checkstringfield(L, 1, "name");
- loc.setPlayer(name);
- } else if(type == "node"){
+
+ if(type == "node"){
lua_getfield(L, 1, "pos");
v3s16 pos = check_v3s16(L, -1);
loc.setNodeMeta(pos);
- } else if(type == "detached"){
- std::string name = checkstringfield(L, 1, "name");
- loc.setDetached(name);
- }
- if(get_server(L)->getInventory(loc) != NULL)
- InvRef::create(L, loc);
- else
- lua_pushnil(L);
- return 1;
-}
-
-/*
- Detached inventory callbacks
-*/
-
-// Retrieves minetest.detached_inventories[name][callbackname]
-// If that is nil or on error, return false and stack is unchanged
-// If that is a function, returns true and pushes the
-// function onto the stack
-static bool get_detached_inventory_callback(lua_State *L,
- const std::string &name, const char *callbackname)
-{
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "detached_inventories");
- lua_remove(L, -2);
- luaL_checktype(L, -1, LUA_TTABLE);
- lua_getfield(L, -1, name.c_str());
- lua_remove(L, -2);
- // Should be a table
- if(lua_type(L, -1) != LUA_TTABLE)
- {
- errorstream<<"Item \""<<name<<"\" not defined"<<std::endl;
- lua_pop(L, 1);
- return false;
- }
- lua_getfield(L, -1, callbackname);
- lua_remove(L, -2);
- // Should be a function or nil
- if(lua_type(L, -1) == LUA_TFUNCTION)
- {
- return true;
- }
- else if(lua_isnil(L, -1))
- {
- lua_pop(L, 1);
- return false;
- }
- else
- {
- errorstream<<"Detached inventory \""<<name<<"\" callback \""
- <<callbackname<<"\" is not a function"<<std::endl;
- lua_pop(L, 1);
- return false;
+ if(getServer(L)->getInventory(loc) != NULL)
+ InvRef::create(L, loc);
+ else
+ lua_pushnil(L);
+ return 1;
+ } else {
+ NO_MAP_LOCK_REQUIRED;
+ if(type == "player"){
+ std::string name = checkstringfield(L, 1, "name");
+ loc.setPlayer(name);
+ } else if(type == "detached"){
+ std::string name = checkstringfield(L, 1, "name");
+ loc.setDetached(name);
+ }
+
+ if(getServer(L)->getInventory(loc) != NULL)
+ InvRef::create(L, loc);
+ else
+ lua_pushnil(L);
+ return 1;
+ // END NO_MAP_LOCK_REQUIRED;
}
}
-// Return number of accepted items to be moved
-int scriptapi_detached_inventory_allow_move(lua_State *L,
- const std::string &name,
- const std::string &from_list, int from_index,
- const std::string &to_list, int to_index,
- int count, ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Push callback function on stack
- if(!get_detached_inventory_callback(L, name, "allow_move"))
- return count;
-
- // function(inv, from_list, from_index, to_list, to_index, count, player)
- // inv
- InventoryLocation loc;
- loc.setDetached(name);
- InvRef::create(L, loc);
- // from_list
- lua_pushstring(L, from_list.c_str());
- // from_index
- lua_pushinteger(L, from_index + 1);
- // to_list
- lua_pushstring(L, to_list.c_str());
- // to_index
- lua_pushinteger(L, to_index + 1);
- // count
- lua_pushinteger(L, count);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 7, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- if(!lua_isnumber(L, -1))
- throw LuaError(L, "allow_move should return a number");
- return luaL_checkinteger(L, -1);
-}
-
-// Return number of accepted items to be put
-int scriptapi_detached_inventory_allow_put(lua_State *L,
- const std::string &name,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Push callback function on stack
- if(!get_detached_inventory_callback(L, name, "allow_put"))
- return stack.count; // All will be accepted
-
- // Call function(inv, listname, index, stack, player)
- // inv
- InventoryLocation loc;
- loc.setDetached(name);
- InvRef::create(L, loc);
- // listname
- lua_pushstring(L, listname.c_str());
- // index
- lua_pushinteger(L, index + 1);
- // stack
- LuaItemStack::create(L, stack);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 5, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- if(!lua_isnumber(L, -1))
- throw LuaError(L, "allow_put should return a number");
- return luaL_checkinteger(L, -1);
-}
-
-// Return number of accepted items to be taken
-int scriptapi_detached_inventory_allow_take(lua_State *L,
- const std::string &name,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Push callback function on stack
- if(!get_detached_inventory_callback(L, name, "allow_take"))
- return stack.count; // All will be accepted
-
- // Call function(inv, listname, index, stack, player)
- // inv
- InventoryLocation loc;
- loc.setDetached(name);
- InvRef::create(L, loc);
- // listname
- lua_pushstring(L, listname.c_str());
- // index
- lua_pushinteger(L, index + 1);
- // stack
- LuaItemStack::create(L, stack);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 5, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- if(!lua_isnumber(L, -1))
- throw LuaError(L, "allow_take should return a number");
- return luaL_checkinteger(L, -1);
-}
-
-// Report moved items
-void scriptapi_detached_inventory_on_move(lua_State *L,
- const std::string &name,
- const std::string &from_list, int from_index,
- const std::string &to_list, int to_index,
- int count, ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Push callback function on stack
- if(!get_detached_inventory_callback(L, name, "on_move"))
- return;
-
- // function(inv, from_list, from_index, to_list, to_index, count, player)
- // inv
- InventoryLocation loc;
- loc.setDetached(name);
- InvRef::create(L, loc);
- // from_list
- lua_pushstring(L, from_list.c_str());
- // from_index
- lua_pushinteger(L, from_index + 1);
- // to_list
- lua_pushstring(L, to_list.c_str());
- // to_index
- lua_pushinteger(L, to_index + 1);
- // count
- lua_pushinteger(L, count);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 7, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
-
-// Report put items
-void scriptapi_detached_inventory_on_put(lua_State *L,
- const std::string &name,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Push callback function on stack
- if(!get_detached_inventory_callback(L, name, "on_put"))
- return;
-
- // Call function(inv, listname, index, stack, player)
- // inv
- InventoryLocation loc;
- loc.setDetached(name);
- InvRef::create(L, loc);
- // listname
- lua_pushstring(L, listname.c_str());
- // index
- lua_pushinteger(L, index + 1);
- // stack
- LuaItemStack::create(L, stack);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 5, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
-
-// Report taken items
-void scriptapi_detached_inventory_on_take(lua_State *L,
- const std::string &name,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Push callback function on stack
- if(!get_detached_inventory_callback(L, name, "on_take"))
- return;
-
- // Call function(inv, listname, index, stack, player)
- // inv
- InventoryLocation loc;
- loc.setDetached(name);
- InvRef::create(L, loc);
- // listname
- lua_pushstring(L, listname.c_str());
- // index
- lua_pushinteger(L, index + 1);
- // stack
- LuaItemStack::create(L, stack);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 5, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
-
// create_detached_inventory_raw(name)
-int l_create_detached_inventory_raw(lua_State *L)
+int ModApiInventory::l_create_detached_inventory_raw(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
const char *name = luaL_checkstring(L, 1);
- if(get_server(L)->createDetachedInventory(name) != NULL){
+ if(getServer(L)->createDetachedInventory(name) != NULL){
InventoryLocation loc;
loc.setDetached(name);
InvRef::create(L, loc);
@@ -724,3 +459,21 @@ int l_create_detached_inventory_raw(lua_State *L)
}
return 1;
}
+
+bool ModApiInventory::Initialize(lua_State *L, int top) {
+ bool retval = true;
+
+ retval &= API_FCT(create_detached_inventory_raw);
+ retval &= API_FCT(get_inventory);
+
+ InvRef::Register(L);
+
+ return retval;
+}
+
+ModApiInventory::ModApiInventory()
+ : ModApiBase() {
+
+}
+
+ModApiInventory modapiinventory_prototype;
diff --git a/src/scriptapi_inventory.h b/src/script/lua_api/l_inventory.h
similarity index 60%
rename from src/scriptapi_inventory.h
rename to src/script/lua_api/l_inventory.h
index 14f4fe02608b15d51995b979cd49482fc10e7885..83e8039b85c1073c52a1b94901e2df38810facaf 100644
--- a/src/scriptapi_inventory.h
+++ b/src/script/lua_api/l_inventory.h
@@ -1,5 +1,5 @@
/*
-Minetest-c55
+Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LUA_INVENTORY_H_
-#define LUA_INVENTORY_H_
+#ifndef L_INVENTORY_H_
+#define L_INVENTORY_H_
extern "C" {
#include <lua.h>
@@ -30,6 +30,7 @@ extern "C" {
#include "serverobject.h"
#include "inventory.h"
+#include "lua_api/l_base.h"
/*
InvRef
*/
@@ -115,51 +116,22 @@ class InvRef
static void Register(lua_State *L);
};
-void inventory_get_list_to_lua(Inventory *inv, const char *name,lua_State *L);
-void inventory_set_list_from_lua(Inventory *inv, const char *name,
- lua_State *L, int tableindex, int forcesize=-1);
-
-/*****************************************************************************/
-/* Minetest interface */
-/*****************************************************************************/
-/* Detached inventory callbacks */
-// Return number of accepted items to be moved
-int scriptapi_detached_inventory_allow_move(lua_State *L,
- const std::string &name,
- const std::string &from_list, int from_index,
- const std::string &to_list, int to_index,
- int count, ServerActiveObject *player);
-// Return number of accepted items to be put
-int scriptapi_detached_inventory_allow_put(lua_State *L,
- const std::string &name,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player);
-// Return number of accepted items to be taken
-int scriptapi_detached_inventory_allow_take(lua_State *L,
- const std::string &name,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player);
-// Report moved items
-void scriptapi_detached_inventory_on_move(lua_State *L,
- const std::string &name,
- const std::string &from_list, int from_index,
- const std::string &to_list, int to_index,
- int count, ServerActiveObject *player);
-// Report put items
-void scriptapi_detached_inventory_on_put(lua_State *L,
- const std::string &name,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player);
-// Report taken items
-void scriptapi_detached_inventory_on_take(lua_State *L,
- const std::string &name,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player);
-
-/*****************************************************************************/
-/* Mod API */
-/*****************************************************************************/
-int l_create_detached_inventory_raw(lua_State *L);
-int l_get_inventory(lua_State *L);
-
-#endif /* LUA_INVENTORY_H_ */
+class ModApiInventory
+ : public ModApiBase
+{
+public:
+ ModApiInventory();
+
+ bool Initialize(lua_State *L, int top);
+
+ static int l_create_detached_inventory_raw(lua_State *L);
+ static int l_get_inventory(lua_State *L);
+private:
+ static void inventory_set_list_from_lua(Inventory *inv, const char *name,
+ lua_State *L, int tableindex, int forcesize);
+ static void inventory_get_list_to_lua(Inventory *inv, const char *name,
+ lua_State *L);
+
+};
+
+#endif /* L_INVENTORY_H_ */
diff --git a/src/scriptapi_item.cpp b/src/script/lua_api/l_item.cpp
similarity index 55%
rename from src/scriptapi_item.cpp
rename to src/script/lua_api/l_item.cpp
index b266d856d26fbd332fa9be2940584fb24b706f54..730dfd49b0007d9de0f2c32f0c3e820aaa240f02 100644
--- a/src/scriptapi_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -17,284 +17,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "scriptapi.h"
+#include "lua_api/l_item.h"
+#include "common/c_converter.h"
+#include "common/c_content.h"
+#include "cpp_api/scriptapi.h"
#include "server.h"
-#include "script.h"
-#include "tool.h"
-#include "nodedef.h"
-#include "util/pointedthing.h"
-#include "scriptapi_item.h"
-#include "scriptapi_types.h"
-#include "scriptapi_common.h"
-#include "scriptapi_object.h"
-#include "scriptapi_content.h"
-
-
-struct EnumString es_ItemType[] =
-{
- {ITEM_NONE, "none"},
- {ITEM_NODE, "node"},
- {ITEM_CRAFT, "craft"},
- {ITEM_TOOL, "tool"},
- {0, NULL},
-};
-
-
-/*
- ItemDefinition
-*/
-
-ItemDefinition read_item_definition(lua_State *L, int index,
- ItemDefinition default_def)
-{
- if(index < 0)
- index = lua_gettop(L) + 1 + index;
-
- // Read the item definition
- ItemDefinition def = default_def;
-
- def.type = (ItemType)getenumfield(L, index, "type",
- es_ItemType, ITEM_NONE);
- getstringfield(L, index, "name", def.name);
- getstringfield(L, index, "description", def.description);
- getstringfield(L, index, "inventory_image", def.inventory_image);
- getstringfield(L, index, "wield_image", def.wield_image);
-
- lua_getfield(L, index, "wield_scale");
- if(lua_istable(L, -1)){
- def.wield_scale = check_v3f(L, -1);
- }
- lua_pop(L, 1);
-
- def.stack_max = getintfield_default(L, index, "stack_max", def.stack_max);
- if(def.stack_max == 0)
- def.stack_max = 1;
-
- lua_getfield(L, index, "on_use");
- def.usable = lua_isfunction(L, -1);
- lua_pop(L, 1);
-
- getboolfield(L, index, "liquids_pointable", def.liquids_pointable);
-
- warn_if_field_exists(L, index, "tool_digging_properties",
- "deprecated: use tool_capabilities");
-
- lua_getfield(L, index, "tool_capabilities");
- if(lua_istable(L, -1)){
- def.tool_capabilities = new ToolCapabilities(
- read_tool_capabilities(L, -1));
- }
-
- // If name is "" (hand), ensure there are ToolCapabilities
- // because it will be looked up there whenever any other item has
- // no ToolCapabilities
- if(def.name == "" && def.tool_capabilities == NULL){
- def.tool_capabilities = new ToolCapabilities();
- }
-
- lua_getfield(L, index, "groups");
- read_groups(L, -1, def.groups);
- lua_pop(L, 1);
-
- lua_getfield(L, index, "sounds");
- if(lua_istable(L, -1)){
- lua_getfield(L, -1, "place");
- read_soundspec(L, -1, def.sound_place);
- lua_pop(L, 1);
- }
- lua_pop(L, 1);
-
- // Client shall immediately place this node when player places the item.
- // Server will update the precise end result a moment later.
- // "" = no prediction
- getstringfield(L, index, "node_placement_prediction",
- def.node_placement_prediction);
-
- return def;
-}
-
-// register_item_raw({lots of stuff})
-int l_register_item_raw(lua_State *L)
-{
- luaL_checktype(L, 1, LUA_TTABLE);
- int table = 1;
-
- // Get the writable item and node definition managers from the server
- IWritableItemDefManager *idef =
- get_server(L)->getWritableItemDefManager();
- IWritableNodeDefManager *ndef =
- get_server(L)->getWritableNodeDefManager();
-
- // Check if name is defined
- std::string name;
- lua_getfield(L, table, "name");
- if(lua_isstring(L, -1)){
- name = lua_tostring(L, -1);
- verbosestream<<"register_item_raw: "<<name<<std::endl;
- } else {
- throw LuaError(L, "register_item_raw: name is not defined or not a string");
- }
-
- // Check if on_use is defined
-
- ItemDefinition def;
- // Set a distinctive default value to check if this is set
- def.node_placement_prediction = "__default";
-
- // Read the item definition
- def = read_item_definition(L, table, def);
-
- // Default to having client-side placement prediction for nodes
- // ("" in item definition sets it off)
- if(def.node_placement_prediction == "__default"){
- if(def.type == ITEM_NODE)
- def.node_placement_prediction = name;
- else
- def.node_placement_prediction = "";
- }
-
- // Register item definition
- idef->registerItem(def);
-
- // Read the node definition (content features) and register it
- if(def.type == ITEM_NODE)
- {
- ContentFeatures f = read_content_features(L, table);
- ndef->set(f.name, f);
- }
-
- return 0; /* number of results */
-}
-
-// register_alias_raw(name, convert_to_name)
-int l_register_alias_raw(lua_State *L)
-{
- std::string name = luaL_checkstring(L, 1);
- std::string convert_to = luaL_checkstring(L, 2);
-
- // Get the writable item definition manager from the server
- IWritableItemDefManager *idef =
- get_server(L)->getWritableItemDefManager();
-
- idef->registerAlias(name, convert_to);
-
- return 0; /* number of results */
-}
-
-// Retrieves minetest.registered_items[name][callbackname]
-// If that is nil or on error, return false and stack is unchanged
-// If that is a function, returns true and pushes the
-// function onto the stack
-// If minetest.registered_items[name] doesn't exist, minetest.nodedef_default
-// is tried instead so unknown items can still be manipulated to some degree
-bool get_item_callback(lua_State *L,
- const char *name, const char *callbackname)
-{
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_items");
- lua_remove(L, -2);
- luaL_checktype(L, -1, LUA_TTABLE);
- lua_getfield(L, -1, name);
- lua_remove(L, -2);
- // Should be a table
- if(lua_type(L, -1) != LUA_TTABLE)
- {
- // Report error and clean up
- errorstream<<"Item \""<<name<<"\" not defined"<<std::endl;
- lua_pop(L, 1);
-
- // Try minetest.nodedef_default instead
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "nodedef_default");
- lua_remove(L, -2);
- luaL_checktype(L, -1, LUA_TTABLE);
- }
- lua_getfield(L, -1, callbackname);
- lua_remove(L, -2);
- // Should be a function or nil
- if(lua_type(L, -1) == LUA_TFUNCTION)
- {
- return true;
- }
- else if(lua_isnil(L, -1))
- {
- lua_pop(L, 1);
- return false;
- }
- else
- {
- errorstream<<"Item \""<<name<<"\" callback \""
- <<callbackname<<" is not a function"<<std::endl;
- lua_pop(L, 1);
- return false;
- }
-}
-
-bool scriptapi_item_on_drop(lua_State *L, ItemStack &item,
- ServerActiveObject *dropper, v3f pos)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Push callback function on stack
- if(!get_item_callback(L, item.name.c_str(), "on_drop"))
- return false;
-
- // Call function
- LuaItemStack::create(L, item);
- objectref_get_or_create(L, dropper);
- pushFloatPos(L, pos);
- if(lua_pcall(L, 3, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- if(!lua_isnil(L, -1))
- item = read_item(L, -1);
- return true;
-}
-
-bool scriptapi_item_on_place(lua_State *L, ItemStack &item,
- ServerActiveObject *placer, const PointedThing &pointed)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Push callback function on stack
- if(!get_item_callback(L, item.name.c_str(), "on_place"))
- return false;
-
- // Call function
- LuaItemStack::create(L, item);
- objectref_get_or_create(L, placer);
- push_pointed_thing(L, pointed);
- if(lua_pcall(L, 3, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- if(!lua_isnil(L, -1))
- item = read_item(L, -1);
- return true;
-}
-
-bool scriptapi_item_on_use(lua_State *L, ItemStack &item,
- ServerActiveObject *user, const PointedThing &pointed)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Push callback function on stack
- if(!get_item_callback(L, item.name.c_str(), "on_use"))
- return false;
-
- // Call function
- LuaItemStack::create(L, item);
- objectref_get_or_create(L, user);
- push_pointed_thing(L, pointed);
- if(lua_pcall(L, 3, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- if(!lua_isnil(L, -1))
- item = read_item(L, -1);
- return true;
-}
+#include "common/c_internal.h"
// garbage collector
int LuaItemStack::gc_object(lua_State *L)
@@ -307,6 +35,7 @@ int LuaItemStack::gc_object(lua_State *L)
// is_empty(self) -> true/false
int LuaItemStack::l_is_empty(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
lua_pushboolean(L, item.empty());
@@ -316,6 +45,7 @@ int LuaItemStack::l_is_empty(lua_State *L)
// get_name(self) -> string
int LuaItemStack::l_get_name(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
lua_pushstring(L, item.name.c_str());
@@ -325,6 +55,7 @@ int LuaItemStack::l_get_name(lua_State *L)
// get_count(self) -> number
int LuaItemStack::l_get_count(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
lua_pushinteger(L, item.count);
@@ -334,6 +65,7 @@ int LuaItemStack::l_get_count(lua_State *L)
// get_wear(self) -> number
int LuaItemStack::l_get_wear(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
lua_pushinteger(L, item.wear);
@@ -343,6 +75,7 @@ int LuaItemStack::l_get_wear(lua_State *L)
// get_metadata(self) -> string
int LuaItemStack::l_get_metadata(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
lua_pushlstring(L, item.metadata.c_str(), item.metadata.size());
@@ -352,6 +85,7 @@ int LuaItemStack::l_get_metadata(lua_State *L)
// clear(self) -> true
int LuaItemStack::l_clear(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
o->m_stack.clear();
lua_pushboolean(L, true);
@@ -361,8 +95,9 @@ int LuaItemStack::l_clear(lua_State *L)
// replace(self, itemstack or itemstring or table or nil) -> true
int LuaItemStack::l_replace(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
- o->m_stack = read_item(L, 2);
+ o->m_stack = read_item(L,2,STACK_TO_SERVER(L));
lua_pushboolean(L, true);
return 1;
}
@@ -370,6 +105,7 @@ int LuaItemStack::l_replace(lua_State *L)
// to_string(self) -> string
int LuaItemStack::l_to_string(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
std::string itemstring = o->m_stack.getItemString();
lua_pushstring(L, itemstring.c_str());
@@ -379,6 +115,7 @@ int LuaItemStack::l_to_string(lua_State *L)
// to_table(self) -> table or nil
int LuaItemStack::l_to_table(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
const ItemStack &item = o->m_stack;
if(item.empty())
@@ -403,18 +140,20 @@ int LuaItemStack::l_to_table(lua_State *L)
// get_stack_max(self) -> number
int LuaItemStack::l_get_stack_max(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
- lua_pushinteger(L, item.getStackMax(get_server(L)->idef()));
+ lua_pushinteger(L, item.getStackMax(STACK_TO_SERVER(L)->idef()));
return 1;
}
// get_free_space(self) -> number
int LuaItemStack::l_get_free_space(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
- lua_pushinteger(L, item.freeSpace(get_server(L)->idef()));
+ lua_pushinteger(L, item.freeSpace(STACK_TO_SERVER(L)->idef()));
return 1;
}
@@ -422,9 +161,10 @@ int LuaItemStack::l_get_free_space(lua_State *L)
// Checks if the item is defined.
int LuaItemStack::l_is_known(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
- bool is_known = item.isKnown(get_server(L)->idef());
+ bool is_known = item.isKnown(STACK_TO_SERVER(L)->idef());
lua_pushboolean(L, is_known);
return 1;
}
@@ -434,6 +174,7 @@ int LuaItemStack::l_is_known(lua_State *L)
// or a fallback one (name="unknown")
int LuaItemStack::l_get_definition(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
@@ -455,10 +196,11 @@ int LuaItemStack::l_get_definition(lua_State *L)
// Returns those of the hand ("") if this item has none associated.
int LuaItemStack::l_get_tool_capabilities(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
const ToolCapabilities &prop =
- item.getToolCapabilities(get_server(L)->idef());
+ item.getToolCapabilities(STACK_TO_SERVER(L)->idef());
push_tool_capabilities(L, prop);
return 1;
}
@@ -469,10 +211,11 @@ int LuaItemStack::l_get_tool_capabilities(lua_State *L)
// Returns true if the item is (or was) a tool.
int LuaItemStack::l_add_wear(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
int amount = lua_tointeger(L, 2);
- bool result = item.addWear(amount, get_server(L)->idef());
+ bool result = item.addWear(amount, STACK_TO_SERVER(L)->idef());
lua_pushboolean(L, result);
return 1;
}
@@ -481,10 +224,11 @@ int LuaItemStack::l_add_wear(lua_State *L)
// Returns leftover item stack
int LuaItemStack::l_add_item(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
- ItemStack newitem = read_item(L, 2);
- ItemStack leftover = item.addItem(newitem, get_server(L)->idef());
+ ItemStack newitem = read_item(L,-1, STACK_TO_SERVER(L));
+ ItemStack leftover = item.addItem(newitem, STACK_TO_SERVER(L)->idef());
create(L, leftover);
return 1;
}
@@ -494,11 +238,12 @@ int LuaItemStack::l_add_item(lua_State *L)
// Second return value is the would-be-left-over item stack
int LuaItemStack::l_item_fits(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
- ItemStack newitem = read_item(L, 2);
+ ItemStack newitem = read_item(L, 2 ,STACK_TO_SERVER(L));
ItemStack restitem;
- bool fits = item.itemFits(newitem, &restitem, get_server(L)->idef());
+ bool fits = item.itemFits(newitem, &restitem, STACK_TO_SERVER(L)->idef());
lua_pushboolean(L, fits); // first return value
create(L, restitem); // second return value
return 2;
@@ -507,6 +252,7 @@ int LuaItemStack::l_item_fits(lua_State *L)
// take_item(self, takecount=1) -> itemstack
int LuaItemStack::l_take_item(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
u32 takecount = 1;
@@ -520,6 +266,7 @@ int LuaItemStack::l_take_item(lua_State *L)
// peek_item(self, peekcount=1) -> itemstack
int LuaItemStack::l_peek_item(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = checkobject(L, 1);
ItemStack &item = o->m_stack;
u32 peekcount = 1;
@@ -552,7 +299,8 @@ ItemStack& LuaItemStack::getItem()
// Creates an LuaItemStack and leaves it on top of stack
int LuaItemStack::create_object(lua_State *L)
{
- ItemStack item = read_item(L, 1);
+ NO_MAP_LOCK_REQUIRED;
+ ItemStack item = read_item(L,1,STACK_TO_SERVER(L));
LuaItemStack *o = new LuaItemStack(item);
*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
luaL_getmetatable(L, className);
@@ -562,6 +310,7 @@ int LuaItemStack::create_object(lua_State *L)
// Not callable from Lua
int LuaItemStack::create(lua_State *L, const ItemStack &item)
{
+ NO_MAP_LOCK_REQUIRED;
LuaItemStack *o = new LuaItemStack(item);
*(void **)(lua_newuserdata(L, sizeof(void *))) = o;
luaL_getmetatable(L, className);
@@ -629,90 +378,95 @@ const luaL_reg LuaItemStack::methods[] = {
{0,0}
};
-ItemStack read_item(lua_State *L, int index)
+ModApiItemMod::ModApiItemMod() {
+}
+
+/*
+ ItemDefinition
+*/
+
+// register_item_raw({lots of stuff})
+int ModApiItemMod::l_register_item_raw(lua_State *L)
{
- if(index < 0)
- index = lua_gettop(L) + 1 + index;
+ NO_MAP_LOCK_REQUIRED;
+ luaL_checktype(L, 1, LUA_TTABLE);
+ int table = 1;
- if(lua_isnil(L, index))
- {
- return ItemStack();
- }
- else if(lua_isuserdata(L, index))
- {
- // Convert from LuaItemStack
- LuaItemStack *o = LuaItemStack::checkobject(L, index);
- return o->getItem();
- }
- else if(lua_isstring(L, index))
- {
- // Convert from itemstring
- std::string itemstring = lua_tostring(L, index);
- IItemDefManager *idef = get_server(L)->idef();
- try
- {
- ItemStack item;
- item.deSerialize(itemstring, idef);
- return item;
- }
- catch(SerializationError &e)
- {
- infostream<<"WARNING: unable to create item from itemstring"
- <<": "<<itemstring<<std::endl;
- return ItemStack();
- }
+ ScriptApi* scriptIface = get_scriptapi(L);
+
+ // Get the writable item and node definition managers from the server
+ IWritableItemDefManager *idef =
+ scriptIface->getServer()->getWritableItemDefManager();
+ IWritableNodeDefManager *ndef =
+ scriptIface->getServer()->getWritableNodeDefManager();
+
+ // Check if name is defined
+ std::string name;
+ lua_getfield(L, table, "name");
+ if(lua_isstring(L, -1)){
+ name = lua_tostring(L, -1);
+ verbosestream<<"register_item_raw: "<<name<<std::endl;
+ } else {
+ throw LuaError(L, "register_item_raw: name is not defined or not a string");
}
- else if(lua_istable(L, index))
- {
- // Convert from table
- IItemDefManager *idef = get_server(L)->idef();
- std::string name = getstringfield_default(L, index, "name", "");
- int count = getintfield_default(L, index, "count", 1);
- int wear = getintfield_default(L, index, "wear", 0);
- std::string metadata = getstringfield_default(L, index, "metadata", "");
- return ItemStack(name, count, wear, metadata, idef);
+
+ // Check if on_use is defined
+
+ ItemDefinition def;
+ // Set a distinctive default value to check if this is set
+ def.node_placement_prediction = "__default";
+
+ // Read the item definition
+ def = read_item_definition(L, table, def);
+
+ // Default to having client-side placement prediction for nodes
+ // ("" in item definition sets it off)
+ if(def.node_placement_prediction == "__default"){
+ if(def.type == ITEM_NODE)
+ def.node_placement_prediction = name;
+ else
+ def.node_placement_prediction = "";
}
- else
+
+ // Register item definition
+ idef->registerItem(def);
+
+ // Read the node definition (content features) and register it
+ if(def.type == ITEM_NODE)
{
- throw LuaError(L, "Expecting itemstack, itemstring, table or nil");
+ ContentFeatures f = read_content_features(L, table);
+ ndef->set(f.name, f);
}
+
+ return 0; /* number of results */
}
-std::vector<ItemStack> read_items(lua_State *L, int index)
+// register_alias_raw(name, convert_to_name)
+int ModApiItemMod::l_register_alias_raw(lua_State *L)
{
- if(index < 0)
- index = lua_gettop(L) + 1 + index;
-
- std::vector<ItemStack> items;
- luaL_checktype(L, index, LUA_TTABLE);
- lua_pushnil(L);
- while(lua_next(L, index) != 0){
- // key at index -2 and value at index -1
- items.push_back(read_item(L, -1));
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- return items;
+ NO_MAP_LOCK_REQUIRED;
+ std::string name = luaL_checkstring(L, 1);
+ std::string convert_to = luaL_checkstring(L, 2);
+
+ // Get the writable item definition manager from the server
+ IWritableItemDefManager *idef =
+ STACK_TO_SERVER(L)->getWritableItemDefManager();
+
+ idef->registerAlias(name, convert_to);
+
+ return 0; /* number of results */
}
-// creates a table of ItemStacks
-void push_items(lua_State *L, const std::vector<ItemStack> &items)
-{
- // Get the table insert function
- lua_getglobal(L, "table");
- lua_getfield(L, -1, "insert");
- int table_insert = lua_gettop(L);
- // Create and fill table
- lua_newtable(L);
- int table = lua_gettop(L);
- for(u32 i=0; i<items.size(); i++){
- ItemStack item = items[i];
- lua_pushvalue(L, table_insert);
- lua_pushvalue(L, table);
- LuaItemStack::create(L, item);
- if(lua_pcall(L, 2, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- }
- lua_remove(L, -2); // Remove table
- lua_remove(L, -2); // Remove insert
+bool ModApiItemMod::Initialize(lua_State *L,int top) {
+
+ bool retval = true;
+
+ retval &= API_FCT(register_item_raw);
+ retval &= API_FCT(register_alias_raw);
+
+ LuaItemStack::Register(L);
+
+ return retval;
}
+
+ModApiItemMod modapi_item_prototyp;
diff --git a/src/scriptapi_item.h b/src/script/lua_api/l_item.h
similarity index 69%
rename from src/scriptapi_item.h
rename to src/script/lua_api/l_item.h
index e0f2139905fedcafc105514d366252597c775aa9..cbed4ae0b99af1bab437ac7ea35b5161c5595fb5 100644
--- a/src/scriptapi_item.h
+++ b/src/script/lua_api/l_item.h
@@ -1,5 +1,5 @@
/*
-Minetest-c55
+Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LUA_ITEM_H_
-#define LUA_ITEM_H_
+#ifndef L_ITEM_H_
+#define L_ITEM_H_
extern "C" {
#include <lua.h>
@@ -32,11 +32,9 @@ extern "C" {
#include "util/pointedthing.h"
#include "inventory.h"
-#include "inventory.h"
+#include "lua_api/l_base.h"
-ItemStack read_item(lua_State *L, int index);
-std::vector<ItemStack> read_items(lua_State *L, int index);
-void push_items(lua_State *L, const std::vector<ItemStack> &items);
+class ModApiInventory;
class LuaItemStack
{
@@ -136,31 +134,18 @@ class LuaItemStack
};
-/*****************************************************************************/
-/* Mod API */
-/*****************************************************************************/
-int l_register_item_raw(lua_State *L);
-int l_register_alias_raw(lua_State *L);
-
-/*****************************************************************************/
-/* scriptapi internal */
-/*****************************************************************************/
-bool get_item_callback(lua_State *L,
- const char *name, const char *callbackname);
-ItemDefinition read_item_definition(lua_State *L, int index,
- ItemDefinition default_def = ItemDefinition());
-
-extern struct EnumString es_ItemType[];
-
-/*****************************************************************************/
-/* Minetest interface */
-/*****************************************************************************/
-bool scriptapi_item_on_drop(lua_State *L, ItemStack &item,
- ServerActiveObject *dropper, v3f pos);
-bool scriptapi_item_on_place(lua_State *L, ItemStack &item,
- ServerActiveObject *placer, const PointedThing &pointed);
-bool scriptapi_item_on_use(lua_State *L, ItemStack &item,
- ServerActiveObject *user, const PointedThing &pointed);
-
-
-#endif /* LUA_ITEM_H_ */
+class ModApiItemMod
+ :virtual public ModApiBase
+{
+public:
+ ModApiItemMod();
+
+ bool Initialize(lua_State *L,int top);
+
+ static int l_register_item_raw(lua_State *L);
+ static int l_register_alias_raw(lua_State *L);
+};
+
+
+
+#endif /* L_ITEM_H_ */
diff --git a/src/scriptapi_nodemeta.cpp b/src/script/lua_api/l_nodemeta.cpp
similarity index 54%
rename from src/scriptapi_nodemeta.cpp
rename to src/script/lua_api/l_nodemeta.cpp
index b66c9a023ca95448391fda55818c56dc29e96801..511fb38ce298cfa94eb254f7ecf0975a4b297918 100644
--- a/src/scriptapi_nodemeta.cpp
+++ b/src/script/lua_api/l_nodemeta.cpp
@@ -17,15 +17,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "scriptapi.h"
-#include "scriptapi_nodemeta.h"
+#include "cpp_api/scriptapi.h"
+#include "common/c_converter.h"
+#include "common/c_content.h"
#include "map.h"
-#include "script.h"
-#include "scriptapi_types.h"
-#include "scriptapi_inventory.h"
-#include "scriptapi_common.h"
-#include "scriptapi_item.h"
-#include "scriptapi_object.h"
+#include "lua_api/l_nodemeta.h"
+#include "common/c_internal.h"
+#include "lua_api/l_inventory.h"
/*
@@ -213,7 +211,7 @@ int NodeMetaRef::l_to_table(lua_State *L)
std::vector<const InventoryList*> lists = inv->getLists();
for(std::vector<const InventoryList*>::const_iterator
i = lists.begin(); i != lists.end(); i++){
- inventory_get_list_to_lua(inv, (*i)->getName().c_str(), L);
+ push_inventory_list(inv, (*i)->getName().c_str(), L);
lua_setfield(L, -2, (*i)->getName().c_str());
}
}
@@ -259,7 +257,7 @@ int NodeMetaRef::l_from_table(lua_State *L)
while(lua_next(L, inventorytable) != 0){
// key at index -2 and value at index -1
std::string name = lua_tostring(L, -2);
- inventory_set_list_from_lua(inv, name.c_str(), L, -1);
+ read_inventory_list(inv, name.c_str(), L, -1,STACK_TO_SERVER(L));
lua_pop(L, 1); // removes value, keeps key for next iteration
}
reportMetadataChange(ref);
@@ -331,241 +329,4 @@ const luaL_reg NodeMetaRef::methods[] = {
{0,0}
};
-/*
- Node metadata inventory callbacks
-*/
-
-// Return number of accepted items to be moved
-int scriptapi_nodemeta_inventory_allow_move(lua_State *L, v3s16 p,
- const std::string &from_list, int from_index,
- const std::string &to_list, int to_index,
- int count, ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // If node doesn't exist, we don't know what callback to call
- MapNode node = get_env(L)->getMap().getNodeNoEx(p);
- if(node.getContent() == CONTENT_IGNORE)
- return 0;
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(),
- "allow_metadata_inventory_move"))
- return count;
-
- // function(pos, from_list, from_index, to_list, to_index, count, player)
- // pos
- push_v3s16(L, p);
- // from_list
- lua_pushstring(L, from_list.c_str());
- // from_index
- lua_pushinteger(L, from_index + 1);
- // to_list
- lua_pushstring(L, to_list.c_str());
- // to_index
- lua_pushinteger(L, to_index + 1);
- // count
- lua_pushinteger(L, count);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 7, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- if(!lua_isnumber(L, -1))
- throw LuaError(L, "allow_metadata_inventory_move should return a number");
- return luaL_checkinteger(L, -1);
-}
-
-// Return number of accepted items to be put
-int scriptapi_nodemeta_inventory_allow_put(lua_State *L, v3s16 p,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // If node doesn't exist, we don't know what callback to call
- MapNode node = get_env(L)->getMap().getNodeNoEx(p);
- if(node.getContent() == CONTENT_IGNORE)
- return 0;
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(),
- "allow_metadata_inventory_put"))
- return stack.count;
-
- // Call function(pos, listname, index, stack, player)
- // pos
- push_v3s16(L, p);
- // listname
- lua_pushstring(L, listname.c_str());
- // index
- lua_pushinteger(L, index + 1);
- // stack
- LuaItemStack::create(L, stack);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 5, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- if(!lua_isnumber(L, -1))
- throw LuaError(L, "allow_metadata_inventory_put should return a number");
- return luaL_checkinteger(L, -1);
-}
-
-// Return number of accepted items to be taken
-int scriptapi_nodemeta_inventory_allow_take(lua_State *L, v3s16 p,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // If node doesn't exist, we don't know what callback to call
- MapNode node = get_env(L)->getMap().getNodeNoEx(p);
- if(node.getContent() == CONTENT_IGNORE)
- return 0;
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(),
- "allow_metadata_inventory_take"))
- return stack.count;
-
- // Call function(pos, listname, index, count, player)
- // pos
- push_v3s16(L, p);
- // listname
- lua_pushstring(L, listname.c_str());
- // index
- lua_pushinteger(L, index + 1);
- // stack
- LuaItemStack::create(L, stack);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 5, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- if(!lua_isnumber(L, -1))
- throw LuaError(L, "allow_metadata_inventory_take should return a number");
- return luaL_checkinteger(L, -1);
-}
-
-// Report moved items
-void scriptapi_nodemeta_inventory_on_move(lua_State *L, v3s16 p,
- const std::string &from_list, int from_index,
- const std::string &to_list, int to_index,
- int count, ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // If node doesn't exist, we don't know what callback to call
- MapNode node = get_env(L)->getMap().getNodeNoEx(p);
- if(node.getContent() == CONTENT_IGNORE)
- return;
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(),
- "on_metadata_inventory_move"))
- return;
-
- // function(pos, from_list, from_index, to_list, to_index, count, player)
- // pos
- push_v3s16(L, p);
- // from_list
- lua_pushstring(L, from_list.c_str());
- // from_index
- lua_pushinteger(L, from_index + 1);
- // to_list
- lua_pushstring(L, to_list.c_str());
- // to_index
- lua_pushinteger(L, to_index + 1);
- // count
- lua_pushinteger(L, count);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 7, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
-
-// Report put items
-void scriptapi_nodemeta_inventory_on_put(lua_State *L, v3s16 p,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // If node doesn't exist, we don't know what callback to call
- MapNode node = get_env(L)->getMap().getNodeNoEx(p);
- if(node.getContent() == CONTENT_IGNORE)
- return;
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(),
- "on_metadata_inventory_put"))
- return;
-
- // Call function(pos, listname, index, stack, player)
- // pos
- push_v3s16(L, p);
- // listname
- lua_pushstring(L, listname.c_str());
- // index
- lua_pushinteger(L, index + 1);
- // stack
- LuaItemStack::create(L, stack);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 5, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
-
-// Report taken items
-void scriptapi_nodemeta_inventory_on_take(lua_State *L, v3s16 p,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // If node doesn't exist, we don't know what callback to call
- MapNode node = get_env(L)->getMap().getNodeNoEx(p);
- if(node.getContent() == CONTENT_IGNORE)
- return;
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(),
- "on_metadata_inventory_take"))
- return;
-
- // Call function(pos, listname, index, stack, player)
- // pos
- push_v3s16(L, p);
- // listname
- lua_pushstring(L, listname.c_str());
- // index
- lua_pushinteger(L, index + 1);
- // stack
- LuaItemStack::create(L, stack);
- // player
- objectref_get_or_create(L, player);
- if(lua_pcall(L, 5, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
+REGISTER_LUA_REF(NodeMetaRef);
diff --git a/src/scriptapi_nodemeta.h b/src/script/lua_api/l_nodemeta.h
similarity index 58%
rename from src/scriptapi_nodemeta.h
rename to src/script/lua_api/l_nodemeta.h
index 017abe181a23cbe8890fddaf0ecf501c7f0f0502..23404a084d0bcaba811660dba37f759e4e61de09 100644
--- a/src/scriptapi_nodemeta.h
+++ b/src/script/lua_api/l_nodemeta.h
@@ -1,5 +1,5 @@
/*
-Minetest-c55
+Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
@@ -16,8 +16,8 @@ You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LUA_NODEMETA_H_
-#define LUA_NODEMETA_H_
+#ifndef L_NODEMETA_H_
+#define L_NODEMETA_H_
extern "C" {
#include <lua.h>
@@ -90,34 +90,4 @@ class NodeMetaRef
static void Register(lua_State *L);
};
-/*****************************************************************************/
-/* Minetest interface */
-/*****************************************************************************/
-// Return number of accepted items to be moved
-int scriptapi_nodemeta_inventory_allow_move(lua_State *L, v3s16 p,
- const std::string &from_list, int from_index,
- const std::string &to_list, int to_index,
- int count, ServerActiveObject *player);
-// Return number of accepted items to be put
-int scriptapi_nodemeta_inventory_allow_put(lua_State *L, v3s16 p,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player);
-// Return number of accepted items to be taken
-int scriptapi_nodemeta_inventory_allow_take(lua_State *L, v3s16 p,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player);
-// Report moved items
-void scriptapi_nodemeta_inventory_on_move(lua_State *L, v3s16 p,
- const std::string &from_list, int from_index,
- const std::string &to_list, int to_index,
- int count, ServerActiveObject *player);
-// Report put items
-void scriptapi_nodemeta_inventory_on_put(lua_State *L, v3s16 p,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player);
-// Report taken items
-void scriptapi_nodemeta_inventory_on_take(lua_State *L, v3s16 p,
- const std::string &listname, int index, ItemStack &stack,
- ServerActiveObject *player);
-
-#endif //LUA_NODEMETA_H_
+#endif //L_NODEMETA_H_
diff --git a/src/scriptapi_nodetimer.cpp b/src/script/lua_api/l_nodetimer.cpp
similarity index 97%
rename from src/scriptapi_nodetimer.cpp
rename to src/script/lua_api/l_nodetimer.cpp
index 5e3289aee958ca54211f341ceba9eabffc7ffa45..60e4ec061e470013d6e54551c1c3d6d670643d7c 100644
--- a/src/scriptapi_nodetimer.cpp
+++ b/src/script/lua_api/l_nodetimer.cpp
@@ -17,8 +17,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "scriptapi.h"
-#include "scriptapi_nodetimer.h"
+#include "cpp_api/scriptapi.h"
+#include "lua_api/l_nodetimer.h"
+#include "common/c_internal.h"
#include "map.h"
@@ -164,3 +165,5 @@ const luaL_reg NodeTimerRef::methods[] = {
luamethod(NodeTimerRef, get_elapsed),
{0,0}
};
+
+REGISTER_LUA_REF(NodeTimerRef);
diff --git a/src/scriptapi_nodetimer.h b/src/script/lua_api/l_nodetimer.h
similarity index 94%
rename from src/scriptapi_nodetimer.h
rename to src/script/lua_api/l_nodetimer.h
index a4536d9478a4452b82a2fc279edffcfee6edbd93..f652b4900929e2cf1dd26142bb0ba93555419466 100644
--- a/src/scriptapi_nodetimer.h
+++ b/src/script/lua_api/l_nodetimer.h
@@ -1,5 +1,5 @@
/*
-Minetest-c55
+Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LUA_NODETIMER_H_
-#define LUA_NODETIMER_H_
+#ifndef L_NODETIMER_H_
+#define L_NODETIMER_H_
extern "C" {
#include <lua.h>
@@ -67,4 +67,4 @@ class NodeTimerRef
-#endif /* LUA_NODETIMER_H_ */
+#endif /* L_NODETIMER_H_ */
diff --git a/src/scriptapi_noise.cpp b/src/script/lua_api/l_noise.cpp
similarity index 92%
rename from src/scriptapi_noise.cpp
rename to src/script/lua_api/l_noise.cpp
index 2c1a83c4c5f10adbcd5c28166112e73f8a76fd55..e0abeae9418feeec27b5439ada8e68eec8da18d5 100644
--- a/src/scriptapi_noise.cpp
+++ b/src/script/lua_api/l_noise.cpp
@@ -17,10 +17,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "scriptapi.h"
-#include "scriptapi_noise.h"
-#include "scriptapi_types.h"
-#include "script.h"
+#include "lua_api/l_noise.h"
+#include "common/c_internal.h"
+#include "common/c_converter.h"
+#include "log.h"
// garbage collector
int LuaPerlinNoise::gc_object(lua_State *L)
@@ -32,6 +32,7 @@ int LuaPerlinNoise::gc_object(lua_State *L)
int LuaPerlinNoise::l_get2d(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaPerlinNoise *o = checkobject(L, 1);
v2f pos2d = read_v2f(L,2);
lua_Number val = noise2d_perlin(pos2d.X/o->scale, pos2d.Y/o->scale, o->seed, o->octaves, o->persistence);
@@ -40,6 +41,7 @@ int LuaPerlinNoise::l_get2d(lua_State *L)
}
int LuaPerlinNoise::l_get3d(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaPerlinNoise *o = checkobject(L, 1);
v3f pos3d = read_v3f(L,2);
lua_Number val = noise3d_perlin(pos3d.X/o->scale, pos3d.Y/o->scale, pos3d.Z/o->scale, o->seed, o->octaves, o->persistence);
@@ -65,6 +67,7 @@ LuaPerlinNoise::~LuaPerlinNoise()
// Creates an LuaPerlinNoise and leaves it on top of stack
int LuaPerlinNoise::create_object(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
int seed = luaL_checkint(L, 1);
int octaves = luaL_checkint(L, 2);
float persistence = luaL_checknumber(L, 3);
@@ -78,6 +81,7 @@ int LuaPerlinNoise::create_object(lua_State *L)
LuaPerlinNoise* LuaPerlinNoise::checkobject(lua_State *L, int narg)
{
+ NO_MAP_LOCK_REQUIRED;
luaL_checktype(L, narg, LUA_TUSERDATA);
void *ud = luaL_checkudata(L, narg, className);
if(!ud) luaL_typerror(L, narg, className);
@@ -133,6 +137,7 @@ int LuaPerlinNoiseMap::gc_object(lua_State *L)
int LuaPerlinNoiseMap::l_get2dMap(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
int i = 0;
LuaPerlinNoiseMap *o = checkobject(L, 1);
@@ -156,6 +161,7 @@ int LuaPerlinNoiseMap::l_get2dMap(lua_State *L)
int LuaPerlinNoiseMap::l_get3dMap(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
int i = 0;
LuaPerlinNoiseMap *o = checkobject(L, 1);
@@ -252,32 +258,6 @@ const luaL_reg LuaPerlinNoiseMap::methods[] = {
{0,0}
};
-/*
- NoiseParams
-*/
-NoiseParams *read_noiseparams(lua_State *L, int index)
-{
- if (index < 0)
- index = lua_gettop(L) + 1 + index;
-
- if (!lua_istable(L, index))
- return NULL;
-
- NoiseParams *np = new NoiseParams;
-
- np->offset = getfloatfield_default(L, index, "offset", 0.0);
- np->scale = getfloatfield_default(L, index, "scale", 0.0);
- lua_getfield(L, index, "spread");
- np->spread = read_v3f(L, -1);
- lua_pop(L, 1);
- np->seed = getintfield_default(L, index, "seed", 0);
- np->octaves = getintfield_default(L, index, "octaves", 0);
- np->persist = getfloatfield_default(L, index, "persist", 0.0);
-
- return np;
-}
-
-
/*
LuaPseudoRandom
*/
@@ -293,6 +273,7 @@ int LuaPseudoRandom::gc_object(lua_State *L)
// next(self, min=0, max=32767) -> get next value
int LuaPseudoRandom::l_next(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
LuaPseudoRandom *o = checkobject(L, 1);
int min = 0;
int max = 32767;
@@ -386,3 +367,7 @@ const luaL_reg LuaPseudoRandom::methods[] = {
luamethod(LuaPseudoRandom, next),
{0,0}
};
+
+REGISTER_LUA_REF(LuaPseudoRandom);
+REGISTER_LUA_REF(LuaPerlinNoiseMap);
+REGISTER_LUA_REF(LuaPerlinNoise);
diff --git a/src/scriptapi_noise.h b/src/script/lua_api/l_noise.h
similarity index 96%
rename from src/scriptapi_noise.h
rename to src/script/lua_api/l_noise.h
index a02383fde86fea4e235d9e0d53cd1ce455a4dea6..d0b51d75624290ef41c1e338ef4310b612dcbf8a 100644
--- a/src/scriptapi_noise.h
+++ b/src/script/lua_api/l_noise.h
@@ -1,5 +1,5 @@
/*
-Minetest-c55
+Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
@@ -17,14 +17,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LUA_PERLIN_H_
-#define LUA_PERLIN_H_
+#ifndef L_NOISE_H_
+#define L_NOISE_H_
extern "C" {
#include <lua.h>
#include <lauxlib.h>
}
+#include "irr_v3d.h"
#include "noise.h"
class LuaPerlinNoise
@@ -130,4 +131,4 @@ class LuaPseudoRandom
NoiseParams *read_noiseparams(lua_State *L, int index);
-#endif /* LUA_PERLIN_H_ */
+#endif /* L_NOISE_H_ */
diff --git a/src/scriptapi_object.cpp b/src/script/lua_api/l_object.cpp
similarity index 83%
rename from src/scriptapi_object.cpp
rename to src/script/lua_api/l_object.cpp
index 4dfdeb8c88ee85a6aa30f63ef059d7451b5b0866..1e45610a65bd3ba13d5274b06c785a70af8e536c 100644
--- a/src/scriptapi_object.cpp
+++ b/src/script/lua_api/l_object.cpp
@@ -17,15 +17,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "scriptapi.h"
-#include "scriptapi_object.h"
+#include "cpp_api/scriptapi.h"
+#include "common/c_converter.h"
+#include "common/c_content.h"
+#include "lua_api/l_object.h"
+#include "common/c_internal.h"
+#include "lua_api/l_inventory.h"
+#include "lua_api/l_item.h"
#include "log.h"
#include "tool.h"
-#include "scriptapi_types.h"
-#include "scriptapi_inventory.h"
-#include "scriptapi_item.h"
-#include "scriptapi_entity.h"
-#include "scriptapi_common.h"
+#include "serverobject.h"
+#include "content_object.h"
+#include "content_sao.h"
+#include "server.h"
#include "hud.h"
@@ -35,7 +39,7 @@ struct EnumString es_HudElementType[] =
{HUD_ELEM_TEXT, "text"},
{HUD_ELEM_STATBAR, "statbar"},
{HUD_ELEM_INVENTORY, "inventory"},
- {0, NULL},
+{0, NULL},
};
struct EnumString es_HudElementStat[] =
@@ -61,7 +65,6 @@ struct EnumString es_HudBuiltinElement[] =
{0, NULL},
};
-
/*
ObjectRef
*/
@@ -122,6 +125,7 @@ int ObjectRef::gc_object(lua_State *L) {
// remove(self)
int ObjectRef::l_remove(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
@@ -134,6 +138,7 @@ int ObjectRef::l_remove(lua_State *L)
// returns: {x=num, y=num, z=num}
int ObjectRef::l_getpos(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
@@ -151,6 +156,7 @@ int ObjectRef::l_getpos(lua_State *L)
// setpos(self, pos)
int ObjectRef::l_setpos(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
//LuaEntitySAO *co = getluaobject(ref);
ServerActiveObject *co = getobject(ref);
@@ -165,6 +171,7 @@ int ObjectRef::l_setpos(lua_State *L)
// moveto(self, pos, continuous=false)
int ObjectRef::l_moveto(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
//LuaEntitySAO *co = getluaobject(ref);
ServerActiveObject *co = getobject(ref);
@@ -181,6 +188,7 @@ int ObjectRef::l_moveto(lua_State *L)
// punch(self, puncher, time_from_last_punch, tool_capabilities, dir)
int ObjectRef::l_punch(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ObjectRef *puncher_ref = checkobject(L, 2);
ServerActiveObject *co = getobject(ref);
@@ -205,6 +213,7 @@ int ObjectRef::l_punch(lua_State *L)
// right_click(self, clicker); clicker = an another ObjectRef
int ObjectRef::l_right_click(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ObjectRef *ref2 = checkobject(L, 2);
ServerActiveObject *co = getobject(ref);
@@ -221,6 +230,7 @@ int ObjectRef::l_right_click(lua_State *L)
// returns: nil
int ObjectRef::l_set_hp(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
luaL_checknumber(L, 2);
ServerActiveObject *co = getobject(ref);
@@ -239,6 +249,7 @@ int ObjectRef::l_set_hp(lua_State *L)
// 0 if not applicable to this type of object
int ObjectRef::l_get_hp(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL){
@@ -257,12 +268,13 @@ int ObjectRef::l_get_hp(lua_State *L)
// get_inventory(self)
int ObjectRef::l_get_inventory(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
// Do it
InventoryLocation loc = co->getInventoryLocation();
- if(get_server(L)->getInventory(loc) != NULL)
+ if(STACK_TO_SERVER(L)->getInventory(loc) != NULL)
InvRef::create(L, loc);
else
lua_pushnil(L); // An object may have no inventory (nil)
@@ -272,6 +284,7 @@ int ObjectRef::l_get_inventory(lua_State *L)
// get_wield_list(self)
int ObjectRef::l_get_wield_list(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
@@ -283,6 +296,7 @@ int ObjectRef::l_get_wield_list(lua_State *L)
// get_wield_index(self)
int ObjectRef::l_get_wield_index(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
@@ -294,6 +308,7 @@ int ObjectRef::l_get_wield_index(lua_State *L)
// get_wielded_item(self)
int ObjectRef::l_get_wielded_item(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL){
@@ -309,11 +324,12 @@ int ObjectRef::l_get_wielded_item(lua_State *L)
// set_wielded_item(self, itemstack or itemstring or table or nil)
int ObjectRef::l_set_wielded_item(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
// Do it
- ItemStack item = read_item(L, 2);
+ ItemStack item = read_item(L, 2,STACK_TO_SERVER(L));
bool success = co->setWieldedItem(item);
lua_pushboolean(L, success);
return 1;
@@ -322,6 +338,7 @@ int ObjectRef::l_set_wielded_item(lua_State *L)
// set_armor_groups(self, groups)
int ObjectRef::l_set_armor_groups(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
@@ -357,6 +374,7 @@ int ObjectRef::l_set_physics_override(lua_State *L)
// set_animation(self, frame_range, frame_speed, frame_blend)
int ObjectRef::l_set_animation(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
@@ -377,6 +395,7 @@ int ObjectRef::l_set_animation(lua_State *L)
// set_bone_position(self, std::string bone, v3f position, v3f rotation)
int ObjectRef::l_set_bone_position(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
@@ -397,6 +416,7 @@ int ObjectRef::l_set_bone_position(lua_State *L)
// set_attach(self, parent, bone, position, rotation)
int ObjectRef::l_set_attach(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ObjectRef *parent_ref = checkobject(L, 2);
ServerActiveObject *co = getobject(ref);
@@ -420,6 +440,7 @@ int ObjectRef::l_set_attach(lua_State *L)
// set_detach(self)
int ObjectRef::l_set_detach(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
@@ -431,6 +452,7 @@ int ObjectRef::l_set_detach(lua_State *L)
// set_properties(self, properties)
int ObjectRef::l_set_properties(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
ServerActiveObject *co = getobject(ref);
if(co == NULL) return 0;
@@ -447,6 +469,7 @@ int ObjectRef::l_set_properties(lua_State *L)
// setvelocity(self, {x=num, y=num, z=num})
int ObjectRef::l_setvelocity(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
@@ -459,6 +482,7 @@ int ObjectRef::l_setvelocity(lua_State *L)
// getvelocity(self)
int ObjectRef::l_getvelocity(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
@@ -471,6 +495,7 @@ int ObjectRef::l_getvelocity(lua_State *L)
// setacceleration(self, {x=num, y=num, z=num})
int ObjectRef::l_setacceleration(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
@@ -484,6 +509,7 @@ int ObjectRef::l_setacceleration(lua_State *L)
// getacceleration(self)
int ObjectRef::l_getacceleration(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
@@ -496,6 +522,7 @@ int ObjectRef::l_getacceleration(lua_State *L)
// setyaw(self, radians)
int ObjectRef::l_setyaw(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
@@ -508,6 +535,7 @@ int ObjectRef::l_setyaw(lua_State *L)
// getyaw(self)
int ObjectRef::l_getyaw(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
@@ -520,6 +548,7 @@ int ObjectRef::l_getyaw(lua_State *L)
// settexturemod(self, mod)
int ObjectRef::l_settexturemod(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
@@ -533,6 +562,7 @@ int ObjectRef::l_settexturemod(lua_State *L)
// select_horiz_by_yawpitch=false)
int ObjectRef::l_setsprite(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
@@ -557,6 +587,7 @@ int ObjectRef::l_setsprite(lua_State *L)
// get_entity_name(self)
int ObjectRef::l_get_entity_name(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
@@ -569,6 +600,7 @@ int ObjectRef::l_get_entity_name(lua_State *L)
// get_luaentity(self)
int ObjectRef::l_get_luaentity(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
LuaEntitySAO *co = getluaobject(ref);
if(co == NULL) return 0;
@@ -582,6 +614,7 @@ int ObjectRef::l_get_luaentity(lua_State *L)
// is_player(self)
int ObjectRef::l_is_player(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
lua_pushboolean(L, (player != NULL));
@@ -591,6 +624,7 @@ int ObjectRef::l_is_player(lua_State *L)
// get_player_name(self)
int ObjectRef::l_get_player_name(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
if(player == NULL){
@@ -605,6 +639,7 @@ int ObjectRef::l_get_player_name(lua_State *L)
// get_look_dir(self)
int ObjectRef::l_get_look_dir(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
if(player == NULL) return 0;
@@ -619,6 +654,7 @@ int ObjectRef::l_get_look_dir(lua_State *L)
// get_look_pitch(self)
int ObjectRef::l_get_look_pitch(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
if(player == NULL) return 0;
@@ -630,6 +666,7 @@ int ObjectRef::l_get_look_pitch(lua_State *L)
// get_look_yaw(self)
int ObjectRef::l_get_look_yaw(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
if(player == NULL) return 0;
@@ -641,6 +678,7 @@ int ObjectRef::l_get_look_yaw(lua_State *L)
// set_look_pitch(self, radians)
int ObjectRef::l_set_look_pitch(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
PlayerSAO* co = getplayersao(ref);
if(co == NULL) return 0;
@@ -653,6 +691,7 @@ int ObjectRef::l_set_look_pitch(lua_State *L)
// set_look_yaw(self, radians)
int ObjectRef::l_set_look_yaw(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
PlayerSAO* co = getplayersao(ref);
if(co == NULL) return 0;
@@ -665,13 +704,14 @@ int ObjectRef::l_set_look_yaw(lua_State *L)
// set_inventory_formspec(self, formspec)
int ObjectRef::l_set_inventory_formspec(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
if(player == NULL) return 0;
std::string formspec = luaL_checkstring(L, 2);
player->inventory_formspec = formspec;
- get_server(L)->reportInventoryFormspecModified(player->getName());
+ STACK_TO_SERVER(L)->reportInventoryFormspecModified(player->getName());
lua_pushboolean(L, true);
return 1;
}
@@ -679,6 +719,7 @@ int ObjectRef::l_set_inventory_formspec(lua_State *L)
// get_inventory_formspec(self) -> formspec
int ObjectRef::l_get_inventory_formspec(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
if(player == NULL) return 0;
@@ -691,6 +732,7 @@ int ObjectRef::l_get_inventory_formspec(lua_State *L)
// get_player_control(self)
int ObjectRef::l_get_player_control(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
if(player == NULL){
@@ -724,6 +766,7 @@ int ObjectRef::l_get_player_control(lua_State *L)
// get_player_control_bits(self)
int ObjectRef::l_get_player_control_bits(lua_State *L)
{
+ NO_MAP_LOCK_REQUIRED;
ObjectRef *ref = checkobject(L, 1);
Player *player = getplayer(ref);
if(player == NULL){
@@ -744,23 +787,23 @@ int ObjectRef::l_hud_add(lua_State *L)
return 0;
HudElement *elem = new HudElement;
-
+
elem->type = (HudElementType)getenumfield(L, 2, "hud_elem_type",
es_HudElementType, HUD_ELEM_TEXT);
-
+
lua_getfield(L, 2, "position");
elem->pos = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
lua_pop(L, 1);
-
+
lua_getfield(L, 2, "scale");
elem->scale = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
lua_pop(L, 1);
-
+
elem->name = getstringfield_default(L, 2, "name", "");
elem->text = getstringfield_default(L, 2, "text", "");
elem->number = getintfield_default(L, 2, "number", 0);
elem->item = getintfield_default(L, 2, "item", 0);
- elem->dir = getintfield_default(L, 2, "direction", 0);
+ elem->dir = getintfield_default(L, 2, "dir", 0);
lua_getfield(L, 2, "alignment");
elem->align = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
@@ -770,7 +813,7 @@ int ObjectRef::l_hud_add(lua_State *L)
elem->offset = lua_istable(L, -1) ? read_v2f(L, -1) : v2f();
lua_pop(L, 1);
- u32 id = get_server(L)->hudAdd(player, elem);
+ u32 id = STACK_TO_SERVER(L)->hudAdd(player, elem);
if (id == (u32)-1) {
delete elem;
return 0;
@@ -791,8 +834,8 @@ int ObjectRef::l_hud_remove(lua_State *L)
u32 id = -1;
if (!lua_isnil(L, 2))
id = lua_tonumber(L, 2);
-
- if (!get_server(L)->hudRemove(player, id))
+
+ if (!STACK_TO_SERVER(L)->hudRemove(player, id))
return 0;
lua_pushboolean(L, true);
@@ -807,23 +850,21 @@ int ObjectRef::l_hud_change(lua_State *L)
if (player == NULL)
return 0;
- u32 id = !lua_isnil(L, 2) ? lua_tonumber(L, 2) : -1;
+ u32 id = -1;
+ if (!lua_isnil(L, 2))
+ id = lua_tonumber(L, 2);
+
+ HudElementStat stat = (HudElementStat)getenumfield(L, 3, "stat",
+ es_HudElementStat, HUD_STAT_NUMBER);
+
if (id >= player->hud.size())
return 0;
-
- HudElementStat stat = HUD_STAT_NUMBER;
- if (!lua_isnil(L, 3)) {
- int statint;
- std::string statstr = lua_tostring(L, 3);
- stat = string_to_enum(es_HudElementStat, statint, statstr) ?
- (HudElementStat)statint : HUD_STAT_NUMBER;
- }
-
+
void *value = NULL;
HudElement *e = player->hud[id];
if (!e)
return 0;
-
+
switch (stat) {
case HUD_STAT_POS:
e->pos = read_v2f(L, 4);
@@ -860,7 +901,7 @@ int ObjectRef::l_hud_change(lua_State *L)
value = &e->offset;
}
- get_server(L)->hudChange(player, id, stat, value);
+ STACK_TO_SERVER(L)->hudChange(player, id, stat, value);
lua_pushboolean(L, true);
return 1;
@@ -877,34 +918,34 @@ int ObjectRef::l_hud_get(lua_State *L)
u32 id = lua_tonumber(L, -1);
if (id >= player->hud.size())
return 0;
-
+
HudElement *e = player->hud[id];
if (!e)
return 0;
-
+
lua_newtable(L);
-
+
lua_pushstring(L, es_HudElementType[(u8)e->type].str);
lua_setfield(L, -2, "type");
-
+
push_v2f(L, e->pos);
lua_setfield(L, -2, "position");
-
+
lua_pushstring(L, e->name.c_str());
lua_setfield(L, -2, "name");
-
+
push_v2f(L, e->scale);
lua_setfield(L, -2, "scale");
-
+
lua_pushstring(L, e->text.c_str());
lua_setfield(L, -2, "text");
-
+
lua_pushnumber(L, e->number);
lua_setfield(L, -2, "number");
-
+
lua_pushnumber(L, e->item);
lua_setfield(L, -2, "item");
-
+
lua_pushnumber(L, e->dir);
lua_setfield(L, -2, "dir");
@@ -930,7 +971,24 @@ int ObjectRef::l_hud_set_flags(lua_State *L)
mask |= esp[i].num;
}
}
- if (!get_server(L)->hudSetFlags(player, flags, mask))
+ if (!STACK_TO_SERVER(L)->hudSetFlags(player, flags, mask))
+ return 0;
+
+ lua_pushboolean(L, true);
+ return 1;
+}
+
+// hud_set_hotbar_itemcount(self, hotbar_itemcount)
+int ObjectRef::l_hud_set_hotbar_itemcount(lua_State *L)
+{
+ ObjectRef *ref = checkobject(L, 1);
+ Player *player = getplayer(ref);
+ if (player == NULL)
+ return 0;
+
+ s32 hotbar_itemcount = lua_tonumber(L, 2);
+
+ if (!STACK_TO_SERVER(L)->hudSetHotbarItemcount(player, hotbar_itemcount))
return 0;
lua_pushboolean(L, true);
@@ -1048,162 +1106,8 @@ const luaL_reg ObjectRef::methods[] = {
luamethod(ObjectRef, hud_change),
luamethod(ObjectRef, hud_get),
luamethod(ObjectRef, hud_set_flags),
+ luamethod(ObjectRef, hud_set_hotbar_itemcount),
{0,0}
};
-// Creates a new anonymous reference if cobj=NULL or id=0
-void objectref_get_or_create(lua_State *L,
- ServerActiveObject *cobj)
-{
- if(cobj == NULL || cobj->getId() == 0){
- ObjectRef::create(L, cobj);
- } else {
- objectref_get(L, cobj->getId());
- }
-}
-
-void objectref_get(lua_State *L, u16 id)
-{
- // Get minetest.object_refs[i]
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "object_refs");
- luaL_checktype(L, -1, LUA_TTABLE);
- lua_pushnumber(L, id);
- lua_gettable(L, -2);
- lua_remove(L, -2); // object_refs
- lua_remove(L, -2); // minetest
-}
-
-/*
- ObjectProperties
-*/
-
-void read_object_properties(lua_State *L, int index,
- ObjectProperties *prop)
-{
- if(index < 0)
- index = lua_gettop(L) + 1 + index;
- if(!lua_istable(L, index))
- return;
-
- prop->hp_max = getintfield_default(L, -1, "hp_max", 10);
-
- getboolfield(L, -1, "physical", prop->physical);
-
- getfloatfield(L, -1, "weight", prop->weight);
-
- lua_getfield(L, -1, "collisionbox");
- if(lua_istable(L, -1))
- prop->collisionbox = read_aabb3f(L, -1, 1.0);
- lua_pop(L, 1);
-
- getstringfield(L, -1, "visual", prop->visual);
-
- getstringfield(L, -1, "mesh", prop->mesh);
-
- lua_getfield(L, -1, "visual_size");
- if(lua_istable(L, -1))
- prop->visual_size = read_v2f(L, -1);
- lua_pop(L, 1);
-
- lua_getfield(L, -1, "textures");
- if(lua_istable(L, -1)){
- prop->textures.clear();
- int table = lua_gettop(L);
- lua_pushnil(L);
- while(lua_next(L, table) != 0){
- // key at index -2 and value at index -1
- if(lua_isstring(L, -1))
- prop->textures.push_back(lua_tostring(L, -1));
- else
- prop->textures.push_back("");
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- }
- lua_pop(L, 1);
-
- lua_getfield(L, -1, "colors");
- if(lua_istable(L, -1)){
- prop->colors.clear();
- int table = lua_gettop(L);
- lua_pushnil(L);
- while(lua_next(L, table) != 0){
- // key at index -2 and value at index -1
- if(lua_isstring(L, -1))
- prop->colors.push_back(readARGB8(L, -1));
- else
- prop->colors.push_back(video::SColor(255, 255, 255, 255));
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- }
- lua_pop(L, 1);
-
- lua_getfield(L, -1, "spritediv");
- if(lua_istable(L, -1))
- prop->spritediv = read_v2s16(L, -1);
- lua_pop(L, 1);
-
- lua_getfield(L, -1, "initial_sprite_basepos");
- if(lua_istable(L, -1))
- prop->initial_sprite_basepos = read_v2s16(L, -1);
- lua_pop(L, 1);
-
- getboolfield(L, -1, "is_visible", prop->is_visible);
- getboolfield(L, -1, "makes_footstep_sound", prop->makes_footstep_sound);
- getfloatfield(L, -1, "automatic_rotate", prop->automatic_rotate);
-}
-
-/*
- object_reference
-*/
-
-void scriptapi_add_object_reference(lua_State *L, ServerActiveObject *cobj)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- //infostream<<"scriptapi_add_object_reference: id="<<cobj->getId()<<std::endl;
- StackUnroller stack_unroller(L);
-
- // Create object on stack
- ObjectRef::create(L, cobj); // Puts ObjectRef (as userdata) on stack
- int object = lua_gettop(L);
-
- // Get minetest.object_refs table
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "object_refs");
- luaL_checktype(L, -1, LUA_TTABLE);
- int objectstable = lua_gettop(L);
-
- // object_refs[id] = object
- lua_pushnumber(L, cobj->getId()); // Push id
- lua_pushvalue(L, object); // Copy object to top of stack
- lua_settable(L, objectstable);
-}
-
-void scriptapi_rm_object_reference(lua_State *L, ServerActiveObject *cobj)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- //infostream<<"scriptapi_rm_object_reference: id="<<cobj->getId()<<std::endl;
- StackUnroller stack_unroller(L);
-
- // Get minetest.object_refs table
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "object_refs");
- luaL_checktype(L, -1, LUA_TTABLE);
- int objectstable = lua_gettop(L);
-
- // Get object_refs[id]
- lua_pushnumber(L, cobj->getId()); // Push id
- lua_gettable(L, objectstable);
- // Set object reference to NULL
- ObjectRef::set_null(L);
- lua_pop(L, 1); // pop object
-
- // Set object_refs[id] = nil
- lua_pushnumber(L, cobj->getId()); // Push id
- lua_pushnil(L);
- lua_settable(L, objectstable);
-}
+REGISTER_LUA_REF(ObjectRef)
diff --git a/src/scriptapi_object.h b/src/script/lua_api/l_object.h
similarity index 84%
rename from src/scriptapi_object.h
rename to src/script/lua_api/l_object.h
index 82535ee94fdfd8ee02ffbdcf2d1f634252fc68f9..57dac0e6486eea17fdd08223c3d572bfd7c646be 100644
--- a/src/scriptapi_object.h
+++ b/src/script/lua_api/l_object.h
@@ -17,17 +17,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LUA_OBJECT_H_
-#define LUA_OBJECT_H_
+#ifndef L_OBJECT_H_
+#define L_OBJECT_H_
extern "C" {
#include <lua.h>
#include <lauxlib.h>
}
-#include "serverobject.h"
-#include "content_sao.h"
-#include "player.h"
+class ServerActiveObject;
+class LuaEntitySAO;
+class PlayerSAO;
+class Player;
/*
ObjectRef
@@ -199,12 +200,18 @@ class ObjectRef
// hud_change(self, id, stat, data)
static int l_hud_change(lua_State *L);
+ // hud_get_next_id(self)
+ static u32 hud_get_next_id(lua_State *L);
+
// hud_get(self, id)
static int l_hud_get(lua_State *L);
// hud_set_flags(self, flags)
static int l_hud_set_flags(lua_State *L);
+ // hud_set_hotbar_itemcount(self, hotbar_itemcount)
+ static int l_hud_set_hotbar_itemcount(lua_State *L);
+
public:
ObjectRef(ServerActiveObject *object);
@@ -219,20 +226,4 @@ class ObjectRef
static void Register(lua_State *L);
};
-/*****************************************************************************/
-/* scriptapi internal */
-/*****************************************************************************/
-// Creates a new anonymous reference if cobj=NULL or id=0
-void objectref_get_or_create(lua_State *L,
- ServerActiveObject *cobj);
-void objectref_get(lua_State *L, u16 id);
-void read_object_properties(lua_State *L, int index,
- ObjectProperties *prop);
-
-/*****************************************************************************/
-/* Minetest interface */
-/*****************************************************************************/
-void scriptapi_add_object_reference(lua_State *L, ServerActiveObject *cobj);
-void scriptapi_rm_object_reference(lua_State *L, ServerActiveObject *cobj);
-
-#endif /* LUA_OBJECT_H_ */
+#endif /* L_OBJECT_H_ */
diff --git a/src/scriptapi_particles.cpp b/src/script/lua_api/l_particles.cpp
similarity index 79%
rename from src/scriptapi_particles.cpp
rename to src/script/lua_api/l_particles.cpp
index dc9b3776e82876c6f7bb6312ec6b14f382a2fd28..c291cc21e375c4059c46a54ac2a9a43d2002b93b 100644
--- a/src/scriptapi_particles.cpp
+++ b/src/script/lua_api/l_particles.cpp
@@ -17,12 +17,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#include "scriptapi.h"
-#include "scriptapi_particles.h"
+#include "cpp_api/scriptapi.h"
+#include "common/c_converter.h"
+#include "lua_api/l_base.h"
+#include "lua_api/l_particles.h"
#include "server.h"
-#include "script.h"
-#include "scriptapi_types.h"
-#include "scriptapi_common.h"
+#include "common/c_internal.h"
+
+bool ModApiParticles::Initialize(lua_State *L, int top) {
+ bool retval = true;
+
+ retval &= API_FCT(add_particle);
+ retval &= API_FCT(add_particlespawner);
+ retval &= API_FCT(delete_particlespawner);
+
+ return retval;
+}
// add_particle(pos, velocity, acceleration, expirationtime,
// size, collisiondetection, texture, player)
@@ -30,10 +40,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// expirationtime = num (seconds)
// size = num
// texture = e.g."default_wood.png"
-int l_add_particle(lua_State *L)
+int ModApiParticles::l_add_particle(lua_State *L)
{
- // Get server from registry
- Server *server = get_server(L);
// Get parameters
v3f pos = check_v3f(L, 1);
v3f vel = check_v3f(L, 2);
@@ -46,13 +54,13 @@ int l_add_particle(lua_State *L)
if (lua_gettop(L) == 8) // only spawn for a single player
{
const char *playername = luaL_checkstring(L, 8);
- server->spawnParticle(playername,
+ getServer(L)->spawnParticle(playername,
pos, vel, acc, expirationtime,
size, collisiondetection, texture);
}
else // spawn for all players
{
- server->spawnParticleAll(pos, vel, acc,
+ getServer(L)->spawnParticleAll(pos, vel, acc,
expirationtime, size, collisiondetection, texture);
}
return 1;
@@ -72,10 +80,8 @@ int l_add_particle(lua_State *L)
// minsize/maxsize = num
// collisiondetection = bool
// texture = e.g."default_wood.png"
-int l_add_particlespawner(lua_State *L)
+int ModApiParticles::l_add_particlespawner(lua_State *L)
{
- // Get server from registry
- Server *server = get_server(L);
// Get parameters
u16 amount = luaL_checknumber(L, 1);
float time = luaL_checknumber(L, 2);
@@ -95,7 +101,7 @@ int l_add_particlespawner(lua_State *L)
if (lua_gettop(L) == 15) // only spawn for a single player
{
const char *playername = luaL_checkstring(L, 15);
- u32 id = server->addParticleSpawner(playername,
+ u32 id = getServer(L)->addParticleSpawner(playername,
amount, time,
minpos, maxpos,
minvel, maxvel,
@@ -108,7 +114,7 @@ int l_add_particlespawner(lua_State *L)
}
else // spawn for all players
{
- u32 id = server->addParticleSpawnerAll( amount, time,
+ u32 id = getServer(L)->addParticleSpawnerAll( amount, time,
minpos, maxpos,
minvel, maxvel,
minacc, maxacc,
@@ -123,21 +129,21 @@ int l_add_particlespawner(lua_State *L)
// delete_particlespawner(id, player)
// player (string) is optional
-int l_delete_particlespawner(lua_State *L)
+int ModApiParticles::l_delete_particlespawner(lua_State *L)
{
- // Get server from registry
- Server *server = get_server(L);
// Get parameters
u32 id = luaL_checknumber(L, 1);
if (lua_gettop(L) == 2) // only delete for one player
{
const char *playername = luaL_checkstring(L, 2);
- server->deleteParticleSpawner(playername, id);
+ getServer(L)->deleteParticleSpawner(playername, id);
}
else // delete for all players
{
- server->deleteParticleSpawnerAll(id);
+ getServer(L)->deleteParticleSpawnerAll(id);
}
return 1;
}
+
+ModApiParticles modapiparticles_prototyp;
diff --git a/src/scriptapi_particles.h b/src/script/lua_api/l_particles.h
similarity index 71%
rename from src/scriptapi_particles.h
rename to src/script/lua_api/l_particles.h
index 4b37d7ce19fcea9cca089dcc1c92a41b4a03883f..3729f8761ed5637793786df7c5104d46fdedf533 100644
--- a/src/scriptapi_particles.h
+++ b/src/script/lua_api/l_particles.h
@@ -1,5 +1,5 @@
/*
-Minetest-c55
+Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
@@ -17,16 +17,23 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef LUA_PARTICLES_H_
-#define LUA_PARTICLES_H_
+#ifndef L_PARTICLES_H_
+#define L_PARTICLES_H_
extern "C" {
#include <lua.h>
#include <lauxlib.h>
}
-int l_add_particle(lua_State *L);
-int l_add_particlespawner(lua_State *L);
-int l_delete_particlespawner(lua_State *L);
+class ModApiParticles : public ModApiBase {
+public:
+ bool Initialize(lua_State *L, int top);
+private:
+ static int l_add_particle(lua_State *L);
+ static int l_add_particlespawner(lua_State *L);
+ static int l_delete_particlespawner(lua_State *L);
+};
-#endif
+
+
+#endif // L_PARTICLES_H_
diff --git a/src/script/lua_api/luaapi.cpp b/src/script/lua_api/luaapi.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b75304b3abfc253ce78bba0a75e07fc0f6a565ab
--- /dev/null
+++ b/src/script/lua_api/luaapi.cpp
@@ -0,0 +1,653 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+extern "C" {
+#include "lua.h"
+#include "lauxlib.h"
+}
+
+#include "lua_api/l_base.h"
+#include "common/c_internal.h"
+#include "server.h"
+#include "common/c_converter.h"
+#include "common/c_content.h"
+#include "lua_api/luaapi.h"
+#include "settings.h"
+#include "tool.h"
+#include "rollback.h"
+#include "log.h"
+#include "emerge.h"
+#include "main.h" //required for g_settings
+
+struct EnumString ModApiBasic::es_OreType[] =
+{
+ {ORE_SCATTER, "scatter"},
+ {ORE_SHEET, "sheet"},
+ {ORE_CLAYLIKE, "claylike"},
+ {0, NULL},
+};
+
+
+ModApiBasic::ModApiBasic() : ModApiBase() {
+}
+
+bool ModApiBasic::Initialize(lua_State* L,int top) {
+
+ bool retval = true;
+
+ retval &= API_FCT(debug);
+ retval &= API_FCT(log);
+ retval &= API_FCT(request_shutdown);
+ retval &= API_FCT(get_server_status);
+
+ retval &= API_FCT(register_biome);
+
+ retval &= API_FCT(setting_set);
+ retval &= API_FCT(setting_get);
+ retval &= API_FCT(setting_getbool);
+ retval &= API_FCT(setting_save);
+
+ retval &= API_FCT(chat_send_all);
+ retval &= API_FCT(chat_send_player);
+ retval &= API_FCT(show_formspec);
+
+ retval &= API_FCT(get_player_privs);
+ retval &= API_FCT(get_player_ip);
+ retval &= API_FCT(get_ban_list);
+ retval &= API_FCT(get_ban_description);
+ retval &= API_FCT(ban_player);
+ retval &= API_FCT(unban_player_of_ip);
+ retval &= API_FCT(get_password_hash);
+ retval &= API_FCT(notify_authentication_modified);
+
+ retval &= API_FCT(get_dig_params);
+ retval &= API_FCT(get_hit_params);
+
+ retval &= API_FCT(get_current_modname);
+ retval &= API_FCT(get_modpath);
+ retval &= API_FCT(get_modnames);
+
+ retval &= API_FCT(get_worldpath);
+ retval &= API_FCT(is_singleplayer);
+ retval &= API_FCT(sound_play);
+ retval &= API_FCT(sound_stop);
+
+ retval &= API_FCT(rollback_get_last_node_actor);
+ retval &= API_FCT(rollback_revert_actions_by);
+
+ retval &= API_FCT(register_ore);
+
+ return retval;
+}
+
+// debug(text)
+// Writes a line to dstream
+int ModApiBasic::l_debug(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ std::string text = lua_tostring(L, 1);
+ dstream << text << std::endl;
+ return 0;
+}
+
+// log([level,] text)
+// Writes a line to the logger.
+// The one-argument version logs to infostream.
+// The two-argument version accept a log level: error, action, info, or verbose.
+int ModApiBasic::l_log(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ std::string text;
+ LogMessageLevel level = LMT_INFO;
+ if(lua_isnone(L, 2))
+ {
+ text = lua_tostring(L, 1);
+ }
+ else
+ {
+ std::string levelname = luaL_checkstring(L, 1);
+ text = luaL_checkstring(L, 2);
+ if(levelname == "error")
+ level = LMT_ERROR;
+ else if(levelname == "action")
+ level = LMT_ACTION;
+ else if(levelname == "verbose")
+ level = LMT_VERBOSE;
+ }
+ log_printline(level, text);
+ return 0;
+}
+
+// request_shutdown()
+int ModApiBasic::l_request_shutdown(lua_State *L)
+{
+ getServer(L)->requestShutdown();
+ return 0;
+}
+
+// get_server_status()
+int ModApiBasic::l_get_server_status(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ lua_pushstring(L, wide_to_narrow(getServer(L)->getStatusString()).c_str());
+ return 1;
+}
+
+// register_biome({lots of stuff})
+int ModApiBasic::l_register_biome(lua_State *L)
+{
+ int index = 1;
+ luaL_checktype(L, index, LUA_TTABLE);
+
+ BiomeDefManager *bmgr = getServer(L)->getEmergeManager()->biomedef;
+ if (!bmgr) {
+ verbosestream << "register_biome: BiomeDefManager not active" << std::endl;
+ return 0;
+ }
+
+ enum BiomeTerrainType terrain = (BiomeTerrainType)getenumfield(L, index,
+ "terrain_type", es_BiomeTerrainType, BIOME_TERRAIN_NORMAL);
+ Biome *b = bmgr->createBiome(terrain);
+
+ b->name = getstringfield_default(L, index, "name", "");
+ b->top_nodename = getstringfield_default(L, index, "top_node", "");
+ b->top_depth = getintfield_default(L, index, "top_depth", 0);
+ b->filler_nodename = getstringfield_default(L, index, "filler_node", "");
+ b->filler_height = getintfield_default(L, index, "filler_height", 0);
+ b->height_min = getintfield_default(L, index, "height_min", 0);
+ b->height_max = getintfield_default(L, index, "height_max", 0);
+ b->heat_point = getfloatfield_default(L, index, "heat_point", 0.);
+ b->humidity_point = getfloatfield_default(L, index, "humidity_point", 0.);
+
+ b->flags = 0; //reserved
+ b->c_top = CONTENT_IGNORE;
+ b->c_filler = CONTENT_IGNORE;
+ bmgr->addBiome(b);
+
+ verbosestream << "register_biome: " << b->name << std::endl;
+ return 0;
+}
+
+
+
+// setting_set(name, value)
+int ModApiBasic::l_setting_set(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char *name = luaL_checkstring(L, 1);
+ const char *value = luaL_checkstring(L, 2);
+ g_settings->set(name, value);
+ return 0;
+}
+
+// setting_get(name)
+int ModApiBasic::l_setting_get(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char *name = luaL_checkstring(L, 1);
+ try{
+ std::string value = g_settings->get(name);
+ lua_pushstring(L, value.c_str());
+ } catch(SettingNotFoundException &e){
+ lua_pushnil(L);
+ }
+ return 1;
+}
+
+// setting_getbool(name)
+int ModApiBasic::l_setting_getbool(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char *name = luaL_checkstring(L, 1);
+ try{
+ bool value = g_settings->getBool(name);
+ lua_pushboolean(L, value);
+ } catch(SettingNotFoundException &e){
+ lua_pushnil(L);
+ }
+ return 1;
+}
+
+// setting_save()
+int ModApiBasic::l_setting_save(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ getServer(L)->saveConfig();
+ return 0;
+}
+
+// chat_send_all(text)
+int ModApiBasic::l_chat_send_all(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char *text = luaL_checkstring(L, 1);
+ // Get server from registry
+ Server *server = getServer(L);
+ // Send
+ server->notifyPlayers(narrow_to_wide(text));
+ return 0;
+}
+
+// chat_send_player(name, text, prepend)
+int ModApiBasic::l_chat_send_player(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char *name = luaL_checkstring(L, 1);
+ const char *text = luaL_checkstring(L, 2);
+ bool prepend = true;
+
+ if (lua_isboolean(L, 3))
+ prepend = lua_toboolean(L, 3);
+
+ // Get server from registry
+ Server *server = getServer(L);
+ // Send
+ server->notifyPlayer(name, narrow_to_wide(text), prepend);
+ return 0;
+}
+
+// get_player_privs(name, text)
+int ModApiBasic::l_get_player_privs(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char *name = luaL_checkstring(L, 1);
+ // Get server from registry
+ Server *server = getServer(L);
+ // Do it
+ lua_newtable(L);
+ int table = lua_gettop(L);
+ std::set<std::string> privs_s = server->getPlayerEffectivePrivs(name);
+ for(std::set<std::string>::const_iterator
+ i = privs_s.begin(); i != privs_s.end(); i++){
+ lua_pushboolean(L, true);
+ lua_setfield(L, table, i->c_str());
+ }
+ lua_pushvalue(L, table);
+ return 1;
+}
+
+// get_player_ip()
+int ModApiBasic::l_get_player_ip(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char * name = luaL_checkstring(L, 1);
+ Player *player = getEnv(L)->getPlayer(name);
+ if(player == NULL)
+ {
+ lua_pushnil(L); // no such player
+ return 1;
+ }
+ try
+ {
+ Address addr = getServer(L)->getPeerAddress(getEnv(L)->getPlayer(name)->peer_id);
+ std::string ip_str = addr.serializeString();
+ lua_pushstring(L, ip_str.c_str());
+ return 1;
+ }
+ catch(con::PeerNotFoundException) // unlikely
+ {
+ dstream << __FUNCTION_NAME << ": peer was not found" << std::endl;
+ lua_pushnil(L); // error
+ return 1;
+ }
+}
+
+// get_ban_list()
+int ModApiBasic::l_get_ban_list(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ lua_pushstring(L, getServer(L)->getBanDescription("").c_str());
+ return 1;
+}
+
+// get_ban_description()
+int ModApiBasic::l_get_ban_description(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char * ip_or_name = luaL_checkstring(L, 1);
+ lua_pushstring(L, getServer(L)->getBanDescription(std::string(ip_or_name)).c_str());
+ return 1;
+}
+
+// ban_player()
+int ModApiBasic::l_ban_player(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char * name = luaL_checkstring(L, 1);
+ Player *player = getEnv(L)->getPlayer(name);
+ if(player == NULL)
+ {
+ lua_pushboolean(L, false); // no such player
+ return 1;
+ }
+ try
+ {
+ Address addr = getServer(L)->getPeerAddress(getEnv(L)->getPlayer(name)->peer_id);
+ std::string ip_str = addr.serializeString();
+ getServer(L)->setIpBanned(ip_str, name);
+ }
+ catch(con::PeerNotFoundException) // unlikely
+ {
+ dstream << __FUNCTION_NAME << ": peer was not found" << std::endl;
+ lua_pushboolean(L, false); // error
+ return 1;
+ }
+ lua_pushboolean(L, true);
+ return 1;
+}
+
+// unban_player_or_ip()
+int ModApiBasic::l_unban_player_of_ip(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char * ip_or_name = luaL_checkstring(L, 1);
+ getServer(L)->unsetIpBanned(ip_or_name);
+ lua_pushboolean(L, true);
+ return 1;
+}
+
+// show_formspec(playername,formname,formspec)
+int ModApiBasic::l_show_formspec(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ const char *playername = luaL_checkstring(L, 1);
+ const char *formname = luaL_checkstring(L, 2);
+ const char *formspec = luaL_checkstring(L, 3);
+
+ if(getServer(L)->showFormspec(playername,formspec,formname))
+ {
+ lua_pushboolean(L, true);
+ }else{
+ lua_pushboolean(L, false);
+ }
+ return 1;
+}
+
+// get_dig_params(groups, tool_capabilities[, time_from_last_punch])
+int ModApiBasic::l_get_dig_params(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ std::map<std::string, int> groups;
+ read_groups(L, 1, groups);
+ ToolCapabilities tp = read_tool_capabilities(L, 2);
+ if(lua_isnoneornil(L, 3))
+ push_dig_params(L, getDigParams(groups, &tp));
+ else
+ push_dig_params(L, getDigParams(groups, &tp,
+ luaL_checknumber(L, 3)));
+ return 1;
+}
+
+// get_hit_params(groups, tool_capabilities[, time_from_last_punch])
+int ModApiBasic::l_get_hit_params(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ std::map<std::string, int> groups;
+ read_groups(L, 1, groups);
+ ToolCapabilities tp = read_tool_capabilities(L, 2);
+ if(lua_isnoneornil(L, 3))
+ push_hit_params(L, getHitParams(groups, &tp));
+ else
+ push_hit_params(L, getHitParams(groups, &tp,
+ luaL_checknumber(L, 3)));
+ return 1;
+}
+
+// get_current_modname()
+int ModApiBasic::l_get_current_modname(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ lua_getfield(L, LUA_REGISTRYINDEX, "minetest_current_modname");
+ return 1;
+}
+
+// get_modpath(modname)
+int ModApiBasic::l_get_modpath(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ std::string modname = luaL_checkstring(L, 1);
+ // Do it
+ if(modname == "__builtin"){
+ std::string path = getServer(L)->getBuiltinLuaPath();
+ lua_pushstring(L, path.c_str());
+ return 1;
+ }
+ const ModSpec *mod = getServer(L)->getModSpec(modname);
+ if(!mod){
+ lua_pushnil(L);
+ return 1;
+ }
+ lua_pushstring(L, mod->path.c_str());
+ return 1;
+}
+
+// get_modnames()
+// the returned list is sorted alphabetically for you
+int ModApiBasic::l_get_modnames(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ // Get a list of mods
+ std::list<std::string> mods_unsorted, mods_sorted;
+ getServer(L)->getModNames(mods_unsorted);
+
+ // Take unsorted items from mods_unsorted and sort them into
+ // mods_sorted; not great performance but the number of mods on a
+ // server will likely be small.
+ for(std::list<std::string>::iterator i = mods_unsorted.begin();
+ i != mods_unsorted.end(); ++i)
+ {
+ bool added = false;
+ for(std::list<std::string>::iterator x = mods_sorted.begin();
+ x != mods_sorted.end(); ++x)
+ {
+ // I doubt anybody using Minetest will be using
+ // anything not ASCII based :)
+ if((*i).compare(*x) <= 0)
+ {
+ mods_sorted.insert(x, *i);
+ added = true;
+ break;
+ }
+ }
+ if(!added)
+ mods_sorted.push_back(*i);
+ }
+
+ // Get the table insertion function from Lua.
+ lua_getglobal(L, "table");
+ lua_getfield(L, -1, "insert");
+ int insertion_func = lua_gettop(L);
+
+ // Package them up for Lua
+ lua_newtable(L);
+ int new_table = lua_gettop(L);
+ std::list<std::string>::iterator i = mods_sorted.begin();
+ while(i != mods_sorted.end())
+ {
+ lua_pushvalue(L, insertion_func);
+ lua_pushvalue(L, new_table);
+ lua_pushstring(L, (*i).c_str());
+ if(lua_pcall(L, 2, 0, 0) != 0)
+ {
+ script_error(L, "error: %s", lua_tostring(L, -1));
+ }
+ ++i;
+ }
+ return 1;
+}
+
+// get_worldpath()
+int ModApiBasic::l_get_worldpath(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ std::string worldpath = getServer(L)->getWorldPath();
+ lua_pushstring(L, worldpath.c_str());
+ return 1;
+}
+
+// sound_play(spec, parameters)
+int ModApiBasic::l_sound_play(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ SimpleSoundSpec spec;
+ read_soundspec(L, 1, spec);
+ ServerSoundParams params;
+ read_server_sound_params(L, 2, params);
+ s32 handle = getServer(L)->playSound(spec, params);
+ lua_pushinteger(L, handle);
+ return 1;
+}
+
+// sound_stop(handle)
+int ModApiBasic::l_sound_stop(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ int handle = luaL_checkinteger(L, 1);
+ getServer(L)->stopSound(handle);
+ return 0;
+}
+
+// is_singleplayer()
+int ModApiBasic::l_is_singleplayer(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ lua_pushboolean(L, getServer(L)->isSingleplayer());
+ return 1;
+}
+
+// get_password_hash(name, raw_password)
+int ModApiBasic::l_get_password_hash(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ std::string name = luaL_checkstring(L, 1);
+ std::string raw_password = luaL_checkstring(L, 2);
+ std::string hash = translatePassword(name,
+ narrow_to_wide(raw_password));
+ lua_pushstring(L, hash.c_str());
+ return 1;
+}
+
+// notify_authentication_modified(name)
+int ModApiBasic::l_notify_authentication_modified(lua_State *L)
+{
+ NO_MAP_LOCK_REQUIRED;
+ std::string name = "";
+ if(lua_isstring(L, 1))
+ name = lua_tostring(L, 1);
+ getServer(L)->reportPrivsModified(name);
+ return 0;
+}
+
+// rollback_get_last_node_actor(p, range, seconds) -> actor, p, seconds
+int ModApiBasic::l_rollback_get_last_node_actor(lua_State *L)
+{
+ v3s16 p = read_v3s16(L, 1);
+ int range = luaL_checknumber(L, 2);
+ int seconds = luaL_checknumber(L, 3);
+ Server *server = getServer(L);
+ IRollbackManager *rollback = server->getRollbackManager();
+ v3s16 act_p;
+ int act_seconds = 0;
+ std::string actor = rollback->getLastNodeActor(p, range, seconds, &act_p, &act_seconds);
+ lua_pushstring(L, actor.c_str());
+ push_v3s16(L, act_p);
+ lua_pushnumber(L, act_seconds);
+ return 3;
+}
+
+// rollback_revert_actions_by(actor, seconds) -> bool, log messages
+int ModApiBasic::l_rollback_revert_actions_by(lua_State *L)
+{
+ std::string actor = luaL_checkstring(L, 1);
+ int seconds = luaL_checknumber(L, 2);
+ Server *server = getServer(L);
+ IRollbackManager *rollback = server->getRollbackManager();
+ std::list<RollbackAction> actions = rollback->getRevertActions(actor, seconds);
+ std::list<std::string> log;
+ bool success = server->rollbackRevertActions(actions, &log);
+ // Push boolean result
+ lua_pushboolean(L, success);
+ // Get the table insert function and push the log table
+ lua_getglobal(L, "table");
+ lua_getfield(L, -1, "insert");
+ int table_insert = lua_gettop(L);
+ lua_newtable(L);
+ int table = lua_gettop(L);
+ for(std::list<std::string>::const_iterator i = log.begin();
+ i != log.end(); i++)
+ {
+ lua_pushvalue(L, table_insert);
+ lua_pushvalue(L, table);
+ lua_pushstring(L, i->c_str());
+ if(lua_pcall(L, 2, 0, 0))
+ script_error(L, "error: %s", lua_tostring(L, -1));
+ }
+ lua_remove(L, -2); // Remove table
+ lua_remove(L, -2); // Remove insert
+ return 2;
+}
+
+int ModApiBasic::l_register_ore(lua_State *L)
+{
+ int index = 1;
+ luaL_checktype(L, index, LUA_TTABLE);
+
+ EmergeManager *emerge = getServer(L)->getEmergeManager();
+
+ enum OreType oretype = (OreType)getenumfield(L, index,
+ "ore_type", es_OreType, ORE_SCATTER);
+ Ore *ore = createOre(oretype);
+ if (!ore) {
+ errorstream << "register_ore: ore_type "
+ << oretype << " not implemented";
+ return 0;
+ }
+
+ ore->ore_name = getstringfield_default(L, index, "ore", "");
+ ore->ore_param2 = (u8)getintfield_default(L, index, "ore_param2", 0);
+ ore->wherein_name = getstringfield_default(L, index, "wherein", "");
+ ore->clust_scarcity = getintfield_default(L, index, "clust_scarcity", 1);
+ ore->clust_num_ores = getintfield_default(L, index, "clust_num_ores", 1);
+ ore->clust_size = getintfield_default(L, index, "clust_size", 0);
+ ore->height_min = getintfield_default(L, index, "height_min", 0);
+ ore->height_max = getintfield_default(L, index, "height_max", 0);
+ ore->flags = getflagsfield(L, index, "flags", flagdesc_ore);
+ ore->nthresh = getfloatfield_default(L, index, "noise_threshhold", 0.);
+
+ lua_getfield(L, index, "noise_params");
+ ore->np = read_noiseparams(L, -1);
+ lua_pop(L, 1);
+
+ ore->noise = NULL;
+
+ if (ore->clust_scarcity <= 0 || ore->clust_num_ores <= 0) {
+ errorstream << "register_ore: clust_scarcity and clust_num_ores"
+ "must be greater than 0" << std::endl;
+ delete ore;
+ return 0;
+ }
+
+ emerge->ores.push_back(ore);
+
+ verbosestream << "register_ore: ore '" << ore->ore_name
+ << "' registered" << std::endl;
+ return 0;
+}
+
+ModApiBasic modapibasic_prototype;
diff --git a/src/script/lua_api/luaapi.h b/src/script/lua_api/luaapi.h
new file mode 100644
index 0000000000000000000000000000000000000000..592046965ca6b3251f3174f202400e81c84ab8f6
--- /dev/null
+++ b/src/script/lua_api/luaapi.h
@@ -0,0 +1,140 @@
+/*
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef LUAAPI_H_
+#define LUAAPI_H_
+
+
+class ModApiBasic : public ModApiBase {
+
+public:
+ ModApiBasic();
+
+ bool Initialize(lua_State* L,int top);
+
+private:
+ // debug(text)
+ // Writes a line to dstream
+ static int l_debug(lua_State *L);
+
+ // log([level,] text)
+ // Writes a line to the logger.
+ // The one-argument version logs to infostream.
+ // The two-argument version accept a log level: error, action, info, or verbose.
+ static int l_log(lua_State *L);
+
+ // request_shutdown()
+ static int l_request_shutdown(lua_State *L);
+
+ // get_server_status()
+ static int l_get_server_status(lua_State *L);
+
+ // register_biome_groups({frequencies})
+ static int l_register_biome_groups(lua_State *L);
+
+ // register_biome({lots of stuff})
+ static int l_register_biome(lua_State *L);
+
+ // setting_set(name, value)
+ static int l_setting_set(lua_State *L);
+
+ // setting_get(name)
+ static int l_setting_get(lua_State *L);
+
+ // setting_getbool(name)
+ static int l_setting_getbool(lua_State *L);
+
+ // setting_save()
+ static int l_setting_save(lua_State *L);
+
+ // chat_send_all(text)
+ static int l_chat_send_all(lua_State *L);
+
+ // chat_send_player(name, text)
+ static int l_chat_send_player(lua_State *L);
+
+ // get_player_privs(name, text)
+ static int l_get_player_privs(lua_State *L);
+
+ // get_player_ip()
+ static int l_get_player_ip(lua_State *L);
+
+ // get_ban_list()
+ static int l_get_ban_list(lua_State *L);
+
+ // get_ban_description()
+ static int l_get_ban_description(lua_State *L);
+
+ // ban_player()
+ static int l_ban_player(lua_State *L);
+
+ // unban_player_or_ip()
+ static int l_unban_player_of_ip(lua_State *L);
+
+ // show_formspec(playername,formname,formspec)
+ static int l_show_formspec(lua_State *L);
+
+ // get_dig_params(groups, tool_capabilities[, time_from_last_punch])
+ static int l_get_dig_params(lua_State *L);
+
+ // get_hit_params(groups, tool_capabilities[, time_from_last_punch])
+ static int l_get_hit_params(lua_State *L);
+
+ // get_current_modname()
+ static int l_get_current_modname(lua_State *L);
+
+ // get_modpath(modname)
+ static int l_get_modpath(lua_State *L);
+
+ // get_modnames()
+ // the returned list is sorted alphabetically for you
+ static int l_get_modnames(lua_State *L);
+
+ // get_worldpath()
+ static int l_get_worldpath(lua_State *L);
+
+ // sound_play(spec, parameters)
+ static int l_sound_play(lua_State *L);
+
+ // sound_stop(handle)
+ static int l_sound_stop(lua_State *L);
+
+ // is_singleplayer()
+ static int l_is_singleplayer(lua_State *L);
+
+ // get_password_hash(name, raw_password)
+ static int l_get_password_hash(lua_State *L);
+
+ // notify_authentication_modified(name)
+ static int l_notify_authentication_modified(lua_State *L);
+
+ // rollback_get_last_node_actor(p, range, seconds) -> actor, p, seconds
+ static int l_rollback_get_last_node_actor(lua_State *L);
+
+ // rollback_revert_actions_by(actor, seconds) -> bool, log messages
+ static int l_rollback_revert_actions_by(lua_State *L);
+
+ static int l_register_ore(lua_State *L);
+
+ static struct EnumString es_OreType[];
+};
+
+
+
+#endif /* LUAAPI_H_ */
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
deleted file mode 100644
index 26759a05958957b5d7e498f834a41ae62d7394fe..0000000000000000000000000000000000000000
--- a/src/scriptapi.cpp
+++ /dev/null
@@ -1,1181 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "scriptapi.h"
-
-#include <iostream>
-#include <list>
-extern "C" {
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-}
-
-#include "settings.h" // For accessing g_settings
-#include "main.h" // For g_settings
-#include "biome.h"
-#include "emerge.h"
-#include "script.h"
-#include "rollback.h"
-
-#include "scriptapi_types.h"
-#include "scriptapi_env.h"
-#include "scriptapi_nodetimer.h"
-#include "scriptapi_inventory.h"
-#include "scriptapi_nodemeta.h"
-#include "scriptapi_object.h"
-#include "scriptapi_noise.h"
-#include "scriptapi_common.h"
-#include "scriptapi_item.h"
-#include "scriptapi_content.h"
-#include "scriptapi_craft.h"
-#include "scriptapi_particles.h"
-
-/*****************************************************************************/
-/* Mod related */
-/*****************************************************************************/
-
-class ModNameStorer
-{
-private:
- lua_State *L;
-public:
- ModNameStorer(lua_State *L_, const std::string modname):
- L(L_)
- {
- // Store current modname in registry
- lua_pushstring(L, modname.c_str());
- lua_setfield(L, LUA_REGISTRYINDEX, "minetest_current_modname");
- }
- ~ModNameStorer()
- {
- // Clear current modname in registry
- lua_pushnil(L);
- lua_setfield(L, LUA_REGISTRYINDEX, "minetest_current_modname");
- }
-};
-
-bool scriptapi_loadmod(lua_State *L, const std::string &scriptpath,
- const std::string &modname)
-{
- ModNameStorer modnamestorer(L, modname);
-
- if(!string_allowed(modname, MODNAME_ALLOWED_CHARS)){
- errorstream<<"Error loading mod \""<<modname
- <<"\": modname does not follow naming conventions: "
- <<"Only chararacters [a-z0-9_] are allowed."<<std::endl;
- return false;
- }
-
- bool success = false;
-
- try{
- success = script_load(L, scriptpath.c_str());
- }
- catch(LuaError &e){
- errorstream<<"Error loading mod \""<<modname
- <<"\": "<<e.what()<<std::endl;
- }
-
- return success;
-}
-
-
-/*****************************************************************************/
-/* Auth */
-/*****************************************************************************/
-
-/*
- Privileges
-*/
-static void read_privileges(lua_State *L, int index,
- std::set<std::string> &result)
-{
- result.clear();
- lua_pushnil(L);
- if(index < 0)
- index -= 1;
- while(lua_next(L, index) != 0){
- // key at index -2 and value at index -1
- std::string key = luaL_checkstring(L, -2);
- bool value = lua_toboolean(L, -1);
- if(value)
- result.insert(key);
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
-}
-
-static void get_auth_handler(lua_State *L)
-{
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_auth_handler");
- if(lua_isnil(L, -1)){
- lua_pop(L, 1);
- lua_getfield(L, -1, "builtin_auth_handler");
- }
- if(lua_type(L, -1) != LUA_TTABLE)
- throw LuaError(L, "Authentication handler table not valid");
-}
-
-bool scriptapi_get_auth(lua_State *L, const std::string &playername,
- std::string *dst_password, std::set<std::string> *dst_privs)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- get_auth_handler(L);
- lua_getfield(L, -1, "get_auth");
- if(lua_type(L, -1) != LUA_TFUNCTION)
- throw LuaError(L, "Authentication handler missing get_auth");
- lua_pushstring(L, playername.c_str());
- if(lua_pcall(L, 1, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-
- // nil = login not allowed
- if(lua_isnil(L, -1))
- return false;
- luaL_checktype(L, -1, LUA_TTABLE);
-
- std::string password;
- bool found = getstringfield(L, -1, "password", password);
- if(!found)
- throw LuaError(L, "Authentication handler didn't return password");
- if(dst_password)
- *dst_password = password;
-
- lua_getfield(L, -1, "privileges");
- if(!lua_istable(L, -1))
- throw LuaError(L,
- "Authentication handler didn't return privilege table");
- if(dst_privs)
- read_privileges(L, -1, *dst_privs);
- lua_pop(L, 1);
-
- return true;
-}
-
-void scriptapi_create_auth(lua_State *L, const std::string &playername,
- const std::string &password)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- get_auth_handler(L);
- lua_getfield(L, -1, "create_auth");
- if(lua_type(L, -1) != LUA_TFUNCTION)
- throw LuaError(L, "Authentication handler missing create_auth");
- lua_pushstring(L, playername.c_str());
- lua_pushstring(L, password.c_str());
- if(lua_pcall(L, 2, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
-
-bool scriptapi_set_password(lua_State *L, const std::string &playername,
- const std::string &password)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- get_auth_handler(L);
- lua_getfield(L, -1, "set_password");
- if(lua_type(L, -1) != LUA_TFUNCTION)
- throw LuaError(L, "Authentication handler missing set_password");
- lua_pushstring(L, playername.c_str());
- lua_pushstring(L, password.c_str());
- if(lua_pcall(L, 2, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- return lua_toboolean(L, -1);
-}
-
-/*****************************************************************************/
-/* Misc */
-/*****************************************************************************/
-/*
- Groups
-*/
-void read_groups(lua_State *L, int index,
- std::map<std::string, int> &result)
-{
- if (!lua_istable(L,index))
- return;
- result.clear();
- lua_pushnil(L);
- if(index < 0)
- index -= 1;
- while(lua_next(L, index) != 0){
- // key at index -2 and value at index -1
- std::string name = luaL_checkstring(L, -2);
- int rating = luaL_checkinteger(L, -1);
- result[name] = rating;
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
-}
-
-struct EnumString es_BiomeTerrainType[] =
-{
- {BIOME_TERRAIN_NORMAL, "normal"},
- {BIOME_TERRAIN_LIQUID, "liquid"},
- {BIOME_TERRAIN_NETHER, "nether"},
- {BIOME_TERRAIN_AETHER, "aether"},
- {BIOME_TERRAIN_FLAT, "flat"},
- {0, NULL},
-};
-
-struct EnumString es_OreType[] =
-{
- {ORE_SCATTER, "scatter"},
- {ORE_SHEET, "sheet"},
- {ORE_CLAYLIKE, "claylike"},
- {0, NULL},
-};
-
-/*****************************************************************************/
-/* Parameters */
-/*****************************************************************************/
-/*
- DigParams
-*/
-
-static void set_dig_params(lua_State *L, int table,
- const DigParams ¶ms)
-{
- setboolfield(L, table, "diggable", params.diggable);
- setfloatfield(L, table, "time", params.time);
- setintfield(L, table, "wear", params.wear);
-}
-
-static void push_dig_params(lua_State *L,
- const DigParams ¶ms)
-{
- lua_newtable(L);
- set_dig_params(L, -1, params);
-}
-
-/*
- HitParams
-*/
-
-static void set_hit_params(lua_State *L, int table,
- const HitParams ¶ms)
-{
- setintfield(L, table, "hp", params.hp);
- setintfield(L, table, "wear", params.wear);
-}
-
-static void push_hit_params(lua_State *L,
- const HitParams ¶ms)
-{
- lua_newtable(L);
- set_hit_params(L, -1, params);
-}
-
-/*
- ServerSoundParams
-*/
-
-static void read_server_sound_params(lua_State *L, int index,
- ServerSoundParams ¶ms)
-{
- if(index < 0)
- index = lua_gettop(L) + 1 + index;
- // Clear
- params = ServerSoundParams();
- if(lua_istable(L, index)){
- getfloatfield(L, index, "gain", params.gain);
- getstringfield(L, index, "to_player", params.to_player);
- lua_getfield(L, index, "pos");
- if(!lua_isnil(L, -1)){
- v3f p = read_v3f(L, -1)*BS;
- params.pos = p;
- params.type = ServerSoundParams::SSP_POSITIONAL;
- }
- lua_pop(L, 1);
- lua_getfield(L, index, "object");
- if(!lua_isnil(L, -1)){
- ObjectRef *ref = ObjectRef::checkobject(L, -1);
- ServerActiveObject *sao = ObjectRef::getobject(ref);
- if(sao){
- params.object = sao->getId();
- params.type = ServerSoundParams::SSP_OBJECT;
- }
- }
- lua_pop(L, 1);
- params.max_hear_distance = BS*getfloatfield_default(L, index,
- "max_hear_distance", params.max_hear_distance/BS);
- getboolfield(L, index, "loop", params.loop);
- }
-}
-
-/*****************************************************************************/
-/* callbacks */
-/*****************************************************************************/
-
-// Push the list of callbacks (a lua table).
-// Then push nargs arguments.
-// Then call this function, which
-// - runs the callbacks
-// - removes the table and arguments from the lua stack
-// - pushes the return value, computed depending on mode
-void scriptapi_run_callbacks(lua_State *L, int nargs,
- RunCallbacksMode mode)
-{
- // Insert the return value into the lua stack, below the table
- assert(lua_gettop(L) >= nargs + 1);
- lua_pushnil(L);
- lua_insert(L, -(nargs + 1) - 1);
- // Stack now looks like this:
- // ... <return value = nil> <table> <arg#1> <arg#2> ... <arg#n>
-
- int rv = lua_gettop(L) - nargs - 1;
- int table = rv + 1;
- int arg = table + 1;
-
- luaL_checktype(L, table, LUA_TTABLE);
-
- // Foreach
- lua_pushnil(L);
- bool first_loop = true;
- while(lua_next(L, table) != 0){
- // key at index -2 and value at index -1
- luaL_checktype(L, -1, LUA_TFUNCTION);
- // Call function
- for(int i = 0; i < nargs; i++)
- lua_pushvalue(L, arg+i);
- if(lua_pcall(L, nargs, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-
- // Move return value to designated space in stack
- // Or pop it
- if(first_loop){
- // Result of first callback is always moved
- lua_replace(L, rv);
- first_loop = false;
- } else {
- // Otherwise, what happens depends on the mode
- if(mode == RUN_CALLBACKS_MODE_FIRST)
- lua_pop(L, 1);
- else if(mode == RUN_CALLBACKS_MODE_LAST)
- lua_replace(L, rv);
- else if(mode == RUN_CALLBACKS_MODE_AND ||
- mode == RUN_CALLBACKS_MODE_AND_SC){
- if((bool)lua_toboolean(L, rv) == true &&
- (bool)lua_toboolean(L, -1) == false)
- lua_replace(L, rv);
- else
- lua_pop(L, 1);
- }
- else if(mode == RUN_CALLBACKS_MODE_OR ||
- mode == RUN_CALLBACKS_MODE_OR_SC){
- if((bool)lua_toboolean(L, rv) == false &&
- (bool)lua_toboolean(L, -1) == true)
- lua_replace(L, rv);
- else
- lua_pop(L, 1);
- }
- else
- assert(0);
- }
-
- // Handle short circuit modes
- if(mode == RUN_CALLBACKS_MODE_AND_SC &&
- (bool)lua_toboolean(L, rv) == false)
- break;
- else if(mode == RUN_CALLBACKS_MODE_OR_SC &&
- (bool)lua_toboolean(L, rv) == true)
- break;
-
- // value removed, keep key for next iteration
- }
-
- // Remove stuff from stack, leaving only the return value
- lua_settop(L, rv);
-
- // Fix return value in case no callbacks were called
- if(first_loop){
- if(mode == RUN_CALLBACKS_MODE_AND ||
- mode == RUN_CALLBACKS_MODE_AND_SC){
- lua_pop(L, 1);
- lua_pushboolean(L, true);
- }
- else if(mode == RUN_CALLBACKS_MODE_OR ||
- mode == RUN_CALLBACKS_MODE_OR_SC){
- lua_pop(L, 1);
- lua_pushboolean(L, false);
- }
- }
-}
-
-bool scriptapi_on_chat_message(lua_State *L, const std::string &name,
- const std::string &message)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Get minetest.registered_on_chat_messages
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_on_chat_messages");
- // Call callbacks
- lua_pushstring(L, name.c_str());
- lua_pushstring(L, message.c_str());
- scriptapi_run_callbacks(L, 2, RUN_CALLBACKS_MODE_OR_SC);
- bool ate = lua_toboolean(L, -1);
- return ate;
-}
-
-void scriptapi_on_shutdown(lua_State *L)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Get registered shutdown hooks
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_on_shutdown");
- // Call callbacks
- scriptapi_run_callbacks(L, 0, RUN_CALLBACKS_MODE_FIRST);
-}
-
-void scriptapi_on_newplayer(lua_State *L, ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Get minetest.registered_on_newplayers
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_on_newplayers");
- // Call callbacks
- objectref_get_or_create(L, player);
- scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
-}
-
-void scriptapi_on_dieplayer(lua_State *L, ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Get minetest.registered_on_dieplayers
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_on_dieplayers");
- // Call callbacks
- objectref_get_or_create(L, player);
- scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
-}
-
-bool scriptapi_on_respawnplayer(lua_State *L, ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Get minetest.registered_on_respawnplayers
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_on_respawnplayers");
- // Call callbacks
- objectref_get_or_create(L, player);
- scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_OR);
- bool positioning_handled_by_some = lua_toboolean(L, -1);
- return positioning_handled_by_some;
-}
-
-void scriptapi_on_joinplayer(lua_State *L, ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Get minetest.registered_on_joinplayers
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_on_joinplayers");
- // Call callbacks
- objectref_get_or_create(L, player);
- scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
-}
-
-void scriptapi_on_leaveplayer(lua_State *L, ServerActiveObject *player)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Get minetest.registered_on_leaveplayers
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_on_leaveplayers");
- // Call callbacks
- objectref_get_or_create(L, player);
- scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
-}
-
-/*
- player
-*/
-void scriptapi_on_player_receive_fields(lua_State *L,
- ServerActiveObject *player,
- const std::string &formname,
- const std::map<std::string, std::string> &fields)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Get minetest.registered_on_chat_messages
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_on_player_receive_fields");
- // Call callbacks
- // param 1
- objectref_get_or_create(L, player);
- // param 2
- lua_pushstring(L, formname.c_str());
- // param 3
- lua_newtable(L);
- for(std::map<std::string, std::string>::const_iterator
- i = fields.begin(); i != fields.end(); i++){
- const std::string &name = i->first;
- const std::string &value = i->second;
- lua_pushstring(L, name.c_str());
- lua_pushlstring(L, value.c_str(), value.size());
- lua_settable(L, -3);
- }
- scriptapi_run_callbacks(L, 3, RUN_CALLBACKS_MODE_OR_SC);
-}
-/*****************************************************************************/
-/* Api functions */
-/*****************************************************************************/
-
-// debug(text)
-// Writes a line to dstream
-static int l_debug(lua_State *L)
-{
- std::string text = lua_tostring(L, 1);
- dstream << text << std::endl;
- return 0;
-}
-
-// log([level,] text)
-// Writes a line to the logger.
-// The one-argument version logs to infostream.
-// The two-argument version accept a log level: error, action, info, or verbose.
-static int l_log(lua_State *L)
-{
- std::string text;
- LogMessageLevel level = LMT_INFO;
- if(lua_isnone(L, 2))
- {
- text = lua_tostring(L, 1);
- }
- else
- {
- std::string levelname = luaL_checkstring(L, 1);
- text = luaL_checkstring(L, 2);
- if(levelname == "error")
- level = LMT_ERROR;
- else if(levelname == "action")
- level = LMT_ACTION;
- else if(levelname == "verbose")
- level = LMT_VERBOSE;
- }
- log_printline(level, text);
- return 0;
-}
-
-// request_shutdown()
-static int l_request_shutdown(lua_State *L)
-{
- get_server(L)->requestShutdown();
- return 0;
-}
-
-// get_server_status()
-static int l_get_server_status(lua_State *L)
-{
- lua_pushstring(L, wide_to_narrow(get_server(L)->getStatusString()).c_str());
- return 1;
-}
-
-
-// register_biome({lots of stuff})
-static int l_register_biome(lua_State *L)
-{
- int index = 1;
- luaL_checktype(L, index, LUA_TTABLE);
-
- BiomeDefManager *bmgr = get_server(L)->getEmergeManager()->biomedef;
- if (!bmgr) {
- verbosestream << "register_biome: BiomeDefManager not active" << std::endl;
- return 0;
- }
-
- enum BiomeTerrainType terrain = (BiomeTerrainType)getenumfield(L, index,
- "terrain_type", es_BiomeTerrainType, BIOME_TERRAIN_NORMAL);
- Biome *b = bmgr->createBiome(terrain);
-
- b->name = getstringfield_default(L, index, "name", "");
- b->top_nodename = getstringfield_default(L, index, "top_node", "");
- b->top_depth = getintfield_default(L, index, "top_depth", 0);
- b->filler_nodename = getstringfield_default(L, index, "filler_node", "");
- b->filler_height = getintfield_default(L, index, "filler_height", 0);
- b->height_min = getintfield_default(L, index, "height_min", 0);
- b->height_max = getintfield_default(L, index, "height_max", 0);
- b->heat_point = getfloatfield_default(L, index, "heat_point", 0.);
- b->humidity_point = getfloatfield_default(L, index, "humidity_point", 0.);
-
- b->flags = 0; //reserved
- b->c_top = CONTENT_IGNORE;
- b->c_filler = CONTENT_IGNORE;
- bmgr->addBiome(b);
-
- verbosestream << "register_biome: " << b->name << std::endl;
- return 0;
-}
-
-
-static int l_register_ore(lua_State *L)
-{
- int index = 1;
- luaL_checktype(L, index, LUA_TTABLE);
-
- EmergeManager *emerge = get_server(L)->getEmergeManager();
-
- enum OreType oretype = (OreType)getenumfield(L, index,
- "ore_type", es_OreType, ORE_SCATTER);
- Ore *ore = createOre(oretype);
- if (!ore) {
- errorstream << "register_ore: ore_type "
- << oretype << " not implemented";
- return 0;
- }
-
- ore->ore_name = getstringfield_default(L, index, "ore", "");
- ore->ore_param2 = (u8)getintfield_default(L, index, "ore_param2", 0);
- ore->wherein_name = getstringfield_default(L, index, "wherein", "");
- ore->clust_scarcity = getintfield_default(L, index, "clust_scarcity", 1);
- ore->clust_num_ores = getintfield_default(L, index, "clust_num_ores", 1);
- ore->clust_size = getintfield_default(L, index, "clust_size", 0);
- ore->height_min = getintfield_default(L, index, "height_min", 0);
- ore->height_max = getintfield_default(L, index, "height_max", 0);
- ore->flags = getflagsfield(L, index, "flags", flagdesc_ore);
- ore->nthresh = getfloatfield_default(L, index, "noise_threshhold", 0.);
-
- lua_getfield(L, index, "noise_params");
- ore->np = read_noiseparams(L, -1);
- lua_pop(L, 1);
-
- ore->noise = NULL;
-
- if (ore->clust_scarcity <= 0 || ore->clust_num_ores <= 0) {
- errorstream << "register_ore: clust_scarcity and clust_num_ores"
- " must be greater than 0" << std::endl;
- delete ore;
- return 0;
- }
-
- emerge->ores.push_back(ore);
-
- verbosestream << "register_ore: ore '" << ore->ore_name
- << "' registered" << std::endl;
- return 0;
-}
-
-
-// setting_set(name, value)
-static int l_setting_set(lua_State *L)
-{
- const char *name = luaL_checkstring(L, 1);
- const char *value = luaL_checkstring(L, 2);
- g_settings->set(name, value);
- return 0;
-}
-
-// setting_get(name)
-static int l_setting_get(lua_State *L)
-{
- const char *name = luaL_checkstring(L, 1);
- try{
- std::string value = g_settings->get(name);
- lua_pushstring(L, value.c_str());
- } catch(SettingNotFoundException &e){
- lua_pushnil(L);
- }
- return 1;
-}
-
-// setting_getbool(name)
-static int l_setting_getbool(lua_State *L)
-{
- const char *name = luaL_checkstring(L, 1);
- try{
- bool value = g_settings->getBool(name);
- lua_pushboolean(L, value);
- } catch(SettingNotFoundException &e){
- lua_pushnil(L);
- }
- return 1;
-}
-
-// setting_save()
-static int l_setting_save(lua_State *L)
-{
- get_server(L)->saveConfig();
- return 0;
-}
-
-// chat_send_all(text)
-static int l_chat_send_all(lua_State *L)
-{
- const char *text = luaL_checkstring(L, 1);
- // Get server from registry
- Server *server = get_server(L);
- // Send
- server->notifyPlayers(narrow_to_wide(text));
- return 0;
-}
-
-// chat_send_player(name, text, prepend)
-static int l_chat_send_player(lua_State *L)
-{
- const char *name = luaL_checkstring(L, 1);
- const char *text = luaL_checkstring(L, 2);
- bool prepend = true;
- if (lua_isboolean(L, 3))
- prepend = lua_toboolean(L, 3);
- // Get server from registry
- Server *server = get_server(L);
- // Send
- server->notifyPlayer(name, narrow_to_wide(text), prepend);
- return 0;
-}
-
-// get_player_privs(name, text)
-static int l_get_player_privs(lua_State *L)
-{
- const char *name = luaL_checkstring(L, 1);
- // Get server from registry
- Server *server = get_server(L);
- // Do it
- lua_newtable(L);
- int table = lua_gettop(L);
- std::set<std::string> privs_s = server->getPlayerEffectivePrivs(name);
- for(std::set<std::string>::const_iterator
- i = privs_s.begin(); i != privs_s.end(); i++){
- lua_pushboolean(L, true);
- lua_setfield(L, table, i->c_str());
- }
- lua_pushvalue(L, table);
- return 1;
-}
-
-// get_player_ip()
-static int l_get_player_ip(lua_State *L)
-{
- const char * name = luaL_checkstring(L, 1);
- Player *player = get_env(L)->getPlayer(name);
- if(player == NULL)
- {
- lua_pushnil(L); // no such player
- return 1;
- }
- try
- {
- Address addr = get_server(L)->getPeerAddress(get_env(L)->getPlayer(name)->peer_id);
- std::string ip_str = addr.serializeString();
- lua_pushstring(L, ip_str.c_str());
- return 1;
- }
- catch(con::PeerNotFoundException) // unlikely
- {
- dstream << __FUNCTION_NAME << ": peer was not found" << std::endl;
- lua_pushnil(L); // error
- return 1;
- }
-}
-
-// get_ban_list()
-static int l_get_ban_list(lua_State *L)
-{
- lua_pushstring(L, get_server(L)->getBanDescription("").c_str());
- return 1;
-}
-
-// get_ban_description()
-static int l_get_ban_description(lua_State *L)
-{
- const char * ip_or_name = luaL_checkstring(L, 1);
- lua_pushstring(L, get_server(L)->getBanDescription(std::string(ip_or_name)).c_str());
- return 1;
-}
-
-// ban_player()
-static int l_ban_player(lua_State *L)
-{
- const char * name = luaL_checkstring(L, 1);
- Player *player = get_env(L)->getPlayer(name);
- if(player == NULL)
- {
- lua_pushboolean(L, false); // no such player
- return 1;
- }
- try
- {
- Address addr = get_server(L)->getPeerAddress(get_env(L)->getPlayer(name)->peer_id);
- std::string ip_str = addr.serializeString();
- get_server(L)->setIpBanned(ip_str, name);
- }
- catch(con::PeerNotFoundException) // unlikely
- {
- dstream << __FUNCTION_NAME << ": peer was not found" << std::endl;
- lua_pushboolean(L, false); // error
- return 1;
- }
- lua_pushboolean(L, true);
- return 1;
-}
-
-// unban_player_or_ip()
-static int l_unban_player_of_ip(lua_State *L)
-{
- const char * ip_or_name = luaL_checkstring(L, 1);
- get_server(L)->unsetIpBanned(ip_or_name);
- lua_pushboolean(L, true);
- return 1;
-}
-
-// show_formspec(playername,formname,formspec)
-static int l_show_formspec(lua_State *L)
-{
- const char *playername = luaL_checkstring(L, 1);
- const char *formname = luaL_checkstring(L, 2);
- const char *formspec = luaL_checkstring(L, 3);
-
- if(get_server(L)->showFormspec(playername,formspec,formname))
- {
- lua_pushboolean(L, true);
- }else{
- lua_pushboolean(L, false);
- }
- return 1;
-}
-
-// get_dig_params(groups, tool_capabilities[, time_from_last_punch])
-static int l_get_dig_params(lua_State *L)
-{
- std::map<std::string, int> groups;
- read_groups(L, 1, groups);
- ToolCapabilities tp = read_tool_capabilities(L, 2);
- if(lua_isnoneornil(L, 3))
- push_dig_params(L, getDigParams(groups, &tp));
- else
- push_dig_params(L, getDigParams(groups, &tp,
- luaL_checknumber(L, 3)));
- return 1;
-}
-
-// get_hit_params(groups, tool_capabilities[, time_from_last_punch])
-static int l_get_hit_params(lua_State *L)
-{
- std::map<std::string, int> groups;
- read_groups(L, 1, groups);
- ToolCapabilities tp = read_tool_capabilities(L, 2);
- if(lua_isnoneornil(L, 3))
- push_hit_params(L, getHitParams(groups, &tp));
- else
- push_hit_params(L, getHitParams(groups, &tp,
- luaL_checknumber(L, 3)));
- return 1;
-}
-
-// get_current_modname()
-static int l_get_current_modname(lua_State *L)
-{
- lua_getfield(L, LUA_REGISTRYINDEX, "minetest_current_modname");
- return 1;
-}
-
-// get_modpath(modname)
-static int l_get_modpath(lua_State *L)
-{
- std::string modname = luaL_checkstring(L, 1);
- // Do it
- if(modname == "__builtin"){
- std::string path = get_server(L)->getBuiltinLuaPath();
- lua_pushstring(L, path.c_str());
- return 1;
- }
- const ModSpec *mod = get_server(L)->getModSpec(modname);
- if(!mod){
- lua_pushnil(L);
- return 1;
- }
- lua_pushstring(L, mod->path.c_str());
- return 1;
-}
-
-// get_modnames()
-// the returned list is sorted alphabetically for you
-static int l_get_modnames(lua_State *L)
-{
- // Get a list of mods
- std::list<std::string> mods_unsorted, mods_sorted;
- get_server(L)->getModNames(mods_unsorted);
-
- // Take unsorted items from mods_unsorted and sort them into
- // mods_sorted; not great performance but the number of mods on a
- // server will likely be small.
- for(std::list<std::string>::iterator i = mods_unsorted.begin();
- i != mods_unsorted.end(); ++i)
- {
- bool added = false;
- for(std::list<std::string>::iterator x = mods_sorted.begin();
- x != mods_sorted.end(); ++x)
- {
- // I doubt anybody using Minetest will be using
- // anything not ASCII based :)
- if((*i).compare(*x) <= 0)
- {
- mods_sorted.insert(x, *i);
- added = true;
- break;
- }
- }
- if(!added)
- mods_sorted.push_back(*i);
- }
-
- // Get the table insertion function from Lua.
- lua_getglobal(L, "table");
- lua_getfield(L, -1, "insert");
- int insertion_func = lua_gettop(L);
-
- // Package them up for Lua
- lua_newtable(L);
- int new_table = lua_gettop(L);
- std::list<std::string>::iterator i = mods_sorted.begin();
- while(i != mods_sorted.end())
- {
- lua_pushvalue(L, insertion_func);
- lua_pushvalue(L, new_table);
- lua_pushstring(L, (*i).c_str());
- if(lua_pcall(L, 2, 0, 0) != 0)
- {
- script_error(L, "error: %s", lua_tostring(L, -1));
- }
- ++i;
- }
- return 1;
-}
-
-// get_worldpath()
-static int l_get_worldpath(lua_State *L)
-{
- std::string worldpath = get_server(L)->getWorldPath();
- lua_pushstring(L, worldpath.c_str());
- return 1;
-}
-
-// sound_play(spec, parameters)
-static int l_sound_play(lua_State *L)
-{
- SimpleSoundSpec spec;
- read_soundspec(L, 1, spec);
- ServerSoundParams params;
- read_server_sound_params(L, 2, params);
- s32 handle = get_server(L)->playSound(spec, params);
- lua_pushinteger(L, handle);
- return 1;
-}
-
-// sound_stop(handle)
-static int l_sound_stop(lua_State *L)
-{
- int handle = luaL_checkinteger(L, 1);
- get_server(L)->stopSound(handle);
- return 0;
-}
-
-// is_singleplayer()
-static int l_is_singleplayer(lua_State *L)
-{
- lua_pushboolean(L, get_server(L)->isSingleplayer());
- return 1;
-}
-
-// get_password_hash(name, raw_password)
-static int l_get_password_hash(lua_State *L)
-{
- std::string name = luaL_checkstring(L, 1);
- std::string raw_password = luaL_checkstring(L, 2);
- std::string hash = translatePassword(name,
- narrow_to_wide(raw_password));
- lua_pushstring(L, hash.c_str());
- return 1;
-}
-
-// notify_authentication_modified(name)
-static int l_notify_authentication_modified(lua_State *L)
-{
- std::string name = "";
- if(lua_isstring(L, 1))
- name = lua_tostring(L, 1);
- get_server(L)->reportPrivsModified(name);
- return 0;
-}
-
-// rollback_get_last_node_actor(p, range, seconds) -> actor, p, seconds
-static int l_rollback_get_last_node_actor(lua_State *L)
-{
- v3s16 p = read_v3s16(L, 1);
- int range = luaL_checknumber(L, 2);
- int seconds = luaL_checknumber(L, 3);
- Server *server = get_server(L);
- IRollbackManager *rollback = server->getRollbackManager();
- v3s16 act_p;
- int act_seconds = 0;
- std::string actor = rollback->getLastNodeActor(p, range, seconds, &act_p, &act_seconds);
- lua_pushstring(L, actor.c_str());
- push_v3s16(L, act_p);
- lua_pushnumber(L, act_seconds);
- return 3;
-}
-
-// rollback_revert_actions_by(actor, seconds) -> bool, log messages
-static int l_rollback_revert_actions_by(lua_State *L)
-{
- std::string actor = luaL_checkstring(L, 1);
- int seconds = luaL_checknumber(L, 2);
- Server *server = get_server(L);
- IRollbackManager *rollback = server->getRollbackManager();
- std::list<RollbackAction> actions = rollback->getRevertActions(actor, seconds);
- std::list<std::string> log;
- bool success = server->rollbackRevertActions(actions, &log);
- // Push boolean result
- lua_pushboolean(L, success);
- // Get the table insert function and push the log table
- lua_getglobal(L, "table");
- lua_getfield(L, -1, "insert");
- int table_insert = lua_gettop(L);
- lua_newtable(L);
- int table = lua_gettop(L);
- for(std::list<std::string>::const_iterator i = log.begin();
- i != log.end(); i++)
- {
- lua_pushvalue(L, table_insert);
- lua_pushvalue(L, table);
- lua_pushstring(L, i->c_str());
- if(lua_pcall(L, 2, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- }
- lua_remove(L, -2); // Remove table
- lua_remove(L, -2); // Remove insert
- return 2;
-}
-
-static const struct luaL_Reg minetest_f [] = {
- {"debug", l_debug},
- {"log", l_log},
- {"request_shutdown", l_request_shutdown},
- {"get_server_status", l_get_server_status},
- {"register_item_raw", l_register_item_raw},
- {"register_alias_raw", l_register_alias_raw},
- {"register_craft", l_register_craft},
- {"register_biome", l_register_biome},
- {"register_ore", l_register_ore},
- {"setting_set", l_setting_set},
- {"setting_get", l_setting_get},
- {"setting_getbool", l_setting_getbool},
- {"setting_save",l_setting_save},
- {"chat_send_all", l_chat_send_all},
- {"chat_send_player", l_chat_send_player},
- {"get_player_privs", l_get_player_privs},
- {"get_player_ip", l_get_player_ip},
- {"get_ban_list", l_get_ban_list},
- {"get_ban_description", l_get_ban_description},
- {"ban_player", l_ban_player},
- {"unban_player_or_ip", l_unban_player_of_ip},
- {"get_inventory", l_get_inventory},
- {"create_detached_inventory_raw", l_create_detached_inventory_raw},
- {"show_formspec", l_show_formspec},
- {"get_dig_params", l_get_dig_params},
- {"get_hit_params", l_get_hit_params},
- {"get_current_modname", l_get_current_modname},
- {"get_modpath", l_get_modpath},
- {"get_modnames", l_get_modnames},
- {"get_worldpath", l_get_worldpath},
- {"sound_play", l_sound_play},
- {"sound_stop", l_sound_stop},
- {"is_singleplayer", l_is_singleplayer},
- {"get_password_hash", l_get_password_hash},
- {"notify_authentication_modified", l_notify_authentication_modified},
- {"get_craft_result", l_get_craft_result},
- {"get_craft_recipe", l_get_craft_recipe},
- {"get_all_craft_recipes", l_get_all_craft_recipes},
- {"rollback_get_last_node_actor", l_rollback_get_last_node_actor},
- {"rollback_revert_actions_by", l_rollback_revert_actions_by},
- {"add_particle", l_add_particle},
- {"add_particlespawner", l_add_particlespawner},
- {"delete_particlespawner", l_delete_particlespawner},
- {NULL, NULL}
-};
-
-
-/*
- Main export function
-*/
-
-void scriptapi_export(lua_State *L, Server *server)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- verbosestream<<"scriptapi_export()"<<std::endl;
- StackUnroller stack_unroller(L);
-
- // Store server as light userdata in registry
- lua_pushlightuserdata(L, server);
- lua_setfield(L, LUA_REGISTRYINDEX, "minetest_server");
-
- // Register global functions in table minetest
- lua_newtable(L);
- luaL_register(L, NULL, minetest_f);
- lua_setglobal(L, "minetest");
-
- // Get the main minetest table
- lua_getglobal(L, "minetest");
-
- // Add tables to minetest
- lua_newtable(L);
- lua_setfield(L, -2, "object_refs");
- lua_newtable(L);
- lua_setfield(L, -2, "luaentities");
-
- // Register wrappers
- LuaItemStack::Register(L);
- InvRef::Register(L);
- NodeMetaRef::Register(L);
- NodeTimerRef::Register(L);
- ObjectRef::Register(L);
- EnvRef::Register(L);
- LuaPseudoRandom::Register(L);
- LuaPerlinNoise::Register(L);
- LuaPerlinNoiseMap::Register(L);
-}
diff --git a/src/scriptapi.h b/src/scriptapi.h
deleted file mode 100644
index 7f19bcef5c958ae0c09eb7ed1ea8079f39e49599..0000000000000000000000000000000000000000
--- a/src/scriptapi.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef SCRIPTAPI_HEADER
-#define SCRIPTAPI_HEADER
-
-#include <string>
-#include <set>
-#include <map>
-#include "irr_v3d.h"
-#include "irr_v2d.h"
-
-extern "C" {
-#include <lua.h>
-}
-#include "scriptapi_inventory.h"
-#include "scriptapi_nodemeta.h"
-#include "scriptapi_entity.h"
-#include "scriptapi_object.h"
-#include "scriptapi_env.h"
-#include "scriptapi_item.h"
-#include "scriptapi_node.h"
-
-#define luamethod(class, name) {#name, class::l_##name}
-
-class Server;
-
-void scriptapi_export(lua_State *L, Server *server);
-bool scriptapi_loadmod(lua_State *L, const std::string &scriptpath,
- const std::string &modname);
-
-// Returns true if script handled message
-bool scriptapi_on_chat_message(lua_State *L, const std::string &name,
- const std::string &message);
-
-/* server */
-void scriptapi_on_shutdown(lua_State *L);
-
-/* misc */
-void scriptapi_on_newplayer(lua_State *L, ServerActiveObject *player);
-void scriptapi_on_dieplayer(lua_State *L, ServerActiveObject *player);
-bool scriptapi_on_respawnplayer(lua_State *L, ServerActiveObject *player);
-void scriptapi_on_joinplayer(lua_State *L, ServerActiveObject *player);
-void scriptapi_on_leaveplayer(lua_State *L, ServerActiveObject *player);
-bool scriptapi_get_auth(lua_State *L, const std::string &playername,
- std::string *dst_password, std::set<std::string> *dst_privs);
-void scriptapi_create_auth(lua_State *L, const std::string &playername,
- const std::string &password);
-bool scriptapi_set_password(lua_State *L, const std::string &playername,
- const std::string &password);
-
-/* player */
-void scriptapi_on_player_receive_fields(lua_State *L,
- ServerActiveObject *player,
- const std::string &formname,
- const std::map<std::string, std::string> &fields);
-
-#endif
-
diff --git a/src/scriptapi_common.cpp b/src/scriptapi_common.cpp
deleted file mode 100644
index 2d6f6c72b8c27b39694ae4797954a2d1ec4a04d8..0000000000000000000000000000000000000000
--- a/src/scriptapi_common.cpp
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "scriptapi.h"
-#include "scriptapi_common.h"
-
-extern "C" {
-#include "lauxlib.h"
-}
-
-#include "script.h"
-#include "scriptapi_types.h"
-#include "scriptapi_object.h"
-
-
-Server* get_server(lua_State *L)
-{
- // Get server from registry
- lua_getfield(L, LUA_REGISTRYINDEX, "minetest_server");
- Server *server = (Server*)lua_touserdata(L, -1);
- lua_pop(L, 1);
- return server;
-}
-
-ServerEnvironment* get_env(lua_State *L)
-{
- // Get environment from registry
- lua_getfield(L, LUA_REGISTRYINDEX, "minetest_env");
- ServerEnvironment *env = (ServerEnvironment*)lua_touserdata(L, -1);
- lua_pop(L, 1);
- return env;
-}
-
-void warn_if_field_exists(lua_State *L, int table,
- const char *fieldname, const std::string &message)
-{
- lua_getfield(L, table, fieldname);
- if(!lua_isnil(L, -1)){
- infostream<<script_get_backtrace(L)<<std::endl;
- infostream<<"WARNING: field \""<<fieldname<<"\": "
- <<message<<std::endl;
- }
- lua_pop(L, 1);
-}
-
-/*
- ToolCapabilities
-*/
-
-ToolCapabilities read_tool_capabilities(
- lua_State *L, int table)
-{
- ToolCapabilities toolcap;
- getfloatfield(L, table, "full_punch_interval", toolcap.full_punch_interval);
- getintfield(L, table, "max_drop_level", toolcap.max_drop_level);
- lua_getfield(L, table, "groupcaps");
- if(lua_istable(L, -1)){
- int table_groupcaps = lua_gettop(L);
- lua_pushnil(L);
- while(lua_next(L, table_groupcaps) != 0){
- // key at index -2 and value at index -1
- std::string groupname = luaL_checkstring(L, -2);
- if(lua_istable(L, -1)){
- int table_groupcap = lua_gettop(L);
- // This will be created
- ToolGroupCap groupcap;
- // Read simple parameters
- getintfield(L, table_groupcap, "maxlevel", groupcap.maxlevel);
- getintfield(L, table_groupcap, "uses", groupcap.uses);
- // DEPRECATED: maxwear
- float maxwear = 0;
- if(getfloatfield(L, table_groupcap, "maxwear", maxwear)){
- if(maxwear != 0)
- groupcap.uses = 1.0/maxwear;
- else
- groupcap.uses = 0;
- infostream<<script_get_backtrace(L)<<std::endl;
- infostream<<"WARNING: field \"maxwear\" is deprecated; "
- <<"should replace with uses=1/maxwear"<<std::endl;
- }
- // Read "times" table
- lua_getfield(L, table_groupcap, "times");
- if(lua_istable(L, -1)){
- int table_times = lua_gettop(L);
- lua_pushnil(L);
- while(lua_next(L, table_times) != 0){
- // key at index -2 and value at index -1
- int rating = luaL_checkinteger(L, -2);
- float time = luaL_checknumber(L, -1);
- groupcap.times[rating] = time;
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- }
- lua_pop(L, 1);
- // Insert groupcap into toolcap
- toolcap.groupcaps[groupname] = groupcap;
- }
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- }
- lua_pop(L, 1);
- lua_getfield(L, table, "damage_groups");
- if(lua_istable(L, -1)){
- int table_damage_groups = lua_gettop(L);
- lua_pushnil(L);
- while(lua_next(L, table_damage_groups) != 0){
- // key at index -2 and value at index -1
- std::string groupname = luaL_checkstring(L, -2);
- u16 value = luaL_checkinteger(L, -1);
- toolcap.damageGroups[groupname] = value;
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- }
- lua_pop(L, 1);
- return toolcap;
-}
-
-void set_tool_capabilities(lua_State *L, int table,
- const ToolCapabilities &toolcap)
-{
- setfloatfield(L, table, "full_punch_interval", toolcap.full_punch_interval);
- setintfield(L, table, "max_drop_level", toolcap.max_drop_level);
- // Create groupcaps table
- lua_newtable(L);
- // For each groupcap
- for(std::map<std::string, ToolGroupCap>::const_iterator
- i = toolcap.groupcaps.begin(); i != toolcap.groupcaps.end(); i++){
- // Create groupcap table
- lua_newtable(L);
- const std::string &name = i->first;
- const ToolGroupCap &groupcap = i->second;
- // Create subtable "times"
- lua_newtable(L);
- for(std::map<int, float>::const_iterator
- i = groupcap.times.begin(); i != groupcap.times.end(); i++){
- int rating = i->first;
- float time = i->second;
- lua_pushinteger(L, rating);
- lua_pushnumber(L, time);
- lua_settable(L, -3);
- }
- // Set subtable "times"
- lua_setfield(L, -2, "times");
- // Set simple parameters
- setintfield(L, -1, "maxlevel", groupcap.maxlevel);
- setintfield(L, -1, "uses", groupcap.uses);
- // Insert groupcap table into groupcaps table
- lua_setfield(L, -2, name.c_str());
- }
- // Set groupcaps table
- lua_setfield(L, -2, "groupcaps");
- //Create damage_groups table
- lua_newtable(L);
- // For each damage group
- for(std::map<std::string, s16>::const_iterator
- i = toolcap.damageGroups.begin(); i != toolcap.damageGroups.end(); i++){
- // Create damage group table
- lua_pushinteger(L, i->second);
- lua_setfield(L, -2, i->first.c_str());
- }
- lua_setfield(L, -2, "damage_groups");
-}
-
-void push_tool_capabilities(lua_State *L,
- const ToolCapabilities &prop)
-{
- lua_newtable(L);
- set_tool_capabilities(L, -1, prop);
-}
-
-void realitycheck(lua_State *L)
-{
- int top = lua_gettop(L);
- if(top >= 30){
- dstream<<"Stack is over 30:"<<std::endl;
- stackDump(L, dstream);
- script_error(L, "Stack is over 30 (reality check)");
- }
-}
-
-/*
- PointedThing
-*/
-
-void push_pointed_thing(lua_State *L, const PointedThing& pointed)
-{
- lua_newtable(L);
- if(pointed.type == POINTEDTHING_NODE)
- {
- lua_pushstring(L, "node");
- lua_setfield(L, -2, "type");
- push_v3s16(L, pointed.node_undersurface);
- lua_setfield(L, -2, "under");
- push_v3s16(L, pointed.node_abovesurface);
- lua_setfield(L, -2, "above");
- }
- else if(pointed.type == POINTEDTHING_OBJECT)
- {
- lua_pushstring(L, "object");
- lua_setfield(L, -2, "type");
- objectref_get(L, pointed.object_id);
- lua_setfield(L, -2, "ref");
- }
- else
- {
- lua_pushstring(L, "nothing");
- lua_setfield(L, -2, "type");
- }
-}
-
-void stackDump(lua_State *L, std::ostream &o)
-{
- int i;
- int top = lua_gettop(L);
- for (i = 1; i <= top; i++) { /* repeat for each level */
- int t = lua_type(L, i);
- switch (t) {
-
- case LUA_TSTRING: /* strings */
- o<<"\""<<lua_tostring(L, i)<<"\"";
- break;
-
- case LUA_TBOOLEAN: /* booleans */
- o<<(lua_toboolean(L, i) ? "true" : "false");
- break;
-
- case LUA_TNUMBER: /* numbers */ {
- char buf[10];
- snprintf(buf, 10, "%g", lua_tonumber(L, i));
- o<<buf;
- break; }
-
- default: /* other values */
- o<<lua_typename(L, t);
- break;
-
- }
- o<<" ";
- }
- o<<std::endl;
-}
-
-#if 0
-// Dump stack top with the dump2 function
-static void dump2(lua_State *L, const char *name)
-{
- // Dump object (debug)
- lua_getglobal(L, "dump2");
- luaL_checktype(L, -1, LUA_TFUNCTION);
- lua_pushvalue(L, -2); // Get previous stack top as first parameter
- lua_pushstring(L, name);
- if(lua_pcall(L, 2, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
-#endif
-
-bool string_to_enum(const EnumString *spec, int &result,
- const std::string &str)
-{
- const EnumString *esp = spec;
- while(esp->str){
- if(str == std::string(esp->str)){
- result = esp->num;
- return true;
- }
- esp++;
- }
- return false;
-}
-
-/*bool enum_to_string(const EnumString *spec, std::string &result,
- int num)
-{
- const EnumString *esp = spec;
- while(esp){
- if(num == esp->num){
- result = esp->str;
- return true;
- }
- esp++;
- }
- return false;
-}*/
-
-int getenumfield(lua_State *L, int table,
- const char *fieldname, const EnumString *spec, int default_)
-{
- int result = default_;
- string_to_enum(spec, result,
- getstringfield_default(L, table, fieldname, ""));
- return result;
-}
diff --git a/src/scriptapi_common.h b/src/scriptapi_common.h
deleted file mode 100644
index d029b48d331450dbb2974ba988eff2b5583b2255..0000000000000000000000000000000000000000
--- a/src/scriptapi_common.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Minetest-c55
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef LUA_COMMON_H_
-#define LUA_COMMON_H_
-
-extern "C" {
-#include <lua.h>
-}
-
-#include "server.h"
-#include "environment.h"
-#include "nodedef.h"
-#include "util/pointedthing.h"
-#include "tool.h"
-
-Server* get_server(lua_State *L);
-ServerEnvironment* get_env(lua_State *L);
-
-void warn_if_field_exists(lua_State *L, int table,
- const char *fieldname, const std::string &message);
-
-ToolCapabilities read_tool_capabilities (lua_State *L, int table);
-void push_tool_capabilities (lua_State *L,
- const ToolCapabilities &prop);
-void set_tool_capabilities (lua_State *L, int table,
- const ToolCapabilities &toolcap);
-
-void realitycheck (lua_State *L);
-
-void push_pointed_thing (lua_State *L,
- const PointedThing& pointed);
-
-void stackDump (lua_State *L, std::ostream &o);
-
-class StackUnroller
-{
-private:
- lua_State *m_lua;
- int m_original_top;
-public:
- StackUnroller(lua_State *L):
- m_lua(L),
- m_original_top(-1)
- {
- m_original_top = lua_gettop(m_lua); // store stack height
- }
- ~StackUnroller()
- {
- lua_settop(m_lua, m_original_top); // restore stack height
- }
-};
-
-/* definitions */
-// What scriptapi_run_callbacks does with the return values of callbacks.
-// Regardless of the mode, if only one callback is defined,
-// its return value is the total return value.
-// Modes only affect the case where 0 or >= 2 callbacks are defined.
-enum RunCallbacksMode
-{
- // Returns the return value of the first callback
- // Returns nil if list of callbacks is empty
- RUN_CALLBACKS_MODE_FIRST,
- // Returns the return value of the last callback
- // Returns nil if list of callbacks is empty
- RUN_CALLBACKS_MODE_LAST,
- // If any callback returns a false value, the first such is returned
- // Otherwise, the first callback's return value (trueish) is returned
- // Returns true if list of callbacks is empty
- RUN_CALLBACKS_MODE_AND,
- // Like above, but stops calling callbacks (short circuit)
- // after seeing the first false value
- RUN_CALLBACKS_MODE_AND_SC,
- // If any callback returns a true value, the first such is returned
- // Otherwise, the first callback's return value (falseish) is returned
- // Returns false if list of callbacks is empty
- RUN_CALLBACKS_MODE_OR,
- // Like above, but stops calling callbacks (short circuit)
- // after seeing the first true value
- RUN_CALLBACKS_MODE_OR_SC,
- // Note: "a true value" and "a false value" refer to values that
- // are converted by lua_toboolean to true or false, respectively.
-};
-
-struct EnumString
-{
- int num;
- const char *str;
-};
-
-bool string_to_enum(const EnumString *spec, int &result,
- const std::string &str);
-
-int getenumfield(lua_State *L, int table,
- const char *fieldname, const EnumString *spec, int default_);
-#endif /* LUA_COMMON_H_ */
diff --git a/src/scriptapi_content.cpp b/src/scriptapi_content.cpp
deleted file mode 100644
index 30fd703496bec445ba9c209eff0cc22ce7ebe5fa..0000000000000000000000000000000000000000
--- a/src/scriptapi_content.cpp
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "scriptapi.h"
-#include "scriptapi_content.h"
-#include "scriptapi_types.h"
-#include "scriptapi_common.h"
-#include "scriptapi_node.h"
-
-
-NodeBox read_nodebox(lua_State *L, int index)
-{
- NodeBox nodebox;
- if(lua_istable(L, -1)){
- nodebox.type = (NodeBoxType)getenumfield(L, index, "type",
- es_NodeBoxType, NODEBOX_REGULAR);
-
- lua_getfield(L, index, "fixed");
- if(lua_istable(L, -1))
- nodebox.fixed = read_aabb3f_vector(L, -1, BS);
- lua_pop(L, 1);
-
- lua_getfield(L, index, "wall_top");
- if(lua_istable(L, -1))
- nodebox.wall_top = read_aabb3f(L, -1, BS);
- lua_pop(L, 1);
-
- lua_getfield(L, index, "wall_bottom");
- if(lua_istable(L, -1))
- nodebox.wall_bottom = read_aabb3f(L, -1, BS);
- lua_pop(L, 1);
-
- lua_getfield(L, index, "wall_side");
- if(lua_istable(L, -1))
- nodebox.wall_side = read_aabb3f(L, -1, BS);
- lua_pop(L, 1);
- }
- return nodebox;
-}
-
-/*
- SimpleSoundSpec
-*/
-
-void read_soundspec(lua_State *L, int index, SimpleSoundSpec &spec)
-{
- if(index < 0)
- index = lua_gettop(L) + 1 + index;
- if(lua_isnil(L, index)){
- } else if(lua_istable(L, index)){
- getstringfield(L, index, "name", spec.name);
- getfloatfield(L, index, "gain", spec.gain);
- } else if(lua_isstring(L, index)){
- spec.name = lua_tostring(L, index);
- }
-}
-
-struct EnumString es_TileAnimationType[] =
-{
- {TAT_NONE, "none"},
- {TAT_VERTICAL_FRAMES, "vertical_frames"},
- {0, NULL},
-};
-
-/*
- TileDef
-*/
-
-TileDef read_tiledef(lua_State *L, int index)
-{
- if(index < 0)
- index = lua_gettop(L) + 1 + index;
-
- TileDef tiledef;
-
- // key at index -2 and value at index
- if(lua_isstring(L, index)){
- // "default_lava.png"
- tiledef.name = lua_tostring(L, index);
- }
- else if(lua_istable(L, index))
- {
- // {name="default_lava.png", animation={}}
- tiledef.name = "";
- getstringfield(L, index, "name", tiledef.name);
- getstringfield(L, index, "image", tiledef.name); // MaterialSpec compat.
- tiledef.backface_culling = getboolfield_default(
- L, index, "backface_culling", true);
- // animation = {}
- lua_getfield(L, index, "animation");
- if(lua_istable(L, -1)){
- // {type="vertical_frames", aspect_w=16, aspect_h=16, length=2.0}
- tiledef.animation.type = (TileAnimationType)
- getenumfield(L, -1, "type", es_TileAnimationType,
- TAT_NONE);
- tiledef.animation.aspect_w =
- getintfield_default(L, -1, "aspect_w", 16);
- tiledef.animation.aspect_h =
- getintfield_default(L, -1, "aspect_h", 16);
- tiledef.animation.length =
- getfloatfield_default(L, -1, "length", 1.0);
- }
- lua_pop(L, 1);
- }
-
- return tiledef;
-}
-
-/*
- ContentFeatures
-*/
-
-ContentFeatures read_content_features(lua_State *L, int index)
-{
- if(index < 0)
- index = lua_gettop(L) + 1 + index;
-
- ContentFeatures f;
-
- /* Cache existence of some callbacks */
- lua_getfield(L, index, "on_construct");
- if(!lua_isnil(L, -1)) f.has_on_construct = true;
- lua_pop(L, 1);
- lua_getfield(L, index, "on_destruct");
- if(!lua_isnil(L, -1)) f.has_on_destruct = true;
- lua_pop(L, 1);
- lua_getfield(L, index, "after_destruct");
- if(!lua_isnil(L, -1)) f.has_after_destruct = true;
- lua_pop(L, 1);
-
- lua_getfield(L, index, "on_rightclick");
- f.rightclickable = lua_isfunction(L, -1);
- lua_pop(L, 1);
-
- /* Name */
- getstringfield(L, index, "name", f.name);
-
- /* Groups */
- lua_getfield(L, index, "groups");
- read_groups(L, -1, f.groups);
- lua_pop(L, 1);
-
- /* Visual definition */
-
- f.drawtype = (NodeDrawType)getenumfield(L, index, "drawtype", es_DrawType,
- NDT_NORMAL);
- getfloatfield(L, index, "visual_scale", f.visual_scale);
-
- // tiles = {}
- lua_getfield(L, index, "tiles");
- // If nil, try the deprecated name "tile_images" instead
- if(lua_isnil(L, -1)){
- lua_pop(L, 1);
- warn_if_field_exists(L, index, "tile_images",
- "Deprecated; new name is \"tiles\".");
- lua_getfield(L, index, "tile_images");
- }
- if(lua_istable(L, -1)){
- int table = lua_gettop(L);
- lua_pushnil(L);
- int i = 0;
- while(lua_next(L, table) != 0){
- // Read tiledef from value
- f.tiledef[i] = read_tiledef(L, -1);
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- i++;
- if(i==6){
- lua_pop(L, 1);
- break;
- }
- }
- // Copy last value to all remaining textures
- if(i >= 1){
- TileDef lasttile = f.tiledef[i-1];
- while(i < 6){
- f.tiledef[i] = lasttile;
- i++;
- }
- }
- }
- lua_pop(L, 1);
-
- // special_tiles = {}
- lua_getfield(L, index, "special_tiles");
- // If nil, try the deprecated name "special_materials" instead
- if(lua_isnil(L, -1)){
- lua_pop(L, 1);
- warn_if_field_exists(L, index, "special_materials",
- "Deprecated; new name is \"special_tiles\".");
- lua_getfield(L, index, "special_materials");
- }
- if(lua_istable(L, -1)){
- int table = lua_gettop(L);
- lua_pushnil(L);
- int i = 0;
- while(lua_next(L, table) != 0){
- // Read tiledef from value
- f.tiledef_special[i] = read_tiledef(L, -1);
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- i++;
- if(i==6){
- lua_pop(L, 1);
- break;
- }
- }
- }
- lua_pop(L, 1);
-
- f.alpha = getintfield_default(L, index, "alpha", 255);
-
- bool usealpha = getboolfield_default(L, index,
- "use_texture_alpha", false);
- if (usealpha)
- f.alpha = 0;
-
- /* Other stuff */
-
- lua_getfield(L, index, "post_effect_color");
- if(!lua_isnil(L, -1))
- f.post_effect_color = readARGB8(L, -1);
- lua_pop(L, 1);
-
- f.param_type = (ContentParamType)getenumfield(L, index, "paramtype",
- es_ContentParamType, CPT_NONE);
- f.param_type_2 = (ContentParamType2)getenumfield(L, index, "paramtype2",
- es_ContentParamType2, CPT2_NONE);
-
- // Warn about some deprecated fields
- warn_if_field_exists(L, index, "wall_mounted",
- "deprecated: use paramtype2 = 'wallmounted'");
- warn_if_field_exists(L, index, "light_propagates",
- "deprecated: determined from paramtype");
- warn_if_field_exists(L, index, "dug_item",
- "deprecated: use 'drop' field");
- warn_if_field_exists(L, index, "extra_dug_item",
- "deprecated: use 'drop' field");
- warn_if_field_exists(L, index, "extra_dug_item_rarity",
- "deprecated: use 'drop' field");
- warn_if_field_exists(L, index, "metadata_name",
- "deprecated: use on_add and metadata callbacks");
-
- // True for all ground-like things like stone and mud, false for eg. trees
- getboolfield(L, index, "is_ground_content", f.is_ground_content);
- f.light_propagates = (f.param_type == CPT_LIGHT);
- getboolfield(L, index, "sunlight_propagates", f.sunlight_propagates);
- // This is used for collision detection.
- // Also for general solidness queries.
- getboolfield(L, index, "walkable", f.walkable);
- // Player can point to these
- getboolfield(L, index, "pointable", f.pointable);
- // Player can dig these
- getboolfield(L, index, "diggable", f.diggable);
- // Player can climb these
- getboolfield(L, index, "climbable", f.climbable);
- // Player can build on these
- getboolfield(L, index, "buildable_to", f.buildable_to);
- // Whether the node is non-liquid, source liquid or flowing liquid
- f.liquid_type = (LiquidType)getenumfield(L, index, "liquidtype",
- es_LiquidType, LIQUID_NONE);
- // If the content is liquid, this is the flowing version of the liquid.
- getstringfield(L, index, "liquid_alternative_flowing",
- f.liquid_alternative_flowing);
- // If the content is liquid, this is the source version of the liquid.
- getstringfield(L, index, "liquid_alternative_source",
- f.liquid_alternative_source);
- // Viscosity for fluid flow, ranging from 1 to 7, with
- // 1 giving almost instantaneous propagation and 7 being
- // the slowest possible
- f.liquid_viscosity = getintfield_default(L, index,
- "liquid_viscosity", f.liquid_viscosity);
- getboolfield(L, index, "liquid_renewable", f.liquid_renewable);
- // Amount of light the node emits
- f.light_source = getintfield_default(L, index,
- "light_source", f.light_source);
- f.damage_per_second = getintfield_default(L, index,
- "damage_per_second", f.damage_per_second);
-
- lua_getfield(L, index, "node_box");
- if(lua_istable(L, -1))
- f.node_box = read_nodebox(L, -1);
- lua_pop(L, 1);
-
- lua_getfield(L, index, "selection_box");
- if(lua_istable(L, -1))
- f.selection_box = read_nodebox(L, -1);
- lua_pop(L, 1);
-
- // Set to true if paramtype used to be 'facedir_simple'
- getboolfield(L, index, "legacy_facedir_simple", f.legacy_facedir_simple);
- // Set to true if wall_mounted used to be set to true
- getboolfield(L, index, "legacy_wallmounted", f.legacy_wallmounted);
-
- // Sound table
- lua_getfield(L, index, "sounds");
- if(lua_istable(L, -1)){
- lua_getfield(L, -1, "footstep");
- read_soundspec(L, -1, f.sound_footstep);
- lua_pop(L, 1);
- lua_getfield(L, -1, "dig");
- read_soundspec(L, -1, f.sound_dig);
- lua_pop(L, 1);
- lua_getfield(L, -1, "dug");
- read_soundspec(L, -1, f.sound_dug);
- lua_pop(L, 1);
- }
- lua_pop(L, 1);
-
- return f;
-}
diff --git a/src/scriptapi_craft.h b/src/scriptapi_craft.h
deleted file mode 100644
index f28989fd96b501e67500495e18ed5ca91f027ebc..0000000000000000000000000000000000000000
--- a/src/scriptapi_craft.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-Minetest-c55
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef LUA_CRAFT_H_
-#define LUA_CRAFT_H_
-
-#include <vector>
-
-extern "C" {
-#include <lua.h>
-}
-
-#include "craftdef.h"
-
-/*****************************************************************************/
-/* Mod API */
-/*****************************************************************************/
-int l_register_craft(lua_State *L);
-int l_get_craft_recipe(lua_State *L);
-int l_get_all_craft_recipes(lua_State *L);
-int l_get_craft_result(lua_State *L);
-
-/*****************************************************************************/
-/* scriptapi internal */
-/*****************************************************************************/
-bool read_craft_replacements(lua_State *L, int index,
- CraftReplacements &replacements);
-bool read_craft_recipe_shapeless(lua_State *L, int index,
- std::vector<std::string> &recipe);
-bool read_craft_recipe_shaped(lua_State *L, int index,
- int &width, std::vector<std::string> &recipe);
-
-extern struct EnumString es_CraftMethod[];
-
-#endif /* LUA_CRAFT_H_ */
diff --git a/src/scriptapi_entity.h b/src/scriptapi_entity.h
deleted file mode 100644
index e0874325899dc846920c76f119df6715b4bf7e5a..0000000000000000000000000000000000000000
--- a/src/scriptapi_entity.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-Minetest-c55
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef LUA_ENTITY_H_
-#define LUA_ENTITY_H_
-
-extern "C" {
-#include <lua.h>
-}
-
-#include "object_properties.h"
-#include "content_sao.h"
-#include "tool.h"
-
-/*****************************************************************************/
-/* scriptapi internal */
-/*****************************************************************************/
-void luaentity_get(lua_State *L, u16 id);
-
-/*****************************************************************************/
-/* Minetest interface */
-/*****************************************************************************/
-// Returns true if succesfully added into Lua; false otherwise.
-bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name);
-void scriptapi_luaentity_activate(lua_State *L, u16 id,
- const std::string &staticdata, u32 dtime_s);
-void scriptapi_luaentity_rm(lua_State *L, u16 id);
-std::string scriptapi_luaentity_get_staticdata(lua_State *L, u16 id);
-void scriptapi_luaentity_get_properties(lua_State *L, u16 id,
- ObjectProperties *prop);
-void scriptapi_luaentity_step(lua_State *L, u16 id, float dtime);
-void scriptapi_luaentity_punch(lua_State *L, u16 id,
- ServerActiveObject *puncher, float time_from_last_punch,
- const ToolCapabilities *toolcap, v3f dir);
-void scriptapi_luaentity_rightclick(lua_State *L, u16 id,
- ServerActiveObject *clicker);
-
-#endif /* LUA_ENTITY_H_ */
diff --git a/src/scriptapi_env.cpp b/src/scriptapi_env.cpp
deleted file mode 100644
index efed58e66ed553be454d9035c8d685bf2e1f880a..0000000000000000000000000000000000000000
--- a/src/scriptapi_env.cpp
+++ /dev/null
@@ -1,976 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "scriptapi.h"
-#include "scriptapi_env.h"
-#include "nodedef.h"
-#include "gamedef.h"
-#include "map.h"
-#include "daynightratio.h"
-#include "content_sao.h"
-#include "script.h"
-#include "treegen.h"
-#include "pathfinder.h"
-#include "util/pointedthing.h"
-#include "scriptapi_types.h"
-#include "scriptapi_noise.h"
-#include "scriptapi_nodemeta.h"
-#include "scriptapi_nodetimer.h"
-#include "scriptapi_object.h"
-#include "scriptapi_common.h"
-#include "scriptapi_item.h"
-#include "scriptapi_node.h"
-
-
-//TODO
-extern void scriptapi_run_callbacks(lua_State *L, int nargs,
- RunCallbacksMode mode);
-
-
-class LuaABM : public ActiveBlockModifier
-{
-private:
- lua_State *m_lua;
- int m_id;
-
- std::set<std::string> m_trigger_contents;
- std::set<std::string> m_required_neighbors;
- float m_trigger_interval;
- u32 m_trigger_chance;
-public:
- LuaABM(lua_State *L, int id,
- const std::set<std::string> &trigger_contents,
- const std::set<std::string> &required_neighbors,
- float trigger_interval, u32 trigger_chance):
- m_lua(L),
- m_id(id),
- m_trigger_contents(trigger_contents),
- m_required_neighbors(required_neighbors),
- m_trigger_interval(trigger_interval),
- m_trigger_chance(trigger_chance)
- {
- }
- virtual std::set<std::string> getTriggerContents()
- {
- return m_trigger_contents;
- }
- virtual std::set<std::string> getRequiredNeighbors()
- {
- return m_required_neighbors;
- }
- virtual float getTriggerInterval()
- {
- return m_trigger_interval;
- }
- virtual u32 getTriggerChance()
- {
- return m_trigger_chance;
- }
- virtual void trigger(ServerEnvironment *env, v3s16 p, MapNode n,
- u32 active_object_count, u32 active_object_count_wider)
- {
- lua_State *L = m_lua;
-
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- // Get minetest.registered_abms
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_abms");
- luaL_checktype(L, -1, LUA_TTABLE);
- int registered_abms = lua_gettop(L);
-
- // Get minetest.registered_abms[m_id]
- lua_pushnumber(L, m_id);
- lua_gettable(L, registered_abms);
- if(lua_isnil(L, -1))
- assert(0);
-
- // Call action
- luaL_checktype(L, -1, LUA_TTABLE);
- lua_getfield(L, -1, "action");
- luaL_checktype(L, -1, LUA_TFUNCTION);
- push_v3s16(L, p);
- pushnode(L, n, env->getGameDef()->ndef());
- lua_pushnumber(L, active_object_count);
- lua_pushnumber(L, active_object_count_wider);
- if(lua_pcall(L, 4, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- }
-};
-
-/*
- EnvRef
-*/
-
-int EnvRef::gc_object(lua_State *L) {
- EnvRef *o = *(EnvRef **)(lua_touserdata(L, 1));
- delete o;
- return 0;
-}
-
-EnvRef* EnvRef::checkobject(lua_State *L, int narg)
-{
- luaL_checktype(L, narg, LUA_TUSERDATA);
- void *ud = luaL_checkudata(L, narg, className);
- if(!ud) luaL_typerror(L, narg, className);
- return *(EnvRef**)ud; // unbox pointer
-}
-
-// Exported functions
-
-// EnvRef:set_node(pos, node)
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_set_node(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- INodeDefManager *ndef = env->getGameDef()->ndef();
- // parameters
- v3s16 pos = read_v3s16(L, 2);
- MapNode n = readnode(L, 3, ndef);
- // Do it
- bool succeeded = env->setNode(pos, n);
- lua_pushboolean(L, succeeded);
- return 1;
-}
-
-int EnvRef::l_add_node(lua_State *L)
-{
- return l_set_node(L);
-}
-
-// EnvRef:remove_node(pos)
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_remove_node(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
-
- // parameters
- v3s16 pos = read_v3s16(L, 2);
- // Do it
- bool succeeded = env->removeNode(pos);
- lua_pushboolean(L, succeeded);
- return 1;
-}
-
-// EnvRef:get_node(pos)
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_get_node(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // pos
- v3s16 pos = read_v3s16(L, 2);
- // Do it
- MapNode n = env->getMap().getNodeNoEx(pos);
- // Return node
- pushnode(L, n, env->getGameDef()->ndef());
- return 1;
-}
-
-// EnvRef:get_node_or_nil(pos)
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_get_node_or_nil(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // pos
- v3s16 pos = read_v3s16(L, 2);
- // Do it
- try{
- MapNode n = env->getMap().getNode(pos);
- // Return node
- pushnode(L, n, env->getGameDef()->ndef());
- return 1;
- } catch(InvalidPositionException &e)
- {
- lua_pushnil(L);
- return 1;
- }
-}
-
-// EnvRef:get_node_light(pos, timeofday)
-// pos = {x=num, y=num, z=num}
-// timeofday: nil = current time, 0 = night, 0.5 = day
-int EnvRef::l_get_node_light(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // Do it
- v3s16 pos = read_v3s16(L, 2);
- u32 time_of_day = env->getTimeOfDay();
- if(lua_isnumber(L, 3))
- time_of_day = 24000.0 * lua_tonumber(L, 3);
- time_of_day %= 24000;
- u32 dnr = time_to_daynight_ratio(time_of_day, true);
- MapNode n = env->getMap().getNodeNoEx(pos);
- try{
- MapNode n = env->getMap().getNode(pos);
- INodeDefManager *ndef = env->getGameDef()->ndef();
- lua_pushinteger(L, n.getLightBlend(dnr, ndef));
- return 1;
- } catch(InvalidPositionException &e)
- {
- lua_pushnil(L);
- return 1;
- }
-}
-
-// EnvRef:place_node(pos, node)
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_place_node(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- v3s16 pos = read_v3s16(L, 2);
- MapNode n = readnode(L, 3, env->getGameDef()->ndef());
-
- // Don't attempt to load non-loaded area as of now
- MapNode n_old = env->getMap().getNodeNoEx(pos);
- if(n_old.getContent() == CONTENT_IGNORE){
- lua_pushboolean(L, false);
- return 1;
- }
- // Create item to place
- INodeDefManager *ndef = get_server(L)->ndef();
- IItemDefManager *idef = get_server(L)->idef();
- ItemStack item(ndef->get(n).name, 1, 0, "", idef);
- // Make pointed position
- PointedThing pointed;
- pointed.type = POINTEDTHING_NODE;
- pointed.node_abovesurface = pos;
- pointed.node_undersurface = pos + v3s16(0,-1,0);
- // Place it with a NULL placer (appears in Lua as a non-functional
- // ObjectRef)
- bool success = scriptapi_item_on_place(L, item, NULL, pointed);
- lua_pushboolean(L, success);
- return 1;
-}
-
-// EnvRef:dig_node(pos)
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_dig_node(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- v3s16 pos = read_v3s16(L, 2);
-
- // Don't attempt to load non-loaded area as of now
- MapNode n = env->getMap().getNodeNoEx(pos);
- if(n.getContent() == CONTENT_IGNORE){
- lua_pushboolean(L, false);
- return 1;
- }
- // Dig it out with a NULL digger (appears in Lua as a
- // non-functional ObjectRef)
- bool success = scriptapi_node_on_dig(L, pos, n, NULL);
- lua_pushboolean(L, success);
- return 1;
-}
-
-// EnvRef:punch_node(pos)
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_punch_node(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- v3s16 pos = read_v3s16(L, 2);
-
- // Don't attempt to load non-loaded area as of now
- MapNode n = env->getMap().getNodeNoEx(pos);
- if(n.getContent() == CONTENT_IGNORE){
- lua_pushboolean(L, false);
- return 1;
- }
- // Punch it with a NULL puncher (appears in Lua as a non-functional
- // ObjectRef)
- bool success = scriptapi_node_on_punch(L, pos, n, NULL);
- lua_pushboolean(L, success);
- return 1;
-}
-
-// EnvRef:get_meta(pos)
-int EnvRef::l_get_meta(lua_State *L)
-{
- //infostream<<"EnvRef::l_get_meta()"<<std::endl;
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // Do it
- v3s16 p = read_v3s16(L, 2);
- NodeMetaRef::create(L, p, env);
- return 1;
-}
-
-// EnvRef:get_node_timer(pos)
-int EnvRef::l_get_node_timer(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // Do it
- v3s16 p = read_v3s16(L, 2);
- NodeTimerRef::create(L, p, env);
- return 1;
-}
-
-// EnvRef:add_entity(pos, entityname) -> ObjectRef or nil
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_add_entity(lua_State *L)
-{
- //infostream<<"EnvRef::l_add_entity()"<<std::endl;
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // pos
- v3f pos = checkFloatPos(L, 2);
- // content
- const char *name = luaL_checkstring(L, 3);
- // Do it
- ServerActiveObject *obj = new LuaEntitySAO(env, pos, name, "");
- int objectid = env->addActiveObject(obj);
- // If failed to add, return nothing (reads as nil)
- if(objectid == 0)
- return 0;
- // Return ObjectRef
- objectref_get_or_create(L, obj);
- return 1;
-}
-
-// EnvRef:add_item(pos, itemstack or itemstring or table) -> ObjectRef or nil
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_add_item(lua_State *L)
-{
- //infostream<<"EnvRef::l_add_item()"<<std::endl;
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // pos
- v3f pos = checkFloatPos(L, 2);
- // item
- ItemStack item = read_item(L, 3);
- if(item.empty() || !item.isKnown(get_server(L)->idef()))
- return 0;
- // Use minetest.spawn_item to spawn a __builtin:item
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "spawn_item");
- if(lua_isnil(L, -1))
- return 0;
- lua_pushvalue(L, 2);
- lua_pushstring(L, item.getItemString().c_str());
- if(lua_pcall(L, 2, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- return 1;
- /*lua_pushvalue(L, 1);
- lua_pushstring(L, "__builtin:item");
- lua_pushstring(L, item.getItemString().c_str());
- return l_add_entity(L);*/
- /*// Do it
- ServerActiveObject *obj = createItemSAO(env, pos, item.getItemString());
- int objectid = env->addActiveObject(obj);
- // If failed to add, return nothing (reads as nil)
- if(objectid == 0)
- return 0;
- // Return ObjectRef
- objectref_get_or_create(L, obj);
- return 1;*/
-}
-
-// EnvRef:add_rat(pos)
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_add_rat(lua_State *L)
-{
- infostream<<"EnvRef::l_add_rat(): C++ mobs have been removed."
- <<" Doing nothing."<<std::endl;
- return 0;
-}
-
-// EnvRef:add_firefly(pos)
-// pos = {x=num, y=num, z=num}
-int EnvRef::l_add_firefly(lua_State *L)
-{
- infostream<<"EnvRef::l_add_firefly(): C++ mobs have been removed."
- <<" Doing nothing."<<std::endl;
- return 0;
-}
-
-// EnvRef:get_player_by_name(name)
-int EnvRef::l_get_player_by_name(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // Do it
- const char *name = luaL_checkstring(L, 2);
- Player *player = env->getPlayer(name);
- if(player == NULL){
- lua_pushnil(L);
- return 1;
- }
- PlayerSAO *sao = player->getPlayerSAO();
- if(sao == NULL){
- lua_pushnil(L);
- return 1;
- }
- // Put player on stack
- objectref_get_or_create(L, sao);
- return 1;
-}
-
-// EnvRef:get_objects_inside_radius(pos, radius)
-int EnvRef::l_get_objects_inside_radius(lua_State *L)
-{
- // Get the table insert function
- lua_getglobal(L, "table");
- lua_getfield(L, -1, "insert");
- int table_insert = lua_gettop(L);
- // Get environemnt
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // Do it
- v3f pos = checkFloatPos(L, 2);
- float radius = luaL_checknumber(L, 3) * BS;
- std::set<u16> ids = env->getObjectsInsideRadius(pos, radius);
- lua_newtable(L);
- int table = lua_gettop(L);
- for(std::set<u16>::const_iterator
- i = ids.begin(); i != ids.end(); i++){
- ServerActiveObject *obj = env->getActiveObject(*i);
- // Insert object reference into table
- lua_pushvalue(L, table_insert);
- lua_pushvalue(L, table);
- objectref_get_or_create(L, obj);
- if(lua_pcall(L, 2, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- }
- return 1;
-}
-
-// EnvRef:set_timeofday(val)
-// val = 0...1
-int EnvRef::l_set_timeofday(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // Do it
- float timeofday_f = luaL_checknumber(L, 2);
- assert(timeofday_f >= 0.0 && timeofday_f <= 1.0);
- int timeofday_mh = (int)(timeofday_f * 24000.0);
- // This should be set directly in the environment but currently
- // such changes aren't immediately sent to the clients, so call
- // the server instead.
- //env->setTimeOfDay(timeofday_mh);
- get_server(L)->setTimeOfDay(timeofday_mh);
- return 0;
-}
-
-// EnvRef:get_timeofday() -> 0...1
-int EnvRef::l_get_timeofday(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- // Do it
- int timeofday_mh = env->getTimeOfDay();
- float timeofday_f = (float)timeofday_mh / 24000.0;
- lua_pushnumber(L, timeofday_f);
- return 1;
-}
-
-
-// EnvRef:find_node_near(pos, radius, nodenames) -> pos or nil
-// nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
-int EnvRef::l_find_node_near(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- INodeDefManager *ndef = get_server(L)->ndef();
- v3s16 pos = read_v3s16(L, 2);
- int radius = luaL_checkinteger(L, 3);
- std::set<content_t> filter;
- if(lua_istable(L, 4)){
- int table = 4;
- lua_pushnil(L);
- while(lua_next(L, table) != 0){
- // key at index -2 and value at index -1
- luaL_checktype(L, -1, LUA_TSTRING);
- ndef->getIds(lua_tostring(L, -1), filter);
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- } else if(lua_isstring(L, 4)){
- ndef->getIds(lua_tostring(L, 4), filter);
- }
-
- for(int d=1; d<=radius; d++){
- std::list<v3s16> list;
- getFacePositions(list, d);
- for(std::list<v3s16>::iterator i = list.begin();
- i != list.end(); ++i){
- v3s16 p = pos + (*i);
- content_t c = env->getMap().getNodeNoEx(p).getContent();
- if(filter.count(c) != 0){
- push_v3s16(L, p);
- return 1;
- }
- }
- }
- return 0;
-}
-
-// EnvRef:find_nodes_in_area(minp, maxp, nodenames) -> list of positions
-// nodenames: eg. {"ignore", "group:tree"} or "default:dirt"
-int EnvRef::l_find_nodes_in_area(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- INodeDefManager *ndef = get_server(L)->ndef();
- v3s16 minp = read_v3s16(L, 2);
- v3s16 maxp = read_v3s16(L, 3);
- std::set<content_t> filter;
- if(lua_istable(L, 4)){
- int table = 4;
- lua_pushnil(L);
- while(lua_next(L, table) != 0){
- // key at index -2 and value at index -1
- luaL_checktype(L, -1, LUA_TSTRING);
- ndef->getIds(lua_tostring(L, -1), filter);
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- } else if(lua_isstring(L, 4)){
- ndef->getIds(lua_tostring(L, 4), filter);
- }
-
- // Get the table insert function
- lua_getglobal(L, "table");
- lua_getfield(L, -1, "insert");
- int table_insert = lua_gettop(L);
-
- lua_newtable(L);
- int table = lua_gettop(L);
- for(s16 x=minp.X; x<=maxp.X; x++)
- for(s16 y=minp.Y; y<=maxp.Y; y++)
- for(s16 z=minp.Z; z<=maxp.Z; z++)
- {
- v3s16 p(x,y,z);
- content_t c = env->getMap().getNodeNoEx(p).getContent();
- if(filter.count(c) != 0){
- lua_pushvalue(L, table_insert);
- lua_pushvalue(L, table);
- push_v3s16(L, p);
- if(lua_pcall(L, 2, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- }
- }
- return 1;
-}
-
-// EnvRef:get_perlin(seeddiff, octaves, persistence, scale)
-// returns world-specific PerlinNoise
-int EnvRef::l_get_perlin(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
-
- int seeddiff = luaL_checkint(L, 2);
- int octaves = luaL_checkint(L, 3);
- float persistence = luaL_checknumber(L, 4);
- float scale = luaL_checknumber(L, 5);
-
- LuaPerlinNoise *n = new LuaPerlinNoise(seeddiff + int(env->getServerMap().getSeed()), octaves, persistence, scale);
- *(void **)(lua_newuserdata(L, sizeof(void *))) = n;
- luaL_getmetatable(L, "PerlinNoise");
- lua_setmetatable(L, -2);
- return 1;
-}
-
-// EnvRef:get_perlin_map(noiseparams, size)
-// returns world-specific PerlinNoiseMap
-int EnvRef::l_get_perlin_map(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if (env == NULL)
- return 0;
-
- NoiseParams *np = read_noiseparams(L, 2);
- if (!np)
- return 0;
- v3s16 size = read_v3s16(L, 3);
-
- int seed = (int)(env->getServerMap().getSeed());
- LuaPerlinNoiseMap *n = new LuaPerlinNoiseMap(np, seed, size);
- *(void **)(lua_newuserdata(L, sizeof(void *))) = n;
- luaL_getmetatable(L, "PerlinNoiseMap");
- lua_setmetatable(L, -2);
- return 1;
-}
-
-// EnvRef:clear_objects()
-// clear all objects in the environment
-int EnvRef::l_clear_objects(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- o->m_env->clearAllObjects();
- return 0;
-}
-
-int EnvRef::l_line_of_sight(lua_State *L) {
- float stepsize = 1.0;
-
- //infostream<<"EnvRef::l_get_node()"<<std::endl;
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
-
- // read position 1 from lua
- v3f pos1 = checkFloatPos(L, 2);
- // read position 2 from lua
- v3f pos2 = checkFloatPos(L, 2);
- //read step size from lua
- if(lua_isnumber(L, 3))
- stepsize = lua_tonumber(L, 3);
-
- lua_pushboolean(L, env->line_of_sight(pos1,pos2,stepsize));
-
- return 1;
-}
-
-int EnvRef::l_find_path(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
-
- if(env == NULL) return 0;
-
- v3s16 pos1 = read_v3s16(L, 2);
- v3s16 pos2 = read_v3s16(L, 3);
- unsigned int searchdistance = luaL_checkint(L, 4);
- unsigned int max_jump = luaL_checkint(L, 5);
- unsigned int max_drop = luaL_checkint(L, 6);
- algorithm algo = A_PLAIN_NP;
- if(! lua_isnil(L, 7)) {
- std::string algorithm = luaL_checkstring(L,7);
-
- if (algorithm == "A*")
- algo = A_PLAIN;
-
- if (algorithm == "Dijkstra")
- algo = DIJKSTRA;
- }
-
- std::vector<v3s16> path =
- get_Path(env,pos1,pos2,searchdistance,max_jump,max_drop,algo);
-
- if (path.size() > 0)
- {
- lua_newtable(L);
- int top = lua_gettop(L);
- unsigned int index = 1;
- for (std::vector<v3s16>::iterator i = path.begin(); i != path.end();i++)
- {
- lua_pushnumber(L,index);
- push_v3s16(L, *i);
- lua_settable(L, top);
- index++;
- }
- return 1;
- }
-
- return 0;
-}
-
-int EnvRef::l_spawn_tree(lua_State *L)
-{
- EnvRef *o = checkobject(L, 1);
- ServerEnvironment *env = o->m_env;
- if(env == NULL) return 0;
- v3s16 p0 = read_v3s16(L, 2);
-
- treegen::TreeDef tree_def;
- std::string trunk,leaves,fruit;
- INodeDefManager *ndef = env->getGameDef()->ndef();
-
- if(lua_istable(L, 3))
- {
- getstringfield(L, 3, "axiom", tree_def.initial_axiom);
- getstringfield(L, 3, "rules_a", tree_def.rules_a);
- getstringfield(L, 3, "rules_b", tree_def.rules_b);
- getstringfield(L, 3, "rules_c", tree_def.rules_c);
- getstringfield(L, 3, "rules_d", tree_def.rules_d);
- getstringfield(L, 3, "trunk", trunk);
- tree_def.trunknode=ndef->getId(trunk);
- getstringfield(L, 3, "leaves", leaves);
- tree_def.leavesnode=ndef->getId(leaves);
- tree_def.leaves2_chance=0;
- getstringfield(L, 3, "leaves2", leaves);
- if (leaves !="")
- {
- tree_def.leaves2node=ndef->getId(leaves);
- getintfield(L, 3, "leaves2_chance", tree_def.leaves2_chance);
- }
- getintfield(L, 3, "angle", tree_def.angle);
- getintfield(L, 3, "iterations", tree_def.iterations);
- getintfield(L, 3, "random_level", tree_def.iterations_random_level);
- getstringfield(L, 3, "trunk_type", tree_def.trunk_type);
- getboolfield(L, 3, "thin_branches", tree_def.thin_branches);
- tree_def.fruit_chance=0;
- getstringfield(L, 3, "fruit", fruit);
- if (fruit != "")
- {
- tree_def.fruitnode=ndef->getId(fruit);
- getintfield(L, 3, "fruit_chance",tree_def.fruit_chance);
- }
- getintfield(L, 3, "seed", tree_def.seed);
- }
- else
- return 0;
- treegen::spawn_ltree (env, p0, ndef, tree_def);
- return 1;
-}
-
-
-EnvRef::EnvRef(ServerEnvironment *env):
- m_env(env)
-{
- //infostream<<"EnvRef created"<<std::endl;
-}
-
-EnvRef::~EnvRef()
-{
- //infostream<<"EnvRef destructing"<<std::endl;
-}
-
-// Creates an EnvRef and leaves it on top of stack
-// Not callable from Lua; all references are created on the C side.
-void EnvRef::create(lua_State *L, ServerEnvironment *env)
-{
- EnvRef *o = new EnvRef(env);
- //infostream<<"EnvRef::create: o="<<o<<std::endl;
- *(void **)(lua_newuserdata(L, sizeof(void *))) = o;
- luaL_getmetatable(L, className);
- lua_setmetatable(L, -2);
-}
-
-void EnvRef::set_null(lua_State *L)
-{
- EnvRef *o = checkobject(L, -1);
- o->m_env = NULL;
-}
-
-void EnvRef::Register(lua_State *L)
-{
- lua_newtable(L);
- int methodtable = lua_gettop(L);
- luaL_newmetatable(L, className);
- int metatable = lua_gettop(L);
-
- lua_pushliteral(L, "__metatable");
- lua_pushvalue(L, methodtable);
- lua_settable(L, metatable); // hide metatable from Lua getmetatable()
-
- lua_pushliteral(L, "__index");
- lua_pushvalue(L, methodtable);
- lua_settable(L, metatable);
-
- lua_pushliteral(L, "__gc");
- lua_pushcfunction(L, gc_object);
- lua_settable(L, metatable);
-
- lua_pop(L, 1); // drop metatable
-
- luaL_openlib(L, 0, methods, 0); // fill methodtable
- lua_pop(L, 1); // drop methodtable
-
- // Cannot be created from Lua
- //lua_register(L, className, create_object);
-}
-
-const char EnvRef::className[] = "EnvRef";
-const luaL_reg EnvRef::methods[] = {
- luamethod(EnvRef, set_node),
- luamethod(EnvRef, add_node),
- luamethod(EnvRef, remove_node),
- luamethod(EnvRef, get_node),
- luamethod(EnvRef, get_node_or_nil),
- luamethod(EnvRef, get_node_light),
- luamethod(EnvRef, place_node),
- luamethod(EnvRef, dig_node),
- luamethod(EnvRef, punch_node),
- luamethod(EnvRef, add_entity),
- luamethod(EnvRef, add_item),
- luamethod(EnvRef, add_rat),
- luamethod(EnvRef, add_firefly),
- luamethod(EnvRef, get_meta),
- luamethod(EnvRef, get_node_timer),
- luamethod(EnvRef, get_player_by_name),
- luamethod(EnvRef, get_objects_inside_radius),
- luamethod(EnvRef, set_timeofday),
- luamethod(EnvRef, get_timeofday),
- luamethod(EnvRef, find_node_near),
- luamethod(EnvRef, find_nodes_in_area),
- luamethod(EnvRef, get_perlin),
- luamethod(EnvRef, get_perlin_map),
- luamethod(EnvRef, clear_objects),
- luamethod(EnvRef, spawn_tree),
- luamethod(EnvRef, line_of_sight),
- luamethod(EnvRef, find_path),
- {0,0}
-};
-
-void scriptapi_environment_on_generated(lua_State *L, v3s16 minp, v3s16 maxp,
- u32 blockseed)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- //infostream<<"scriptapi_environment_on_generated"<<std::endl;
- StackUnroller stack_unroller(L);
-
- // Get minetest.registered_on_generateds
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_on_generateds");
- // Call callbacks
- push_v3s16(L, minp);
- push_v3s16(L, maxp);
- lua_pushnumber(L, blockseed);
- scriptapi_run_callbacks(L, 3, RUN_CALLBACKS_MODE_FIRST);
-}
-
-void scriptapi_environment_step(lua_State *L, float dtime)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- //infostream<<"scriptapi_environment_step"<<std::endl;
- StackUnroller stack_unroller(L);
-
- // Get minetest.registered_globalsteps
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_globalsteps");
- // Call callbacks
- lua_pushnumber(L, dtime);
- scriptapi_run_callbacks(L, 1, RUN_CALLBACKS_MODE_FIRST);
-}
-
-void scriptapi_add_environment(lua_State *L, ServerEnvironment *env)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- verbosestream<<"scriptapi_add_environment"<<std::endl;
- StackUnroller stack_unroller(L);
-
- // Create EnvRef on stack
- EnvRef::create(L, env);
- int envref = lua_gettop(L);
-
- // minetest.env = envref
- lua_getglobal(L, "minetest");
- luaL_checktype(L, -1, LUA_TTABLE);
- lua_pushvalue(L, envref);
- lua_setfield(L, -2, "env");
-
- // Store environment as light userdata in registry
- lua_pushlightuserdata(L, env);
- lua_setfield(L, LUA_REGISTRYINDEX, "minetest_env");
-
- /*
- Add ActiveBlockModifiers to environment
- */
-
- // Get minetest.registered_abms
- lua_getglobal(L, "minetest");
- lua_getfield(L, -1, "registered_abms");
- luaL_checktype(L, -1, LUA_TTABLE);
- int registered_abms = lua_gettop(L);
-
- if(lua_istable(L, registered_abms)){
- int table = lua_gettop(L);
- lua_pushnil(L);
- while(lua_next(L, table) != 0){
- // key at index -2 and value at index -1
- int id = lua_tonumber(L, -2);
- int current_abm = lua_gettop(L);
-
- std::set<std::string> trigger_contents;
- lua_getfield(L, current_abm, "nodenames");
- if(lua_istable(L, -1)){
- int table = lua_gettop(L);
- lua_pushnil(L);
- while(lua_next(L, table) != 0){
- // key at index -2 and value at index -1
- luaL_checktype(L, -1, LUA_TSTRING);
- trigger_contents.insert(lua_tostring(L, -1));
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- } else if(lua_isstring(L, -1)){
- trigger_contents.insert(lua_tostring(L, -1));
- }
- lua_pop(L, 1);
-
- std::set<std::string> required_neighbors;
- lua_getfield(L, current_abm, "neighbors");
- if(lua_istable(L, -1)){
- int table = lua_gettop(L);
- lua_pushnil(L);
- while(lua_next(L, table) != 0){
- // key at index -2 and value at index -1
- luaL_checktype(L, -1, LUA_TSTRING);
- required_neighbors.insert(lua_tostring(L, -1));
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- } else if(lua_isstring(L, -1)){
- required_neighbors.insert(lua_tostring(L, -1));
- }
- lua_pop(L, 1);
-
- float trigger_interval = 10.0;
- getfloatfield(L, current_abm, "interval", trigger_interval);
-
- int trigger_chance = 50;
- getintfield(L, current_abm, "chance", trigger_chance);
-
- LuaABM *abm = new LuaABM(L, id, trigger_contents,
- required_neighbors, trigger_interval, trigger_chance);
-
- env->addActiveBlockModifier(abm);
-
- // removes value, keeps key for next iteration
- lua_pop(L, 1);
- }
- }
- lua_pop(L, 1);
-}
diff --git a/src/scriptapi_node.cpp b/src/scriptapi_node.cpp
deleted file mode 100644
index 2fea50fa1823cfab49e39b9f10e432e76a77e982..0000000000000000000000000000000000000000
--- a/src/scriptapi_node.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-Minetest
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "scriptapi.h"
-#include "scriptapi_node.h"
-#include "util/pointedthing.h"
-#include "script.h"
-#include "scriptapi_common.h"
-#include "scriptapi_types.h"
-#include "scriptapi_item.h"
-#include "scriptapi_object.h"
-
-
-struct EnumString es_DrawType[] =
-{
- {NDT_NORMAL, "normal"},
- {NDT_AIRLIKE, "airlike"},
- {NDT_LIQUID, "liquid"},
- {NDT_FLOWINGLIQUID, "flowingliquid"},
- {NDT_GLASSLIKE, "glasslike"},
- {NDT_GLASSLIKE_FRAMED, "glasslike_framed"},
- {NDT_ALLFACES, "allfaces"},
- {NDT_ALLFACES_OPTIONAL, "allfaces_optional"},
- {NDT_TORCHLIKE, "torchlike"},
- {NDT_SIGNLIKE, "signlike"},
- {NDT_PLANTLIKE, "plantlike"},
- {NDT_FENCELIKE, "fencelike"},
- {NDT_RAILLIKE, "raillike"},
- {NDT_NODEBOX, "nodebox"},
- {0, NULL},
-};
-
-struct EnumString es_ContentParamType[] =
-{
- {CPT_NONE, "none"},
- {CPT_LIGHT, "light"},
- {0, NULL},
-};
-
-struct EnumString es_ContentParamType2[] =
-{
- {CPT2_NONE, "none"},
- {CPT2_FULL, "full"},
- {CPT2_FLOWINGLIQUID, "flowingliquid"},
- {CPT2_FACEDIR, "facedir"},
- {CPT2_WALLMOUNTED, "wallmounted"},
- {0, NULL},
-};
-
-struct EnumString es_LiquidType[] =
-{
- {LIQUID_NONE, "none"},
- {LIQUID_FLOWING, "flowing"},
- {LIQUID_SOURCE, "source"},
- {0, NULL},
-};
-
-struct EnumString es_NodeBoxType[] =
-{
- {NODEBOX_REGULAR, "regular"},
- {NODEBOX_FIXED, "fixed"},
- {NODEBOX_WALLMOUNTED, "wallmounted"},
- {0, NULL},
-};
-
-
-bool scriptapi_node_on_punch(lua_State *L, v3s16 p, MapNode node,
- ServerActiveObject *puncher)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(), "on_punch"))
- return false;
-
- // Call function
- push_v3s16(L, p);
- pushnode(L, node, ndef);
- objectref_get_or_create(L, puncher);
- if(lua_pcall(L, 3, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- return true;
-}
-
-bool scriptapi_node_on_dig(lua_State *L, v3s16 p, MapNode node,
- ServerActiveObject *digger)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(), "on_dig"))
- return false;
-
- // Call function
- push_v3s16(L, p);
- pushnode(L, node, ndef);
- objectref_get_or_create(L, digger);
- if(lua_pcall(L, 3, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- return true;
-}
-
-void scriptapi_node_on_construct(lua_State *L, v3s16 p, MapNode node)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(), "on_construct"))
- return;
-
- // Call function
- push_v3s16(L, p);
- if(lua_pcall(L, 1, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
-
-void scriptapi_node_on_destruct(lua_State *L, v3s16 p, MapNode node)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(), "on_destruct"))
- return;
-
- // Call function
- push_v3s16(L, p);
- if(lua_pcall(L, 1, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
-
-void scriptapi_node_after_destruct(lua_State *L, v3s16 p, MapNode node)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(), "after_destruct"))
- return;
-
- // Call function
- push_v3s16(L, p);
- pushnode(L, node, ndef);
- if(lua_pcall(L, 2, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
-
-bool scriptapi_node_on_timer(lua_State *L, v3s16 p, MapNode node, f32 dtime)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(), "on_timer"))
- return false;
-
- // Call function
- push_v3s16(L, p);
- lua_pushnumber(L,dtime);
- if(lua_pcall(L, 2, 1, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
- if((bool)lua_isboolean(L,-1) && (bool)lua_toboolean(L,-1) == true)
- return true;
-
- return false;
-}
-
-void scriptapi_node_on_receive_fields(lua_State *L, v3s16 p,
- const std::string &formname,
- const std::map<std::string, std::string> &fields,
- ServerActiveObject *sender)
-{
- realitycheck(L);
- assert(lua_checkstack(L, 20));
- StackUnroller stack_unroller(L);
-
- INodeDefManager *ndef = get_server(L)->ndef();
-
- // If node doesn't exist, we don't know what callback to call
- MapNode node = get_env(L)->getMap().getNodeNoEx(p);
- if(node.getContent() == CONTENT_IGNORE)
- return;
-
- // Push callback function on stack
- if(!get_item_callback(L, ndef->get(node).name.c_str(), "on_receive_fields"))
- return;
-
- // Call function
- // param 1
- push_v3s16(L, p);
- // param 2
- lua_pushstring(L, formname.c_str());
- // param 3
- lua_newtable(L);
- for(std::map<std::string, std::string>::const_iterator
- i = fields.begin(); i != fields.end(); i++){
- const std::string &name = i->first;
- const std::string &value = i->second;
- lua_pushstring(L, name.c_str());
- lua_pushlstring(L, value.c_str(), value.size());
- lua_settable(L, -3);
- }
- // param 4
- objectref_get_or_create(L, sender);
- if(lua_pcall(L, 4, 0, 0))
- script_error(L, "error: %s", lua_tostring(L, -1));
-}
diff --git a/src/scriptapi_node.h b/src/scriptapi_node.h
deleted file mode 100644
index 665b58bfc1934531f241fa737ead3083dbd0b154..0000000000000000000000000000000000000000
--- a/src/scriptapi_node.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Minetest-c55
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public License along
-with this program; if not, write to the Free Software Foundation, Inc.,
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#ifndef LUA_NODE_H_
-#define LUA_NODE_H_
-
-#include <iostream>
-#include <map>
-
-extern "C" {
-#include <lua.h>
-}
-
-#include "content_sao.h"
-#include "map.h"
-
-/*****************************************************************************/
-/* Minetest interface */
-/*****************************************************************************/
-bool scriptapi_node_on_punch(lua_State *L, v3s16 p, MapNode node,
- ServerActiveObject *puncher);
-bool scriptapi_node_on_dig(lua_State *L, v3s16 p, MapNode node,
- ServerActiveObject *digger);
-void scriptapi_node_on_construct(lua_State *L, v3s16 p, MapNode node);
-void scriptapi_node_on_destruct(lua_State *L, v3s16 p, MapNode node);
-void scriptapi_node_after_destruct(lua_State *L, v3s16 p, MapNode node);
-bool scriptapi_node_on_timer(lua_State *L, v3s16 p, MapNode node, f32 dtime);
-void scriptapi_node_on_receive_fields(lua_State *L, v3s16 p,
- const std::string &formname,
- const std::map<std::string, std::string> &fields,
- ServerActiveObject *sender);
-
-extern struct EnumString es_DrawType[];
-extern struct EnumString es_ContentParamType[];
-extern struct EnumString es_ContentParamType2[];
-extern struct EnumString es_LiquidType[];
-extern struct EnumString es_NodeBoxType[];
-
-#endif /* LUA_NODE_H_ */
diff --git a/src/server.cpp b/src/server.cpp
index 40a4f8a024bd675bfc70d9d091cf580be38add00..4268bb8098fe3009c5e8a58d81f24b8846249914 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -34,8 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "settings.h"
#include "profiler.h"
#include "log.h"
-#include "script.h"
-#include "scriptapi.h"
+#include "script/cpp_api/scriptapi.h"
#include "nodedef.h"
#include "itemdef.h"
#include "craftdef.h"
@@ -646,7 +645,7 @@ Server::Server(
m_rollback_sink_enabled(true),
m_enable_rollback_recording(false),
m_emerge(NULL),
- m_lua(NULL),
+ m_script(NULL),
m_itemdef(createItemDefManager()),
m_nodedef(createNodeDefManager()),
m_craftdef(createCraftDefManager()),
@@ -727,19 +726,13 @@ Server::Server(
std::string worldmt = m_path_world + DIR_DELIM + "world.mt";
worldmt_settings.readConfigFile(worldmt.c_str());
std::vector<std::string> names = worldmt_settings.getNames();
- std::set<std::string> exclude_mod_names;
std::set<std::string> load_mod_names;
for(std::vector<std::string>::iterator it = names.begin();
it != names.end(); ++it)
{
std::string name = *it;
- if (name.compare(0,9,"load_mod_")==0)
- {
- if(worldmt_settings.getBool(name))
- load_mod_names.insert(name.substr(9));
- else
- exclude_mod_names.insert(name.substr(9));
- }
+ if(name.compare(0,9,"load_mod_")==0 && worldmt_settings.getBool(name))
+ load_mod_names.insert(name.substr(9));
}
// complain about mods declared to be loaded, but not found
for(std::vector<ModSpec>::iterator it = m_mods.begin();
@@ -767,14 +760,14 @@ Server::Server(
// Initialize scripting
infostream<<"Server: Initializing Lua"<<std::endl;
- m_lua = script_init();
- assert(m_lua);
- // Export API
- scriptapi_export(m_lua, this);
+
+ m_script = new ScriptApi(this);
+
+
// Load and run builtin.lua
infostream<<"Server: Loading builtin.lua [\""
<<builtinpath<<"\"]"<<std::endl;
- bool success = scriptapi_loadmod(m_lua, builtinpath, "__builtin");
+ bool success = m_script->loadMod(builtinpath, "__builtin");
if(!success){
errorstream<<"Server: Failed to load and run "
<<builtinpath<<std::endl;
@@ -795,7 +788,7 @@ Server::Server(
std::string scriptpath = mod.path + DIR_DELIM + "init.lua";
infostream<<" ["<<padStringRight(mod.name, 12)<<"] [\""
<<scriptpath<<"\"]"<<std::endl;
- bool success = scriptapi_loadmod(m_lua, scriptpath, mod.name);
+ bool success = m_script->loadMod(scriptpath, mod.name);
if(!success){
errorstream<<"Server: Failed to load and run "
<<scriptpath<<std::endl;
@@ -811,12 +804,12 @@ Server::Server(
// Initialize Environment
ServerMap *servermap = new ServerMap(path_world, this, m_emerge);
- m_env = new ServerEnvironment(servermap, m_lua, this, this);
+ m_env = new ServerEnvironment(servermap, m_script, this, this);
m_emerge->initMapgens(servermap->getMapgenParams());
// Give environment reference to scripting api
- scriptapi_add_environment(m_lua, m_env);
+ m_script->initializeEnvironment(m_env);
// Register us to receive map edit events
servermap->addEventReceiver(this);
@@ -880,7 +873,7 @@ Server::~Server()
/*
Execute script shutdown hooks
*/
- scriptapi_on_shutdown(m_lua);
+ m_script->on_shutdown();
}
{
@@ -933,7 +926,7 @@ Server::~Server()
// Deinitialize scripting
infostream<<"Server: Deinitializing scripting"<<std::endl;
- script_deinit(m_lua);
+ delete m_script;
// Delete detached inventories
{
@@ -1950,7 +1943,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
}
std::string checkpwd; // Password hash to check against
- bool has_auth = scriptapi_get_auth(m_lua, playername, &checkpwd, NULL);
+ bool has_auth = m_script->getAuth(playername, &checkpwd, NULL);
// If no authentication info exists for user, create it
if(!has_auth){
@@ -1970,10 +1963,10 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
if (raw_default_password.length() == 0)
initial_password = given_password;
- scriptapi_create_auth(m_lua, playername, initial_password);
+ m_script->createAuth(playername, initial_password);
}
- has_auth = scriptapi_get_auth(m_lua, playername, &checkpwd, NULL);
+ has_auth = m_script->getAuth(playername, &checkpwd, NULL);
if(!has_auth){
SendAccessDenied(m_con, peer_id, L"Not allowed to login");
@@ -2475,7 +2468,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
std::wstring name = narrow_to_wide(player->getName());
// Run script hook
- bool ate = scriptapi_on_chat_message(m_lua, player->getName(),
+ bool ate = m_script->on_chat_message(player->getName(),
wide_to_narrow(message));
// If script ate the message, don't proceed
if(ate)
@@ -2607,7 +2600,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
std::string playername = player->getName();
std::string checkpwd;
- scriptapi_get_auth(m_lua, playername, &checkpwd, NULL);
+ m_script->getAuth(playername, &checkpwd, NULL);
if(oldpwd != checkpwd)
{
@@ -2617,7 +2610,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
return;
}
- bool success = scriptapi_set_password(m_lua, playername, newpwd);
+ bool success = m_script->setPassword(playername, newpwd);
if(success){
actionstream<<player->getName()<<" changes password"<<std::endl;
SendChatMessage(peer_id, L"Password change successful.");
@@ -2821,7 +2814,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
m_emerge->enqueueBlockEmerge(peer_id, getNodeBlockPos(p_above), false);
}
if(n.getContent() != CONTENT_IGNORE)
- scriptapi_node_on_punch(m_lua, p_under, n, playersao);
+ m_script->node_on_punch(p_under, n, playersao);
// Cheat prevention
playersao->noCheatDigStart(p_under);
}
@@ -2931,7 +2924,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
/* Actually dig node */
if(is_valid_dig && n.getContent() != CONTENT_IGNORE)
- scriptapi_node_on_dig(m_lua, p_under, n, playersao);
+ m_script->node_on_dig(p_under, n, playersao);
// Send unusual result (that is, node not being removed)
if(m_env->getMap().getNodeNoEx(p_under).getContent() != CONTENT_AIR)
@@ -2971,7 +2964,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
// Do stuff
pointed_object->rightClick(playersao);
}
- else if(scriptapi_item_on_place(m_lua,
+ else if(m_script->item_OnPlace(
item, playersao, pointed))
{
// Placement was handled in lua
@@ -3003,7 +2996,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
actionstream<<player->getName()<<" uses "<<item.name
<<", pointing at "<<pointed.dump()<<std::endl;
- if(scriptapi_item_on_use(m_lua,
+ if(m_script->item_OnUse(
item, playersao, pointed))
{
// Apply returned ItemStack
@@ -3062,8 +3055,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
// Check the target node for rollback data; leave others unnoticed
RollbackNode rn_old(&m_env->getMap(), p, this);
- scriptapi_node_on_receive_fields(m_lua, p, formname, fields,
- playersao);
+ m_script->node_on_receive_fields(p, formname, fields,playersao);
// Report rollback data
RollbackNode rn_new(&m_env->getMap(), p, this);
@@ -3087,7 +3079,7 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id)
fields[fieldname] = fieldvalue;
}
- scriptapi_on_player_receive_fields(m_lua, playersao, formname, fields);
+ m_script->on_playerReceiveFields(playersao, formname, fields);
}
else
{
@@ -3194,46 +3186,46 @@ void Server::setInventoryModified(const InventoryLocation &loc)
}
}
-std::list<PlayerInfo> Server::getPlayerInfo()
-{
- DSTACK(__FUNCTION_NAME);
- JMutexAutoLock envlock(m_env_mutex);
- JMutexAutoLock conlock(m_con_mutex);
-
- std::list<PlayerInfo> list;
-
- std::list<Player*> players = m_env->getPlayers();
-
- std::list<Player*>::iterator i;
- for(i = players.begin();
- i != players.end(); ++i)
- {
- PlayerInfo info;
-
- Player *player = *i;
-
- try{
- // Copy info from connection to info struct
- info.id = player->peer_id;
- info.address = m_con.GetPeerAddress(player->peer_id);
- info.avg_rtt = m_con.GetPeerAvgRTT(player->peer_id);
- }
- catch(con::PeerNotFoundException &e)
- {
- // Set dummy peer info
- info.id = 0;
- info.address = Address(0,0,0,0,0);
- info.avg_rtt = 0.0;
- }
-
- snprintf(info.name, PLAYERNAME_SIZE, "%s", player->getName());
- info.position = player->getPosition();
-
- list.push_back(info);
- }
-
- return list;
-}
+//std::list<PlayerInfo> Server::getPlayerInfo()
+//{
+// DSTACK(__FUNCTION_NAME);
+// JMutexAutoLock envlock(m_env_mutex);
+// JMutexAutoLock conlock(m_con_mutex);
+//
+// std::list<PlayerInfo> list;
+//
+// std::list<Player*> players = m_env->getPlayers();
+//
+// std::list<Player*>::iterator i;
+// for(i = players.begin();
+// i != players.end(); ++i)
+// {
+// PlayerInfo info;
+//
+// Player *player = *i;
+//
+// try{
+// // Copy info from connection to info struct
+// info.id = player->peer_id;
+// info.address = m_con.GetPeerAddress(player->peer_id);
+// info.avg_rtt = m_con.GetPeerAvgRTT(player->peer_id);
+// }
+// catch(con::PeerNotFoundException &e)
+// {
+// // Set dummy peer info
+// info.id = 0;
+// info.address = Address(0,0,0,0,0);
+// info.avg_rtt = 0.0;
+// }
+//
+// snprintf(info.name, PLAYERNAME_SIZE, "%s", player->getName());
+// info.position = player->getPosition();
+//
+// list.push_back(info);
+// }
+//
+// return list;
+//}
void Server::peerAdded(con::Peer *peer)
@@ -3695,6 +3687,22 @@ void Server::SendHUDSetFlags(u16 peer_id, u32 flags, u32 mask)
m_con.Send(peer_id, 0, data, true);
}
+void Server::SendHUDSetParam(u16 peer_id, u16 param, const std::string &value)
+{
+ std::ostringstream os(std::ios_base::binary);
+
+ // Write command
+ writeU16(os, TOCLIENT_HUD_SET_PARAM);
+ writeU16(os, param);
+ os<<serializeString(value);
+
+ // Make data buffer
+ std::string s = os.str();
+ SharedBuffer<u8> data((u8 *)s.c_str(), s.size());
+ // Send as reliable
+ m_con.Send(peer_id, 0, data, true);
+}
+
void Server::BroadcastChatMessage(const std::wstring &message)
{
for(std::map<u16, RemoteClient*>::iterator
@@ -3758,7 +3766,7 @@ void Server::SendPlayerPrivileges(u16 peer_id)
return;
std::set<std::string> privs;
- scriptapi_get_auth(m_lua, player->getName(), NULL, &privs);
+ m_script->getAuth(player->getName(), NULL, &privs);
std::ostringstream os(std::ios_base::binary);
writeU16(os, TOCLIENT_PRIVILEGES);
@@ -4478,7 +4486,7 @@ void Server::DiePlayer(u16 peer_id)
playersao->setHP(0);
// Trigger scripted stuff
- scriptapi_on_dieplayer(m_lua, playersao);
+ m_script->on_dieplayer(playersao);
SendPlayerHP(peer_id);
SendDeathscreen(m_con, peer_id, false, v3f(0,0,0));
@@ -4497,7 +4505,7 @@ void Server::RespawnPlayer(u16 peer_id)
playersao->setHP(PLAYER_MAX_HP);
- bool repositioned = scriptapi_on_respawnplayer(m_lua, playersao);
+ bool repositioned = m_script->on_respawnplayer(playersao);
if(!repositioned){
v3f pos = findSpawnPos(m_env->getServerMap());
playersao->setPos(pos);
@@ -4577,7 +4585,7 @@ std::wstring Server::getStatusString()
std::set<std::string> Server::getPlayerEffectivePrivs(const std::string &name)
{
std::set<std::string> privs;
- scriptapi_get_auth(m_lua, name, NULL, &privs);
+ m_script->getAuth(name, NULL, &privs);
return privs;
}
@@ -4692,6 +4700,18 @@ bool Server::hudSetFlags(Player *player, u32 flags, u32 mask) {
return true;
}
+bool Server::hudSetHotbarItemcount(Player *player, s32 hotbar_itemcount) {
+ if (!player)
+ return false;
+ if (hotbar_itemcount <= 0 || hotbar_itemcount > HUD_HOTBAR_ITEMCOUNT_MAX)
+ return false;
+
+ std::ostringstream os(std::ios::binary);
+ writeS32(os, hotbar_itemcount);
+ SendHUDSetParam(player->peer_id, HUD_PARAM_HOTBAR_ITEMCOUNT, os.str());
+ return true;
+}
+
void Server::notifyPlayers(const std::wstring msg)
{
BroadcastChatMessage(msg);
@@ -5085,9 +5105,9 @@ PlayerSAO* Server::emergePlayer(const char *name, u16 peer_id)
/* Run scripts */
if(newplayer)
- scriptapi_on_newplayer(m_lua, playersao);
+ m_script->on_newplayer(playersao);
- scriptapi_on_joinplayer(m_lua, playersao);
+ m_script->on_joinplayer(playersao);
return playersao;
}
@@ -5182,7 +5202,7 @@ void Server::handlePeerChange(PeerChange &c)
PlayerSAO *playersao = player->getPlayerSAO();
assert(playersao);
- scriptapi_on_leaveplayer(m_lua, playersao);
+ m_script->on_leaveplayer(playersao);
playersao->disconnected();
}
diff --git a/src/server.h b/src/server.h
index dcd007d23f3e19a1f2993bd74dec472c28afed32..edc5c4895d71fd1fa8f1b0b8cdd93d4034945b50 100644
--- a/src/server.h
+++ b/src/server.h
@@ -43,8 +43,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#define PP(x) "("<<(x).X<<","<<(x).Y<<","<<(x).Z<<")"
-struct LuaState;
-typedef struct lua_State lua_State;
class IWritableItemDefManager;
class IWritableNodeDefManager;
class IWritableCraftDefManager;
@@ -52,7 +50,9 @@ class EventManager;
class PlayerSAO;
class IRollbackManager;
class EmergeManager;
-//struct HudElement;
+//struct HudElement; ?????????
+class ScriptApi;
+
class ServerError : public std::exception
{
@@ -384,7 +384,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
void Receive();
void ProcessData(u8 *data, u32 datasize, u16 peer_id);
- std::list<PlayerInfo> getPlayerInfo();
+ //std::list<PlayerInfo> getPlayerInfo();
// Environment must be locked when called
void setTimeOfDay(u32 time)
@@ -492,8 +492,8 @@ class Server : public con::PeerHandler, public MapEventReceiver,
// Creates or resets inventory
Inventory* createDetachedInventory(const std::string &name);
- // Envlock and conlock should be locked when using Lua
- lua_State *getLua(){ return m_lua; }
+ // Envlock and conlock should be locked when using scriptapi
+ ScriptApi *getScriptIface(){ return m_script; }
// Envlock should be locked when using the rollback manager
IRollbackManager *getRollbackManager(){ return m_rollback; }
@@ -541,6 +541,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
bool hudRemove(Player *player, u32 id);
bool hudChange(Player *player, u32 id, HudElementStat stat, void *value);
bool hudSetFlags(Player *player, u32 flags, u32 mask);
+ bool hudSetHotbarItemcount(Player *player, s32 hotbar_itemcount);
private:
@@ -585,6 +586,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
void SendHUDRemove(u16 peer_id, u32 id);
void SendHUDChange(u16 peer_id, u32 id, HudElementStat stat, void *value);
void SendHUDSetFlags(u16 peer_id, u32 flags, u32 mask);
+ void SendHUDSetParam(u16 peer_id, u16 param, const std::string &value);
/*
Send a node removal/addition event to all clients except ignore_id.
@@ -746,7 +748,7 @@ class Server : public con::PeerHandler, public MapEventReceiver,
// Scripting
// Envlock and conlock should be locked when using Lua
- lua_State *m_lua;
+ ScriptApi *m_script;
// Item definition manager
IWritableItemDefManager *m_itemdef;
diff --git a/src/settings.h b/src/settings.h
index 1b7e3cb095bbba716ba13988adea002103f7ceb9..e7b49b6d7798497cc3d25f8bda08a596abe4acf9 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -577,15 +577,15 @@ class Settings
return (isdigit(val[0])) ? stoi(val) : readFlagString(val, flagdesc);
}
- template <class T> T *getStruct(std::string name, std::string format)
+ bool getStruct(std::string name, std::string format, void *out, size_t olen)
{
- size_t len = sizeof(T);
+ size_t len = olen;
std::vector<std::string *> strs_alloced;
std::string *str;
std::string valstr = get(name);
char *s = &valstr[0];
- T *buf = new T;
- char *bufpos = (char *)buf;
+ char *buf = new char[len];
+ char *bufpos = buf;
char *f, *snext;
size_t pos;
@@ -608,7 +608,7 @@ class Settings
case 'i':
if (width == 16) {
bufpos += PADDING(bufpos, u16);
- if ((bufpos - (char *)buf) + sizeof(u16) <= len) {
+ if ((bufpos - buf) + sizeof(u16) <= len) {
if (is_unsigned)
*(u16 *)bufpos = (u16)strtoul(s, &s, 10);
else
@@ -617,7 +617,7 @@ class Settings
bufpos += sizeof(u16);
} else if (width == 32) {
bufpos += PADDING(bufpos, u32);
- if ((bufpos - (char *)buf) + sizeof(u32) <= len) {
+ if ((bufpos - buf) + sizeof(u32) <= len) {
if (is_unsigned)
*(u32 *)bufpos = (u32)strtoul(s, &s, 10);
else
@@ -626,7 +626,7 @@ class Settings
bufpos += sizeof(u32);
} else if (width == 64) {
bufpos += PADDING(bufpos, u64);
- if ((bufpos - (char *)buf) + sizeof(u64) <= len) {
+ if ((bufpos - buf) + sizeof(u64) <= len) {
if (is_unsigned)
*(u64 *)bufpos = (u64)strtoull(s, &s, 10);
else
@@ -642,7 +642,7 @@ class Settings
*snext++ = 0;
bufpos += PADDING(bufpos, bool);
- if ((bufpos - (char *)buf) + sizeof(bool) <= len)
+ if ((bufpos - buf) + sizeof(bool) <= len)
*(bool *)bufpos = is_yes(std::string(s));
bufpos += sizeof(bool);
@@ -650,7 +650,7 @@ class Settings
break;
case 'f':
bufpos += PADDING(bufpos, float);
- if ((bufpos - (char *)buf) + sizeof(float) <= len)
+ if ((bufpos - buf) + sizeof(float) <= len)
*(float *)bufpos = strtof(s, &s);
bufpos += sizeof(float);
@@ -674,7 +674,7 @@ class Settings
while ((pos = str->find("\\\"", pos)) != std::string::npos)
str->erase(pos, 1);
- if ((bufpos - (char *)buf) + sizeof(std::string *) <= len)
+ if ((bufpos - buf) + sizeof(std::string *) <= len)
*(std::string **)bufpos = str;
bufpos += sizeof(std::string *);
strs_alloced.push_back(str);
@@ -690,7 +690,7 @@ class Settings
if (width == 2) {
bufpos += PADDING(bufpos, v2f);
- if ((bufpos - (char *)buf) + sizeof(v2f) <= len) {
+ if ((bufpos - buf) + sizeof(v2f) <= len) {
v2f *v = (v2f *)bufpos;
v->X = strtof(s, &s);
s++;
@@ -700,7 +700,7 @@ class Settings
bufpos += sizeof(v2f);
} else if (width == 3) {
bufpos += PADDING(bufpos, v3f);
- if ((bufpos - (char *)buf) + sizeof(v3f) <= len) {
+ if ((bufpos - buf) + sizeof(v3f) <= len) {
v3f *v = (v3f *)bufpos;
v->X = strtof(s, &s);
s++;
@@ -720,20 +720,21 @@ class Settings
if (s && *s == ',')
s++;
- if ((size_t)(bufpos - (char *)buf) > len) //error, buffer too small
+ if ((size_t)(bufpos - buf) > len) //error, buffer too small
goto fail;
}
if (f && *f) { //error, mismatched number of fields and values
fail:
- for (unsigned int i = 0; i != strs_alloced.size(); i++)
+ for (size_t i = 0; i != strs_alloced.size(); i++)
delete strs_alloced[i];
- delete buf;
- //delete[] buf;
- buf = NULL;
+ delete[] buf;
+ return false;
}
- return buf;
+ memcpy(out, buf, olen);
+ delete[] buf;
+ return true;
}
bool setStruct(std::string name, std::string format, void *value)
diff --git a/src/subgame.cpp b/src/subgame.cpp
index cdb5466197554cab4f411f1901536a8822ad6c09..7fee3899d4ace353f7555735034f25390475c215 100644
--- a/src/subgame.cpp
+++ b/src/subgame.cpp
@@ -91,9 +91,9 @@ SubgameSpec findSubgame(const std::string &id)
// Find mod directories
std::set<std::string> mods_paths;
if(!user_game)
- mods_paths.insert(share + DIR_DELIM + "mods" + DIR_DELIM + id);
+ mods_paths.insert(share + DIR_DELIM + "mods");
if(user != share || user_game)
- mods_paths.insert(user + DIR_DELIM + "mods" + DIR_DELIM + id);
+ mods_paths.insert(user + DIR_DELIM + "mods");
std::string game_name = getGameName(game_path);
if(game_name == "")
game_name = id;
diff --git a/src/test.cpp b/src/test.cpp
index d1f53f8803ef8c6b6f3bae2eb73058c1bf292ef8..3a0316e172083f8529c368e498444c23f2fbca05 100644
--- a/src/test.cpp
+++ b/src/test.cpp
@@ -464,7 +464,7 @@ struct TestCompress: public TestBase
std::string str_decompressed = os_decompressed.str();
UTEST(str_decompressed.size() == data_in.size(), "Output size not"
" equal (output: %u, input: %u)",
- str_decompressed.size(), data_in.size());
+ (unsigned int)str_decompressed.size(), (unsigned int)data_in.size());
for(u32 i=0; i<size && i<str_decompressed.size(); i++){
UTEST(str_decompressed[i] == data_in[i],
"index out[%i]=%i differs from in[%i]=%i",
@@ -1772,6 +1772,10 @@ void run_tests()
TEST(TestConnection);
dout_con<<"=== END RUNNING UNIT TESTS FOR CONNECTION ==="<<std::endl;
}
+
+ delete idef;
+ delete ndef;
+
if(tests_failed == 0){
infostream<<"run_tests(): "<<tests_failed<<" / "<<tests_run<<" tests failed."<<std::endl;
infostream<<"run_tests() passed."<<std::endl;
@@ -1781,7 +1785,5 @@ void run_tests()
errorstream<<"run_tests() aborting."<<std::endl;
abort();
}
- delete idef;
- delete ndef;
}
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..9cb8a19b608b958eb376380219581962e4a4f47b
--- /dev/null
+++ b/src/util/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(UTIL_SRCS
+ ${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/numeric.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/pointedthing.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/serialize.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/timetaker.cpp
+ PARENT_SCOPE)
diff --git a/src/util/numeric.cpp b/src/util/numeric.cpp
index ed83df7d7f768be0f4635820d8d0985cc409f4bd..0e2772c3214d5826bd56ae275834f6c17d76aa55 100644
--- a/src/util/numeric.cpp
+++ b/src/util/numeric.cpp
@@ -159,40 +159,41 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
// Block position relative to camera
v3f blockpos_relative = blockpos - camera_pos;
- // Distance in camera direction (+=front, -=back)
- f32 dforward = blockpos_relative.dotProduct(camera_dir);
-
// Total distance
f32 d = blockpos_relative.getLength();
if(distance_ptr)
*distance_ptr = d;
- // If block is very close, it is always in sight
- if(d < 1.44*1.44*MAP_BLOCKSIZE*BS/2)
- return true;
-
// If block is far away, it's not in sight
if(d > range)
return false;
- // Maximum radius of a block
- f32 block_max_radius = 0.5*1.44*1.44*MAP_BLOCKSIZE*BS;
+ // Maximum radius of a block. The magic number is
+ // sqrt(3.0) / 2.0 in literal form.
+ f32 block_max_radius = 0.866025403784 * MAP_BLOCKSIZE * BS;
// If block is (nearly) touching the camera, don't
// bother validating further (that is, render it anyway)
if(d < block_max_radius)
return true;
-
+
+ // Adjust camera position, for purposes of computing the angle,
+ // such that a block that has any portion visible with the
+ // current camera position will have the center visible at the
+ // adjusted postion
+ f32 adjdist = block_max_radius / cos((M_PI - camera_fov) / 2);
+
+ // Block position relative to adjusted camera
+ v3f blockpos_adj = blockpos - (camera_pos - camera_dir * adjdist);
+
+ // Distance in camera direction (+=front, -=back)
+ f32 dforward = blockpos_adj.dotProduct(camera_dir);
+
// Cosine of the angle between the camera direction
// and the block direction (camera_dir is an unit vector)
- f32 cosangle = dforward / d;
+ f32 cosangle = dforward / blockpos_adj.getLength();
- // Compensate for the size of the block
- // (as the block has to be shown even if it's a bit off FOV)
- // This is an estimate, plus an arbitary factor
- cosangle += block_max_radius / d * 0.5;
-
// If block is not in the field of view, skip it
if(cosangle < cos(camera_fov / 2))
return false;
diff --git a/src/voxel.cpp b/src/voxel.cpp
index f859a1f0382cf6025a41c0b60dd48a7c83ad3eb2..58519ed5f2ec10406b45e4ed2598b54f7205457f 100644
--- a/src/voxel.cpp
+++ b/src/voxel.cpp
@@ -264,7 +264,7 @@ void VoxelManipulator::clearFlag(u8 flags)
// 0-1ms on moderate area
TimeTaker timer("clearFlag", &clearflag_time);
- v3s16 s = m_area.getExtent();
+ //v3s16 s = m_area.getExtent();
/*dstream<<"clearFlag clearing area of size "
<<""<<s.X<<"x"<<s.Y<<"x"<<s.Z<<""
diff --git a/textures/base/pack/menu_header.png b/textures/base/pack/menu_header.png
new file mode 100644
index 0000000000000000000000000000000000000000..c22192d0f8d8a7c2e0dfe0b624b31f5c5218a27e
Binary files /dev/null and b/textures/base/pack/menu_header.png differ
diff --git a/textures/base/pack/menubg.png b/textures/base/pack/menubg.png
deleted file mode 100644
index 7cb9c89a637584b4e53c82a7c6eb1ec7109befae..0000000000000000000000000000000000000000
Binary files a/textures/base/pack/menubg.png and /dev/null differ
diff --git a/textures/base/pack/menufooter.png b/textures/base/pack/menufooter.png
deleted file mode 100644
index fd431846eb4cfa923dcf938ec9c28fca216e9467..0000000000000000000000000000000000000000
Binary files a/textures/base/pack/menufooter.png and /dev/null differ
diff --git a/textures/base/pack/menuheader.png b/textures/base/pack/menuheader.png
deleted file mode 100644
index 66fd6def577f6c8862469c37f5382f91d184001d..0000000000000000000000000000000000000000
Binary files a/textures/base/pack/menuheader.png and /dev/null differ
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index 0c0d7cf214602792375e18454bbf35cd462d21e4..fc42db8a79c9e78b0abdb382d23d32a6193031d1 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -53,9 +53,6 @@ cd $builddir
wget http://github.com/minetest/minetest/zipball/master \
-c -O $packagedir/minetest.zip --tries=3 || (echo "Please download http://github.com/minetest/minetest/zipball/master manually and save it as $packagedir/minetest.zip"; read -s)
[ -e $packagedir/minetest.zip ] || (echo "minetest.zip not found"; exit 1)
-wget http://github.com/minetest/common/zipball/master \
- -c -O $packagedir/common.zip --tries=3 || (echo "Please download http://github.com/minetest/common/zipball/master manually and save it as $packagedir/common.zip"; read -s)
-[ -e $packagedir/common.zip ] || (echo "common.zip not found"; exit 1)
wget http://github.com/minetest/minetest_game/zipball/master \
-c -O $packagedir/minetest_game.zip --tries=3 || (echo "Please download http://github.com/minetest/minetest_game/zipball/master manually and save it as $packagedir/minetest_game.zip"; read -s)
[ -e $packagedir/minetest_game.zip ] || (echo "minetest_game.zip not found"; exit 1)
@@ -69,7 +66,6 @@ wget http://github.com/minetest/minetest_game/zipball/master \
minetestdirname=`unzip -l $packagedir/minetest.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'`
minetestdir=$builddir/$minetestdirname || exit 1
git_hash=`echo $minetestdirname | sed -e 's/minetest-minetest-//'`
-commondirname=`unzip -l $packagedir/common.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'`
minetest_gamedirname=`unzip -l $packagedir/minetest_game.zip | head -n 7 | tail -n 1 | sed -e 's/^[^m]*//' -e 's/\/.*$//'`
# Extract stuff
@@ -90,13 +86,6 @@ unzip -o $packagedir/minetest.zip || exit 1
rm -rf $builddir/minetest
ln -s $minetestdir $builddir/minetest
-# Extract common
-cd $minetestdir/games || exit 1
-rm -rf common || exit 1
-unzip -o $packagedir/common.zip || exit 1
-commondir=$minetestdir/games/$commondirname || exit 1
-mv $commondir $minetestdir/games/common || exit 1
-
# Extract minetest_game
cd $minetestdir/games || exit 1
rm -rf minetest_game || exit 1