diff --git a/utils.lua b/utils.lua index b3b0c62..ff76053 100644 --- a/utils.lua +++ b/utils.lua @@ -19,30 +19,39 @@ local S=minetest.get_translator("industrialtest") local powerStorageInspectorContext={} local function inspectNode(pos,playerName) local meta=minetest.get_meta(pos) + local sides={"X-","X+","Y-","Y+","Z-","Z+"} local powerCapacity=meta:get_int("industrialtest.powerCapacity") local powerFlow=meta:get_int("industrialtest.powerFlow") local powerAmount=meta:get_int("industrialtest.powerAmount") - local powerIOConfig=meta:get_string("industrialtest.ioConfig") + local powerIOConfig + if industrialtest.api.isExtendedIoConfig(meta) then + powerIOConfig="\n" + local ioConfig=minetest.deserialize(meta:get_string("industrialtest.ioConfig")) + for i,config in ipairs(ioConfig) do + powerIOConfig=powerIOConfig..sides[i].." "..config.mode.." "..config.flow.."\n" + end + else + powerIOConfig=meta:get_string("industrialtest.ioConfig") + end local formspec={ "formspec_version[4]", - "size[8,8]", + "size[15,15]", "label[0.5,0.5;"..S("Power Storage Inspector").."]", "label[0.5,1.5;"..S("Power Capacity: @1",powerCapacity).."]", "label[0.5,1.9;"..S("Power Flow: @1",powerFlow).."]", "label[0.5,2.3;"..S("Power Amount: @1",powerAmount).."]", "label[0.5,2.7;"..S("Power IO Config: @1",powerIOConfig).."]", - "field[0.5,3.7;2,0.5;powerCapacity;"..S("Power Capacity")..";"..powerCapacity.."]", - "field[0.5,4.5;2,0.5;powerFlow;"..S("Power Flow")..";"..powerFlow.."]", - "field[0.5,5.4;2,0.5;powerAmount;"..S("Power Amount")..";"..powerAmount.."]", - "field[0.5,6.2;2,0.5;powerIOConfig;"..S("Power IO Config")..";"..powerIOConfig.."]", - "button[0.5,6.8;2,0.5;update;"..S("Update").."]", + "field[0.5,7.0;2,0.5;powerCapacity;"..S("Power Capacity")..";"..powerCapacity.."]", + "field[0.5,8.0;2,0.5;powerFlow;"..S("Power Flow")..";"..powerFlow.."]", + "field[0.5,9.0;2,0.5;powerAmount;"..S("Power Amount")..";"..powerAmount.."]", + "field[0.5,10.0;2,0.5;powerIOConfig;"..S("Power IO Config")..";"..meta:get_string("industrialtest.ioConfig").."]", + "button[0.5,11.0;2,0.5;update;"..S("Update").."]", "label[4.2,2.25;"..S("Connections:").."]" } local connections=industrialtest.api.getConnections(pos) - local sides={"X-","X+","Y-","Y+","Z-","Z+"} local sideString="" - for _,value in ipairs(connections) do - sideString=sideString.."("..value.x..", "..value.y..", "..value.z..")\n" + for i,value in ipairs(connections) do + sideString=sideString..sides[i].." ("..value.x..", "..value.y..", "..value.z..")\n" end table.insert(formspec,"label[4.2,2.65;"..sideString.."]") powerStorageInspectorContext[playerName]=pos @@ -71,7 +80,11 @@ minetest.register_on_player_receive_fields(function(player,formname,fields) meta:set_int("industrialtest.powerCapacity",tonumber(fields.powerCapacity)) meta:set_int("industrialtest.powerFlow",tonumber(fields.powerFlow)) meta:set_int("industrialtest.powerAmount",tonumber(fields.powerAmount)) - meta:set_string("industrialtest.powerIOConfig",fields.powerIOConfig) + if industrialtest.api.isExtendedIoConfig(meta) then + meta:set_string("industrialtest.powerIOConfig",minetest.serialize(fields.powerIOConfig)) + else + meta:set_string("industrialtest.powerIOConfig",fields.powerIOConfig) + end local def=minetest.registered_nodes[minetest.get_node(context).name] if def and def._industrialtest_updateFormspec then def._industrialtest_updateFormspec(context)