From 6cc471e986c694298716c257528c653395bd757d Mon Sep 17 00:00:00 2001 From: Zefram <zefram@fysh.org> Date: Fri, 15 Aug 2014 13:25:46 +0200 Subject: [PATCH] Simplify music player interface --- technic/machines/other/frames.lua | 224 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 179 insertions(+), 45 deletions(-) diff --git a/technic/machines/other/frames.lua b/technic/machines/other/frames.lua index cfb0050..427e60b 100644 --- a/technic/machines/other/frames.lua +++ b/technic/machines/other/frames.lua @@ -3,6 +3,10 @@ frames = {} +local infinite_stacks = minetest.setting_getbool("creative_mode") and minetest.get_modpath("unified_inventory") == nil + +local frames_pos = {} + -- Helpers local function get_face(pos,ppos,pvect) @@ -77,14 +81,14 @@ end local function add_table(table,toadd) - local i=1 + local i = 1 while true do - o=table[i] - if o==toadd then return end - if o==nil then break end - i=i+1 + o = table[i] + if o == toadd then return end + if o == nil then break end + i = i+1 end - table[i]=toadd + table[i] = toadd end local function move_nodes_vect(poslist,vect,must_not_move,owner) @@ -98,50 +102,55 @@ end for _,pos in ipairs(poslist) do local npos=vector.add(pos,vect) - local name = minetest.env:get_node(npos).name - if (name~="air" and minetest.registered_nodes[name].liquidtype=="none") and not(pos_in_list(poslist,npos)) then + local name = minetest.get_node(npos).name + if ((name~="air" and minetest.registered_nodes[name].liquidtype=="none") or frames_pos[pos_to_string(npos)]) and not(pos_in_list(poslist,npos)) then return end --[[if pos.x==must_not_move.x and pos.y==must_not_move.y and pos.z==must_not_move.z then return end]] end - nodelist={} - for _,pos in ipairs(poslist) do - local node=minetest.env:get_node(pos) - local meta=minetest.env:get_meta(pos):to_table() - nodelist[#(nodelist)+1]={pos=pos,node=node,meta=meta} + local nodelist = {} + for _, pos in ipairs(poslist) do + local node = minetest.get_node(pos) + local meta = minetest.get_meta(pos):to_table() + nodelist[#(nodelist)+1] = {oldpos = pos, pos = vector.add(pos, vect), node = node, meta = meta} end - objects={} - for _,pos in ipairs(poslist) do - for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 1)) do - add_table(objects,object) + local objects = {} + for _, pos in ipairs(poslist) do + for _,object in ipairs(minetest.get_objects_inside_radius(pos, 1)) do + local entity = object:get_luaentity() + if not entity or not mesecon:is_mvps_unmov(entity.name) then + add_table(objects, object) + end end end - for _,obj in ipairs(objects) do - obj:setpos(vector.add(obj:getpos(),vect)) - le=obj:get_luaentity() - if le and le.name == "pipeworks:tubed_item" then - le.start_pos=vector.add(le.start_pos,vect) - end + for _, obj in ipairs(objects) do + obj:setpos(vector.add(obj:getpos(), vect)) end for _,n in ipairs(nodelist) do - local npos=vector.add(n.pos,vect) - minetest.env:set_node(npos,n.node) - local meta=minetest.env:get_meta(npos) + local npos = n.pos + minetest.set_node(npos, n.node) + local meta = minetest.get_meta(npos) meta:from_table(n.meta) for __,pos in ipairs(poslist) do - if npos.x==pos.x and npos.y==pos.y and npos.z==pos.z then + if npos.x == pos.x and npos.y == pos.y and npos.z == pos.z then table.remove(poslist, __) break end end end - for __,pos in ipairs(poslist) do - minetest.env:remove_node(pos) + for __, pos in ipairs(poslist) do + minetest.remove_node(pos) + end + for _, callback in ipairs(mesecon.on_mvps_move) do + callback(nodelist) end end +local function is_supported_node(name) + return ((string.find(name, "tube") ~= nil) and (string.find(name, "pipeworks") ~= nil)) +end -- Frames @@ -213,8 +222,8 @@ paramtype = "light", frame=1, drop="technic:frame_111111", - frame_connect_all=function(pos) - local nodename=minetest.env:get_node(pos).name + sunlight_propagates = true, + frame_connect_all=function(nodename) l2={} l1={{x=-1,y=0,z=0},{x=1,y=0,z=0},{x=0,y=-1,z=0},{x=0,y=1,z=0},{x=0,y=0,z=-1},{x=0,y=0,z=1}} for i,dir in ipairs(l1) do @@ -237,17 +246,82 @@ nodename=string.sub(nodename,1,-2)..newstate end node.name=nodename - minetest.env:set_node(pos,node) + minetest.set_node(pos,node) end, on_place = function(itemstack, placer, pointed_thing) local pos = pointed_thing.above + if minetest.is_protected(pos, placer:get_player_name()) then + minetest.log("action", placer:get_player_name() + .. " tried to place " .. itemstack:get_name() + .. " at protected position " + .. minetest.pos_to_string(pos)) + minetest.record_protection_violation(pos, placer:get_player_name()) + return itemstack + end if pos == nil then return end local node = minetest.get_node(pos) if node.name ~= "air" then - obj = minetest.add_entity(pos, "technic:frame_entity") - obj:get_luaentity():set_node({name=itemstack:get_name()}) + if is_supported_node(node.name) then + obj = minetest.add_entity(pos, "technic:frame_entity") + obj:get_luaentity():set_node({name=itemstack:get_name()}) + end else minetest.set_node(pos, {name = itemstack:get_name()}) + end + if not infinite_stacks then + itemstack:take_item() + end + return itemstack + end, + on_rightclick = function(pos, node, placer, itemstack, pointed_thing) + if is_supported_node(itemstack:get_name()) then + if minetest.is_protected(pos, placer:get_player_name()) then + minetest.log("action", placer:get_player_name() + .. " tried to place " .. itemstack:get_name() + .. " at protected position " + .. minetest.pos_to_string(pos)) + minetest.record_protection_violation(pos, placer:get_player_name()) + return itemstack + end + + minetest.set_node(pos, {name = itemstack:get_name()}) + + local take_item = true + local def = minetest.registered_items[itemstack:get_name()] + -- Run callback + if def.after_place_node then + -- Copy place_to because callback can modify it + local pos_copy = {x=pos.x, y=pos.y, z=pos.z} + if def.after_place_node(pos_copy, placer, itemstack) then + take_item = false + end + end + + -- Run script hook + local _, callback + for _, callback in ipairs(minetest.registered_on_placenodes) do + -- Copy pos and node because callback can modify them + local pos_copy = {x=pos.x, y=pos.y, z=pos.z} + local newnode_copy = {name=def.name, param1=0, param2=0} + local oldnode_copy = {name="air", param1=0, param2=0} + if callback(pos_copy, newnode_copy, placer, oldnode_copy, itemstack) then + take_item = false + end + end + + if take_item then + itemstack:take_item() + end + + obj = minetest.add_entity(pos, "technic:frame_entity") + obj:get_luaentity():set_node({name=node.name}) + + return itemstack + else + --local pointed_thing = {type = "node", under = pos} + if pointed_thing then + minetest.item_place_node(itemstack, placer, pointed_thing) + end end end, }) @@ -262,7 +336,6 @@ minetest.register_entity("technic:frame_entity", { initial_properties = { physical = true, - collide_with_objects = false, collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5}, visual = "wielditem", textures = {}, @@ -273,6 +346,9 @@ set_node = function(self, node) self.node = node + local pos = self.object:getpos() + pos = {x = math.floor(pos.x+0.5), y = math.floor(pos.y+0.5), z = math.floor(pos.z+0.5)} + frames_pos[pos_to_string(pos)] = node.name local stack = ItemStack(node.name) local itemtable = stack:to_table() local itemname = nil @@ -303,6 +379,9 @@ dig = function(self) minetest.handle_node_drops(self.object:getpos(), {ItemStack("technic:frame_111111")}, self.last_puncher) + local pos = self.object:getpos() + pos = {x = math.floor(pos.x+0.5), y = math.floor(pos.y+0.5), z = math.floor(pos.z+0.5)} + frames_pos[pos_to_string(pos)] = nil self.object:remove() end, @@ -386,17 +465,58 @@ end, }) +mesecon:register_mvps_unmov("technic:frame_entity") +mesecon:register_mvps_unmov("technic:damage_entity") +mesecon:register_on_mvps_move(function(moved_nodes) + local to_move = {} + for _, n in ipairs(moved_nodes) do + if frames_pos[pos_to_string(n.oldpos)] ~= nil then + to_move[#to_move+1] = {pos = n.pos, oldpos = n.oldpos, name = frames_pos[pos_to_string(n.oldpos)]} + frames_pos[pos_to_string(n.oldpos)] = nil + end + end + if #to_move > 0 then + for _, t in ipairs(to_move) do + frames_pos[pos_to_string(t.pos)] = t.name + local objects = minetest.get_objects_inside_radius(t.oldpos, 0.1) + for _, obj in ipairs(objects) do + local entity = obj:get_luaentity() + if entity and (entity.name == "technic:frame_entity" or entity.name == "technic:damage_entity") then + obj:setpos(t.pos) + end + end + end + end +end) + +minetest.register_on_dignode(function(pos, node) + if frames_pos[pos_to_string(pos)] ~= nil then + minetest.set_node(pos, {name = frames_pos[pos_to_string(pos)]}) + frames_pos[pos_to_string(pos)] = nil + local objects = minetest.get_objects_inside_radius(pos, 0.1) + for _, obj in ipairs(objects) do + local entity = obj:get_luaentity() + if entity and (entity.name == "technic:frame_entity" or entity.name == "technic:damage_entity") then + obj:remove() + end + end + end +end) + -- Frame motor local function connected(pos,c,adj) for _,vect in ipairs(adj) do local pos1=vector.add(pos,vect) - local nodename=minetest.env:get_node(pos1).name + local nodename=minetest.get_node(pos1).name + if frames_pos[pos_to_string(pos1)] then + nodename = frames_pos[pos_to_string(pos1)] + end if not(pos_in_list(c,pos1)) and nodename~="air" and (minetest.registered_nodes[nodename].frames_can_connect==nil or minetest.registered_nodes[nodename].frames_can_connect(pos1,vect)) then c[#(c)+1]=pos1 if minetest.registered_nodes[nodename].frame==1 then - local adj=minetest.registered_nodes[nodename].frame_connect_all(pos1) + local adj=minetest.registered_nodes[nodename].frame_connect_all(nodename) connected(pos1,c,adj) end end @@ -405,8 +525,11 @@ local function get_connected_nodes(pos) c={pos} - local nodename=minetest.env:get_node(pos).name - connected(pos,c,minetest.registered_nodes[nodename].frame_connect_all(pos)) + local nodename=minetest.get_node(pos).name + if frames_pos[pos_to_string(pos)] then + nodename = frames_pos[pos_to_string(pos)] + end + connected(pos,c,minetest.registered_nodes[nodename].frame_connect_all(nodename)) return c end @@ -415,12 +538,19 @@ local nnodepos = vector.add(pos, dirs[math.floor(node.param2/4)+1]) local dir = minetest.facedir_to_dir(node.param2) local nnode=minetest.get_node(nnodepos) + if frames_pos[pos_to_string(nnodepos)] then + nnode.name = frames_pos[pos_to_string(nnodepos)] + end local meta = minetest.get_meta(pos) + if meta:get_int("last_moved") == minetest.get_gametime() then + return + end local owner = meta:get_string("owner") if minetest.registered_nodes[nnode.name].frame==1 then local connected_nodes=get_connected_nodes(nnodepos) move_nodes_vect(connected_nodes,dir,pos,owner) end + minetest.get_meta(vector.add(pos, dir)):set_int("last_moved", minetest.get_gametime()) end minetest.register_node("technic:frame_motor",{ @@ -672,11 +802,11 @@ }) minetest.register_tool("technic:template_tool",{ - description = S("Template tool"), + description = S("Template Tool"), inventory_image = "technic_template_tool.png", on_use = function(itemstack, puncher, pointed_thing) local pos = pointed_thing.under - if pos == nil or (minetest.is_protected and minetest.is_protected(pos, placer:get_player_name())) then + if pos == nil or (minetest.is_protected and minetest.is_protected(pos, puncher:get_player_name())) then return nil end local node = minetest.get_node(pos) @@ -703,7 +833,7 @@ local c = {} for _,vect in ipairs(adj) do local pos1=vector.add(pos,vect) - local nodename=minetest.env:get_node(pos1).name + local nodename=minetest.get_node(pos1).name if not(pos_in_list(c,pos1)) and nodename~="air" then c[#(c)+1]=pos1 end @@ -717,15 +847,19 @@ local dir = minetest.facedir_to_dir(node.param2) local nnode=minetest.get_node(nnodepos) local meta = minetest.get_meta(pos) + if meta:get_int("last_moved") == minetest.get_gametime() then + return + end local owner = meta:get_string("owner") if nnode.name == "technic:template" then local connected_nodes=get_template_nodes(nnodepos) move_nodes_vect(connected_nodes,dir,pos,owner) end + minetest.get_meta(vector.add(pos, dir)):set_int("last_moved", minetest.get_gametime()) end minetest.register_node("technic:template_motor",{ - description = S("Template motor"), + description = S("Template Motor"), tiles = {"pipeworks_filter_top.png^[transformR90", "technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png", "technic_lv_cable.png"}, groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,mesecon=2}, @@ -751,7 +885,7 @@ output = 'technic:frame_motor', recipe = { {'', 'technic:frame_111111', ''}, - {'group:mesecons_conductor_craftable', 'technic:motor', 'group:mesecons_conductor_craftable'}, + {'group:mesecon_conductor_craftable', 'technic:motor', 'group:mesecon_conductor_craftable'}, {'', 'technic:frame_111111', ''}, } }) @@ -779,7 +913,7 @@ output = 'technic:template_motor', recipe = { {'', 'technic:template', ''}, - {'group:mesecons_conductor_craftable', 'technic:motor', 'group:mesecons_conductor_craftable'}, + {'group:mesecon_conductor_craftable', 'technic:motor', 'group:mesecon_conductor_craftable'}, {'', 'technic:template', ''}, } }) -- Gitblit v1.8.0