Allow to move the TA4 terminal with the assembly tool (#165)

This commit is contained in:
Joachim Stolberg 2024-04-20 15:44:13 +02:00
parent db28d18137
commit a181f9524f
5 changed files with 132 additions and 5 deletions

View File

@ -153,6 +153,18 @@ function techage.get_nvm(pos)
return block[key2] return block[key2]
end end
-- Returns true/false
function techage.has_nvm(pos)
local key1, key2 = get_keys(pos)
if not NvmStore[key1] then
NvmStore[key1] = backend.get_mapblock_data(key1)
push(key1)
end
return NvmStore[key1][key2] ~= nil
end
function techage.peek_nvm(pos) function techage.peek_nvm(pos)
local key1, key2 = get_keys(pos) local key1, key2 = get_keys(pos)
local block = NvmStore[key1] or {} local block = NvmStore[key1] or {}

88
basis/pack_lib.lua Normal file
View File

@ -0,0 +1,88 @@
--[[
TechAge
=======
Copyright (C) 2019-2024 Joachim Stolberg
AGPL v3
See LICENSE.txt for more information
Packing functions
]]--
-- for lazy programmers
local P2S = function(pos) if pos then return minetest.pos_to_string(pos) end end
local M = minetest.get_meta
-- string/usercode conversion
local function usercode_to_string(tbl)
if tbl and tbl.inventory then
for list_name,list in pairs(tbl.inventory) do
for i,item in ipairs(list) do
tbl.inventory[list_name][i] = item:to_string()
end
end
end
end
local function string_to_usercode(tbl)
if tbl and tbl.inventory then
for list_name,list in pairs(tbl.inventory) do
for i,item in ipairs(list) do
tbl.inventory[list_name][i] = ItemStack(item)
end
end
end
end
-- pack/unpack node nvm data
local function pack_nvm(pos)
if techage.has_nvm(pos) then
local s = minetest.serialize(techage.get_nvm(pos))
techage.del_mem(pos)
return s
end
end
local function unpack_nvm(pos, s)
if s and s ~= "" then
local tbl = minetest.deserialize(s)
local nvm = techage.get_nvm(pos)
for k,v in pairs(tbl) do
nvm.k = v
end
end
end
-- pack/unpack node metedata
local function pack_meta(pos)
local tbl = M(pos):to_table() or {}
usercode_to_string(tbl)
return minetest.serialize(tbl)
end
local function unpack_meta(pos, s)
if s and s ~= "" then
local tbl = minetest.deserialize(s) or {}
string_to_usercode(tbl)
M(pos):from_table(tbl)
end
end
-------------------------------------------------------------------------------
-- preserve/restore API functions
-------------------------------------------------------------------------------
function techage.preserve_nodedata(pos)
local smeta = pack_meta(pos)
local snvm = pack_nvm(pos)
return minetest.serialize({smeta = smeta, snvm = snvm})
end
function techage.restore_nodedata(pos, s)
local tbl = minetest.deserialize(s) or {}
unpack_nvm(pos, tbl.snvm)
unpack_meta(pos, tbl.smeta)
end

View File

@ -106,6 +106,7 @@ dofile(MP.."/basis/shared_inv.lua")
dofile(MP.."/basis/shared_tank.lua") dofile(MP.."/basis/shared_tank.lua")
dofile(MP.."/basis/teleport.lua") dofile(MP.."/basis/teleport.lua")
dofile(MP.."/basis/fly_lib.lua") dofile(MP.."/basis/fly_lib.lua")
dofile(MP.."/basis/pack_lib.lua")
-- Main doc -- Main doc
dofile(MP.."/doc/guide.lua") dofile(MP.."/doc/guide.lua")

View File

@ -3,7 +3,7 @@
Terminal Terminal
======== ========
Copyright (C) 2018-2021 Joachim Stolberg Copyright (C) 2018-2024 Joachim Stolberg
AGPL v3 AGPL v3
See LICENSE.txt for more information See LICENSE.txt for more information
@ -334,6 +334,9 @@ local function register_terminal(name, description, tiles, node_box, selection_b
techage.remove_node(pos, oldnode, oldmetadata) techage.remove_node(pos, oldnode, oldmetadata)
end, end,
preserve_nodedata = techage.preserve_nodedata,
restore_nodedata = techage.restore_nodedata,
paramtype = "light", paramtype = "light",
use_texture_alpha = techage.CLIP, use_texture_alpha = techage.CLIP,
sunlight_propagates = true, sunlight_propagates = true,

View File

@ -77,7 +77,22 @@ local function remove_node(pos, digger)
return return
end end
if number ~= "" and ndef and ndef.after_dig_node then if ndef and ndef.preserve_nodedata then
local s = ndef.preserve_nodedata(pos, node)
imeta:set_string("node_data", s)
minetest.remove_node(pos)
if ndef.after_dig_node then
ndef.after_dig_node(pos, node, oldmetadata, digger)
end
if number ~= "" then
techage.post_remove_node(pos)
imeta:set_string("node_number", number)
imeta:set_string("description", ndef.description .. " : " .. number)
else
imeta:set_string("description", ndef.description .. " (preserved)")
end
return item
elseif number ~= "" and ndef and ndef.after_dig_node then
minetest.remove_node(pos) minetest.remove_node(pos)
ndef.after_dig_node(pos, node, oldmetadata, digger) ndef.after_dig_node(pos, node, oldmetadata, digger)
techage.post_remove_node(pos) techage.post_remove_node(pos)
@ -94,7 +109,15 @@ local function place_node(pos, item, placer, pointed_thing)
local param2 = minetest.dir_to_facedir(placer:get_look_dir()) local param2 = minetest.dir_to_facedir(placer:get_look_dir())
local ndef = minetest.registered_nodes[name] local ndef = minetest.registered_nodes[name]
if number ~= "" and ndef and ndef.after_place_node then if ndef and ndef.restore_nodedata then
if number ~= "" then
techage.pre_add_node(pos, number)
end
minetest.add_node(pos, {name = name, param2 = param2})
local s = imeta:get_string("node_data")
ndef.restore_nodedata(pos, s)
return true
elseif number ~= "" and ndef and ndef.after_place_node then
techage.pre_add_node(pos, number) techage.pre_add_node(pos, number)
minetest.add_node(pos, {name = name, param2 = param2}) minetest.add_node(pos, {name = name, param2 = param2})
ndef.after_place_node(pos, placer, item, pointed_thing) ndef.after_place_node(pos, placer, item, pointed_thing)