Add in dynamic redstone queue sleep

[Crafter.git] / mods / redstone / button.lua

diff --git a/mods/redstone/button.lua b/mods/redstone/button.lua
index 7e40b94825111667898c1cdd97c8cb4a6944657c..42d50e65b8e7f2a3da3f221de856e3976363f372 100644 (file)
--- a/mods/redstone/button.lua
+++ b/mods/redstone/button.lua
@@ -1,32 +1,28 @@
---this removes power from node that the switch is powering
-local function on_button_destroy(pos)
-       local param2 = minetest.get_node(pos).param2
-       local self = minetest.get_node(pos)
-       local dir = minetest.facedir_to_dir(self.param2)
-       
-       local pos = vector.add(dir,pos)
-       local node = minetest.get_node(pos)
-       local name = node.name
-       
-       local def = minetest.registered_nodes[name]
-       if def.drawtype == "normal" and string.match(name, "redstone:") then
-               name = "main:"..string.gsub(name, "redstone:", "")
-               minetest.set_node(pos, {name=name})
-               redstone.collect_info(pos)
-       end
-end
-
+local
+minetest,table,vector
+=
+minetest,table,vector
+local excluded_nodes = {
+       ["main:ironblock"]=true,
+       ["main:ironblock_on"]=true,
+}
+local excluded_mods = {redstone=true,door=true}
+local registered_nodes
+minetest.register_on_mods_loaded(function()
+       registered_nodes  = minetest.registered_nodes
+end)
 
 minetest.register_node("redstone:button_off", {
-    description = "Crafting Table",
+    description = "Button",
     tiles = {"stone.png"},
-    groups = {stone = 1, hard = 1, pickaxe = 1, hand = 4,attached_node = 1},
+    groups = {stone = 1, hard = 1, pickaxe = 1, hand = 4,attached_node = 1,dig_immediate=1},
     sounds = main.stoneSound(),
     paramtype = "light",
        paramtype2 = "wallmounted",
        sunlight_propagates = true,
        walkable = false,
        drawtype= "nodebox",
+       node_placement_prediction = "",
        drop="redstone:button_off",
        node_box = {
                type = "fixed",
@@ -35,29 +31,49 @@ minetest.register_node("redstone:button_off", {
                                {-0.25, -0.5,  -0.15, 0.25,  -0.3, 0.15},
                        },
                },
+       on_construct = function(pos)
+               local param2 = minetest.get_node(pos).param2
+               local dir = minetest.wallmounted_to_dir(param2)
+               local node = minetest.get_node(vector.add(pos,dir))
+               local def = registered_nodes[node.name]
+               local remove = (excluded_mods[def.mod_origin] == true or excluded_nodes[node.name] == true)
+               if remove then
+                       minetest.swap_node(pos,{name="air"})
+                       redstone.inject(pos,nil)
+                       minetest.throw_item(pos, "redstone:button_off")
+               end
+       end,
     on_rightclick = function(pos, node, clicker, itemstack, pointed_thing)
+               minetest.swap_node(pos, {name="redstone:button_on",param2=node.param2})
+
                minetest.sound_play("lever", {pos=pos})
-               minetest.set_node(pos, {name="redstone:button_on",param2=node.param2})
-               local dir = minetest.facedir_to_dir(node.param2)
-               local c_pos = table.copy(pos)
-               local pos = vector.add(dir,pos)
-               local name = minetest.get_node(pos).name
-               local def = minetest.registered_nodes[name]
-               
-               if def.drawtype == "normal" and string.match(name, "main:") then
-                       name = "redstone:"..string.gsub(name, "main:", "")
-                       minetest.set_node(pos,{name=name})
-                       redstone.collect_info(pos)
-                       local timer = minetest.get_node_timer(c_pos)
-                       timer:start(1)
-               end
+
+               local timer = minetest.get_node_timer(pos)
+               timer:start(1.25)
+
+               local dir = minetest.wallmounted_to_dir(node.param2)
+
+               redstone.inject(pos,{torch=16})
+               local pos2 = vector.add(dir,pos)
+               redstone.inject(pos2,{torch=16})
+
+               redstone.update(pos)
+               redstone.update(pos2)
+       end,
+       after_destruct = function(pos, oldnode)
+               redstone.inject(pos,nil)
+               local dir = minetest.wallmounted_to_dir(oldnode.param2)
+               local pos2 = vector.add(dir,pos)
+               redstone.inject(pos2,nil)
+
+               redstone.update(pos)
+               redstone.update(pos2)
        end,
-       on_destruct = on_button_destroy,
 })
 minetest.register_node("redstone:button_on", {
-    description = "Crafting Table",
+    description = "Button",
     tiles = {"stone.png"},
-    groups = {stone = 1, hard = 1, pickaxe = 1, hand = 4,attached_node = 1},
+    groups = {stone = 1, hard = 1, pickaxe = 1, hand = 4,attached_node = 1,dig_immediate=1},
     sounds = main.stoneSound(),
     paramtype = "light",
        paramtype2 = "wallmounted",
@@ -74,9 +90,46 @@ minetest.register_node("redstone:button_on", {
                },
     on_timer = function(pos, elapsed)
                minetest.sound_play("lever", {pos=pos,pitch=0.8})
+
                local node = minetest.get_node(pos)
-               minetest.set_node(pos, {name="redstone:button_off",param2=node.param2})
-               on_button_destroy(pos)
+               minetest.swap_node(pos, {name="redstone:button_off",param2=node.param2})
+
+               redstone.inject(pos,nil)
+               local param2 = minetest.get_node(pos).param2
+               local dir = minetest.wallmounted_to_dir(param2)
+               local pos2 = vector.add(dir,pos)
+               redstone.inject(pos2,nil)
+
+               redstone.update(pos)
+               redstone.update(pos2)
+               
+       end,
+       after_destruct = function(pos, oldnode)
+               redstone.inject(pos,nil)
+               local dir = minetest.wallmounted_to_dir(oldnode.param2)
+               local pos2 = vector.add(dir,pos)
+               redstone.inject(pos2,nil)
+
+               redstone.update(pos)
+               redstone.update(pos2)
+       end,
+})
+
+minetest.register_lbm({
+       name = "redstone:button_on",
+       nodenames = {"redstone:button_on"},
+       run_at_every_load = true,
+       action = function(pos)
+               local param2 = minetest.get_node(pos).param2
+               local dir = minetest.wallmounted_to_dir(param2)
+
+               redstone.inject(pos,{torch=16})
+               local pos2 = vector.add(dir,pos)
+               redstone.inject(pos2,{torch=16})
+
+               minetest.after(0,function()
+                       redstone.update(pos)
+                       redstone.update(pos2)
+               end)
        end,
-       on_destruct = on_button_destroy,
 })