Skip to content

Commit ab43377

Browse files
sapierkahrl
sapier
authored and
kahrl
committedMay 24, 2013
Move scriptapi to separate folder (by sapier)
On the lua side, notably minetest.env:<function>(<args>) should now be replaced by minetest.<function>(<args>). The old way is and will stay supported for a long time. Also: Update and clean up lua_api.txt (by celeron55) Move EnvRef to lua and remove add_rat and add_firefly (by kahrl) Add separate src/util/CMakeLists.txt, other minor fixes (by kahrl)
1 parent 865f380 commit ab43377

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+6400
-5583
lines changed
 

‎.gitignore

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ src/CMakeFiles/*
3232
src/Makefile
3333
src/cmake_config.h
3434
src/cmake_install.cmake
35+
src/script/CMakeFiles/*
36+
src/script/common/CMakeFiles/*
37+
src/script/cpp_api/CMakeFiles/*
38+
src/script/lua_api/CMakeFiles/*
39+
src/util/CMakeFiles/*
3540
src/jthread/CMakeFiles/*
3641
src/jthread/Makefile
3742
src/jthread/cmake_config.h

‎builtin/chatcommands.lua

+16-16
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ minetest.register_chatcommand("teleport", {
261261
}
262262
for _, d in ipairs(tries) do
263263
local p = {x = pos.x+d.x, y = pos.y+d.y, z = pos.z+d.z}
264-
local n = minetest.env:get_node(p)
264+
local n = minetest.get_node(p)
265265
if not minetest.registered_nodes[n.name].walkable then
266266
return p, true
267267
end
@@ -272,7 +272,7 @@ minetest.register_chatcommand("teleport", {
272272
local teleportee = nil
273273
local p = {}
274274
p.x, p.y, p.z = string.match(param, "^([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
275-
teleportee = minetest.env:get_player_by_name(name)
275+
teleportee = minetest.get_player_by_name(name)
276276
if teleportee and p.x and p.y and p.z then
277277
minetest.chat_send_player(name, "Teleporting to ("..p.x..", "..p.y..", "..p.z..")")
278278
teleportee:setpos(p)
@@ -283,9 +283,9 @@ minetest.register_chatcommand("teleport", {
283283
local p = nil
284284
local target_name = nil
285285
target_name = string.match(param, "^([^ ]+)$")
286-
teleportee = minetest.env:get_player_by_name(name)
286+
teleportee = minetest.get_player_by_name(name)
287287
if target_name then
288-
local target = minetest.env:get_player_by_name(target_name)
288+
local target = minetest.get_player_by_name(target_name)
289289
if target then
290290
p = target:getpos()
291291
end
@@ -303,7 +303,7 @@ minetest.register_chatcommand("teleport", {
303303
local teleportee_name = nil
304304
teleportee_name, p.x, p.y, p.z = string.match(param, "^([^ ]+) +([%d.-]+)[, ] *([%d.-]+)[, ] *([%d.-]+)$")
305305
if teleportee_name then
306-
teleportee = minetest.env:get_player_by_name(teleportee_name)
306+
teleportee = minetest.get_player_by_name(teleportee_name)
307307
end
308308
if teleportee and p.x and p.y and p.z then
309309
minetest.chat_send_player(name, "Teleporting "..teleportee_name.." to ("..p.x..", "..p.y..", "..p.z..")")
@@ -317,10 +317,10 @@ minetest.register_chatcommand("teleport", {
317317
local target_name = nil
318318
teleportee_name, target_name = string.match(param, "^([^ ]+) +([^ ]+)$")
319319
if teleportee_name then
320-
teleportee = minetest.env:get_player_by_name(teleportee_name)
320+
teleportee = minetest.get_player_by_name(teleportee_name)
321321
end
322322
if target_name then
323-
local target = minetest.env:get_player_by_name(target_name)
323+
local target = minetest.get_player_by_name(target_name)
324324
if target then
325325
p = target:getpos()
326326
end
@@ -402,7 +402,7 @@ local function handle_give_command(cmd, giver, receiver, stackstring)
402402
minetest.chat_send_player(giver, 'error: cannot give an unknown item')
403403
return
404404
end
405-
local receiverref = minetest.env:get_player_by_name(receiver)
405+
local receiverref = minetest.get_player_by_name(receiver)
406406
if receiverref == nil then
407407
minetest.chat_send_player(giver, receiver..' is not a known player')
408408
return
@@ -466,14 +466,14 @@ minetest.register_chatcommand("spawnentity", {
466466
return
467467
end
468468
print('/spawnentity invoked, entityname="'..entityname..'"')
469-
local player = minetest.env:get_player_by_name(name)
469+
local player = minetest.get_player_by_name(name)
470470
if player == nil then
471471
print("Unable to spawn entity, player is nil")
472472
return true -- Handled chat message
473473
end
474474
local p = player:getpos()
475475
p.y = p.y + 1
476-
minetest.env:add_entity(p, entityname)
476+
minetest.add_entity(p, entityname)
477477
minetest.chat_send_player(name, '"'..entityname
478478
..'" spawned.');
479479
end,
@@ -483,7 +483,7 @@ minetest.register_chatcommand("pulverize", {
483483
description = "delete item in hand",
484484
privs = {},
485485
func = function(name, param)
486-
local player = minetest.env:get_player_by_name(name)
486+
local player = minetest.get_player_by_name(name)
487487
if player == nil then
488488
print("Unable to pulverize, player is nil")
489489
return true -- Handled chat message
@@ -533,7 +533,7 @@ minetest.register_chatcommand("rollback_check", {
533533
if act_p.x ~= pos.x or act_p.y ~= pos.y or act_p.z ~= pos.z then
534534
nodedesc = minetest.pos_to_string(act_p)
535535
end
536-
local nodename = minetest.env:get_node(act_p).name
536+
local nodename = minetest.get_node(act_p).name
537537
minetest.chat_send_player(name, "Last actor on "..nodedesc..
538538
" was "..actor..", "..dump(act_seconds)..
539539
"s ago (node is now "..nodename..")")
@@ -598,7 +598,7 @@ minetest.register_chatcommand("time", {
598598
if newtime == nil then
599599
minetest.chat_send_player(name, "Invalid time")
600600
else
601-
minetest.env:set_timeofday((newtime % 24000) / 24000)
601+
minetest.set_timeofday((newtime % 24000) / 24000)
602602
minetest.chat_send_player(name, "Time of day changed.")
603603
minetest.log("action", name .. " sets time " .. newtime)
604604
end
@@ -625,7 +625,7 @@ minetest.register_chatcommand("ban", {
625625
minetest.chat_send_player(name, "Ban list: " .. minetest.get_ban_list())
626626
return
627627
end
628-
if not minetest.env:get_player_by_name(param) then
628+
if not minetest.get_player_by_name(param) then
629629
minetest.chat_send_player(name, "No such player")
630630
return
631631
end
@@ -660,7 +660,7 @@ minetest.register_chatcommand("clearobjects", {
660660
func = function(name, param)
661661
minetest.log("action", name .. " clears all objects")
662662
minetest.chat_send_all("Clearing all objects. This may take long. You may experience a timeout. (by " .. name .. ")")
663-
minetest.env:clear_objects()
663+
minetest.clear_objects()
664664
minetest.log("action", "object clearing done")
665665
minetest.chat_send_all("*** Cleared all objects.")
666666
end,
@@ -673,7 +673,7 @@ minetest.register_chatcommand("msg", {
673673
func = function(name, param)
674674
local found, _, sendto, message = param:find("^([^%s]+)%s(.+)$")
675675
if found then
676-
if minetest.env:get_player_by_name(sendto) then
676+
if minetest.get_player_by_name(sendto) then
677677
minetest.log("action", "PM from "..name.." to "..sendto..": "..message)
678678
minetest.chat_send_player(sendto, "PM from "..name..": "..message, false)
679679
minetest.chat_send_player(name, "Message sent")

0 commit comments

Comments
 (0)