diff --git a/.luacheckrc b/.luacheckrc index 79d6ae7..6655c5e 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -10,7 +10,7 @@ globals = { read_globals = { -- mods - "default", "mesecon", "digiline", + "default", "mesecon", "digilines", "screwdriver", "unified_inventory", "i3", "mcl_experience", "awards", "xcompat", "fakelib", "vizlib" diff --git a/autocrafter.lua b/autocrafter.lua index b4954b6..bc7937e 100644 --- a/autocrafter.lua +++ b/autocrafter.lua @@ -588,7 +588,7 @@ minetest.register_node("pipeworks:autocrafter", { return count end, on_timer = run_autocrafter, - digiline = { + digilines = { receptor = {}, effector = { action = function(pos,node,channel,msg) @@ -625,7 +625,7 @@ minetest.register_node("pipeworks:autocrafter", { end local setchan = meta:get_string("channel") local output = inv:get_stack("output", 1) - digiline:receptor_send(pos, digiline.rules.default, setchan, { + digilines:receptor_send(pos, digilines.rules.default, setchan, { recipe = recipe, result = { name = output:get_name(), diff --git a/common.lua b/common.lua index f12e530..88aad4f 100644 --- a/common.lua +++ b/common.lua @@ -18,7 +18,7 @@ pipeworks.mesecons_rules={{x=0,y=0,z=1},{x=0,y=0,z=-1},{x=1,y=0,z=0},{x=-1,y=0,z local digilines_enabled = minetest.get_modpath("digilines") ~= nil if digilines_enabled and pipeworks.enable_vertical_digilines_connectivity then - pipeworks.digilines_rules=digiline.rules.default + pipeworks.digilines_rules=digilines.rules.default else -- These rules break vertical connectivity to deployers, node breakers, dispensers, and digiline filter injectors -- via digiline conducting tubes. Changing them may break some builds on some servers, so the setting was added diff --git a/filter-injector.lua b/filter-injector.lua index cac4858..5345f33 100644 --- a/filter-injector.lua +++ b/filter-injector.lua @@ -481,7 +481,7 @@ for _, data in ipairs({ set_filter_formspec(data, meta) set_filter_infotext(data, meta) end - node.digiline = { + node.digilines = { effector = { action = function(pos, node, channel, msg) local meta = minetest.get_meta(pos) diff --git a/tubes/lua.lua b/tubes/lua.lua index ec09829..58f6e4b 100644 --- a/tubes/lua.lua +++ b/tubes/lua.lua @@ -729,7 +729,7 @@ mesecon.queue:add_function("pipeworks:lt_digiline_relay", function (pos, channel if (minetest.get_meta(pos):get_int("luac_id") ~= luac_id) then return end if (minetest.registered_nodes[minetest.get_node(pos).name].is_burnt) then return end -- The actual work - digiline:receptor_send(pos, digiline_rules_luatube, channel, msg) + digilines:receptor_send(pos, digiline_rules_luatube, channel, msg) end) ----------------------- @@ -928,7 +928,7 @@ for white = 0, 1 do key = "node_sound_wood_defaults", }, mesecons = mesecons, - digiline = digiline, + digilines = digiline, -- Virtual portstates are the ports that -- the node shows as powered up (light up). virtual_portstates = { diff --git a/tubes/signal.lua b/tubes/signal.lua index 3a47e8c..9ad800d 100644 --- a/tubes/signal.lua +++ b/tubes/signal.lua @@ -89,7 +89,7 @@ if digiline_enabled and pipeworks.enable_digiline_detector_tube then local setchan = meta:get_string("channel") - digiline:receptor_send(pos, digiline.rules.default, setchan, stack:to_table()) + digilines:receptor_send(pos, digilines.rules.default, setchan, stack:to_table()) return pipeworks.notvel(pipeworks.meseadjlist, velocity) end}, @@ -115,7 +115,7 @@ if digiline_enabled and pipeworks.enable_digiline_detector_tube then end end, groups = {}, - digiline = { + digilines = { receptor = {}, effector = { action = function(pos,node,channel,msg) end @@ -183,7 +183,7 @@ if digiline_enabled and pipeworks.enable_digiline_conductor_tube then plain = {"pipeworks_tube_plain.png^pipeworks_digiline_conductor_tube_plain.png"}, noctr = {"pipeworks_tube_noctr.png^pipeworks_digiline_conductor_tube_noctr.png"}, ends = {"pipeworks_tube_end.png^pipeworks_digiline_conductor_tube_end.png"}, - node_def = {digiline = {wire = {rules = pipeworks.digilines_rules}}}, + node_def = {digilines = {wire = {rules = pipeworks.digilines_rules}}}, }) minetest.register_craft({ type = "shapeless", @@ -202,7 +202,7 @@ if digiline_enabled and pipeworks.enable_digiline_conductor_tube and noctr = {"pipeworks_conductor_tube_noctr.png^pipeworks_digiline_conductor_tube_noctr.png"}, ends = {"pipeworks_conductor_tube_end.png^pipeworks_digiline_conductor_tube_end.png"}, node_def = { - digiline = {wire = {rules = pipeworks.digilines_rules}}, + digilines = {wire = {rules = pipeworks.digilines_rules}}, groups = {mesecon = 2}, mesecons = {conductor = { state = "off", @@ -219,7 +219,7 @@ if digiline_enabled and pipeworks.enable_digiline_conductor_tube and noctr = {"pipeworks_conductor_tube_on_noctr.png^pipeworks_digiline_conductor_tube_noctr.png"}, ends = {"pipeworks_conductor_tube_on_end.png^pipeworks_digiline_conductor_tube_end.png"}, node_def = { - digiline = {wire = {rules = pipeworks.digilines_rules}}, + digilines = {wire = {rules = pipeworks.digilines_rules}}, groups = {mesecon = 2, not_in_creative_inventory = 1}, drop = "pipeworks:mesecon_and_digiline_conductor_tube_off_1", mesecons = {conductor = { diff --git a/tubes/teleport.lua b/tubes/teleport.lua index 83d9344..91dd6e0 100644 --- a/tubes/teleport.lua +++ b/tubes/teleport.lua @@ -318,7 +318,7 @@ if has_digilines then minetest.get_meta(pos):set_string("owner", placer:get_player_name()) pipeworks.after_place(pos) end - def.digiline = { + def.digilines = { receptor = { rules = pipeworks.digilines_rules, },