Rename/reorganize compat stuff

This commit is contained in:
Jude Melton-Houghton 2022-04-21 08:59:30 -04:00
parent d074dd1a18
commit 090c36b585
32 changed files with 89 additions and 74 deletions

View File

@ -26,7 +26,7 @@ mesecon.register_node("mesecons_blinkyplant:blinky_plant", {
paramtype = "light", paramtype = "light",
is_ground_content = false, is_ground_content = false,
walkable = false, walkable = false,
sounds = mesecon.node_sound_leaves_defaults, sounds = mesecon.node_sound.leaves,
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, -0.5+0.7, 0.3}, fixed = {-0.3, -0.5, -0.3, 0.3, -0.5+0.7, 0.3},

View File

@ -52,7 +52,7 @@ minetest.register_node("mesecons_button:button_off", {
minetest.sound_play("mesecons_button_push", { pos = pos }, true) minetest.sound_play("mesecons_button_push", { pos = pos }, true)
minetest.get_node_timer(pos):start(1) minetest.get_node_timer(pos):start(1)
end, end,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = {receptor = { mesecons = {receptor = {
state = mesecon.state.off, state = mesecon.state.off,
rules = mesecon.rules.buttonlike_get rules = mesecon.rules.buttonlike_get
@ -93,7 +93,7 @@ minetest.register_node("mesecons_button:button_on", {
groups = {dig_immediate=2, not_in_creative_inventory=1, mesecon_needs_receiver = 1}, groups = {dig_immediate=2, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
drop = 'mesecons_button:button_off', drop = 'mesecons_button:button_off',
description = "Button", description = "Button",
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = {receptor = { mesecons = {receptor = {
state = mesecon.state.on, state = mesecon.state.on,
rules = mesecon.rules.buttonlike_get rules = mesecon.rules.buttonlike_get

View File

@ -189,7 +189,7 @@ minetest.register_node("mesecons_commandblock:commandblock_off", {
after_place_node = after_place, after_place_node = after_place,
on_receive_fields = receive_fields, on_receive_fields = receive_fields,
can_dig = can_dig, can_dig = can_dig,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = {effector = { mesecons = {effector = {
action_on = commandblock_action_on action_on = commandblock_action_on
}}, }},
@ -206,7 +206,7 @@ minetest.register_node("mesecons_commandblock:commandblock_on", {
after_place_node = after_place, after_place_node = after_place,
on_receive_fields = receive_fields, on_receive_fields = receive_fields,
can_dig = can_dig, can_dig = can_dig,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = {effector = { mesecons = {effector = {
action_off = commandblock_action_off action_off = commandblock_action_off
}}, }},

View File

@ -69,7 +69,7 @@ local def = {
sunlight_propagates = true, sunlight_propagates = true,
is_ground_content = false, is_ground_content = false,
delayer_time = delaytime[i], delayer_time = delaytime[i],
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
on_blast = mesecon.on_blastnode, on_blast = mesecon.on_blastnode,
drop = "mesecons_delayer:delayer_off_1", drop = "mesecons_delayer:delayer_off_1",
} }

View File

@ -1,4 +1,4 @@
local side_texture = mesecon.steel_block_texture or "mesecons_detector_side.png" local side_texture = mesecon.texture.steel_block or "mesecons_detector_side.png"
local GET_COMMAND = "GET" local GET_COMMAND = "GET"
@ -78,7 +78,7 @@ minetest.register_node("mesecons_detector:object_detector_off", {
}}, }},
on_construct = object_detector_make_formspec, on_construct = object_detector_make_formspec,
on_receive_fields = object_detector_on_receive_fields, on_receive_fields = object_detector_on_receive_fields,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
digiline = object_detector_digiline, digiline = object_detector_digiline,
on_blast = mesecon.on_blastnode, on_blast = mesecon.on_blastnode,
}) })
@ -96,7 +96,7 @@ minetest.register_node("mesecons_detector:object_detector_on", {
}}, }},
on_construct = object_detector_make_formspec, on_construct = object_detector_make_formspec,
on_receive_fields = object_detector_on_receive_fields, on_receive_fields = object_detector_on_receive_fields,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
digiline = object_detector_digiline, digiline = object_detector_digiline,
on_blast = mesecon.on_blastnode, on_blast = mesecon.on_blastnode,
}) })
@ -253,7 +253,7 @@ minetest.register_node("mesecons_detector:node_detector_off", {
}}, }},
on_construct = node_detector_make_formspec, on_construct = node_detector_make_formspec,
on_receive_fields = node_detector_on_receive_fields, on_receive_fields = node_detector_on_receive_fields,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
digiline = node_detector_digiline, digiline = node_detector_digiline,
on_blast = mesecon.on_blastnode, on_blast = mesecon.on_blastnode,
}) })
@ -271,7 +271,7 @@ minetest.register_node("mesecons_detector:node_detector_on", {
}}, }},
on_construct = node_detector_make_formspec, on_construct = node_detector_make_formspec,
on_receive_fields = node_detector_on_receive_fields, on_receive_fields = node_detector_on_receive_fields,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
digiline = node_detector_digiline, digiline = node_detector_digiline,
on_blast = mesecon.on_blastnode, on_blast = mesecon.on_blastnode,
}) })

View File

@ -32,7 +32,7 @@ minetest.register_node("mesecons_extrawires:corner_on", {
selection_box = corner_selectionbox, selection_box = corner_selectionbox,
groups = {dig_immediate = 3, not_in_creative_inventory = 1}, groups = {dig_immediate = 3, not_in_creative_inventory = 1},
drop = "mesecons_extrawires:corner_off", drop = "mesecons_extrawires:corner_off",
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = {conductor = mesecons = {conductor =
{ {
state = mesecon.state.on, state = mesecon.state.on,
@ -58,7 +58,7 @@ minetest.register_node("mesecons_extrawires:corner_off", {
sunlight_propagates = true, sunlight_propagates = true,
selection_box = corner_selectionbox, selection_box = corner_selectionbox,
groups = {dig_immediate = 3}, groups = {dig_immediate = 3},
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = {conductor = mesecons = {conductor =
{ {
state = mesecon.state.off, state = mesecon.state.off,

View File

@ -32,7 +32,7 @@ minetest.register_node("mesecons_extrawires:crossover_off", {
stack_max = 99, stack_max = 99,
selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}}, selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
groups = {dig_immediate=3, mesecon=3}, groups = {dig_immediate=3, mesecon=3},
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = { mesecons = {
conductor = { conductor = {
states = crossover_states, states = crossover_states,
@ -59,7 +59,7 @@ minetest.register_node("mesecons_extrawires:crossover_01", {
stack_max = 99, stack_max = 99,
selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}}, selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1}, groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = { mesecons = {
conductor = { conductor = {
states = crossover_states, states = crossover_states,
@ -86,7 +86,7 @@ minetest.register_node("mesecons_extrawires:crossover_10", {
stack_max = 99, stack_max = 99,
selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}}, selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1}, groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = { mesecons = {
conductor = { conductor = {
states = crossover_states, states = crossover_states,
@ -113,7 +113,7 @@ minetest.register_node("mesecons_extrawires:crossover_on", {
stack_max = 99, stack_max = 99,
selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}}, selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1}, groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = { mesecons = {
conductor = { conductor = {
states = crossover_states, states = crossover_states,

View File

@ -61,7 +61,7 @@ for k, state in ipairs(doublecorner_states) do
selection_box = doublecorner_selectionbox, selection_box = doublecorner_selectionbox,
groups = groups, groups = groups,
drop = doublecorner_states[1], drop = doublecorner_states[1],
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = { mesecons = {
conductor = { conductor = {
states = doublecorner_states, states = doublecorner_states,

View File

@ -44,7 +44,7 @@ minetest.register_node("mesecons_extrawires:tjunction_on", {
node_box = tjunction_nodebox, node_box = tjunction_nodebox,
groups = {dig_immediate = 3, not_in_creative_inventory = 1}, groups = {dig_immediate = 3, not_in_creative_inventory = 1},
drop = "mesecons_extrawires:tjunction_off", drop = "mesecons_extrawires:tjunction_off",
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = {conductor = mesecons = {conductor =
{ {
state = mesecon.state.on, state = mesecon.state.on,
@ -74,7 +74,7 @@ minetest.register_node("mesecons_extrawires:tjunction_off", {
selection_box = tjunction_selectionbox, selection_box = tjunction_selectionbox,
node_box = tjunction_nodebox, node_box = tjunction_nodebox,
groups = {dig_immediate = 3}, groups = {dig_immediate = 3},
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = {conductor = mesecons = {conductor =
{ {
state = mesecon.state.off, state = mesecon.state.off,

View File

@ -89,7 +89,7 @@ mesecon.register_node("mesecons_extrawires:vertical", {
drop = "mesecons_extrawires:vertical_off", drop = "mesecons_extrawires:vertical_off",
after_place_node = vertical_update, after_place_node = vertical_update,
after_dig_node = vertical_update, after_dig_node = vertical_update,
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
},{ },{
tiles = {"mesecons_wire_off.png"}, tiles = {"mesecons_wire_off.png"},
groups = {dig_immediate=3}, groups = {dig_immediate=3},
@ -123,7 +123,7 @@ mesecon.register_node("mesecons_extrawires:vertical_top", {
drop = "mesecons_extrawires:vertical_off", drop = "mesecons_extrawires:vertical_off",
after_place_node = vertical_update, after_place_node = vertical_update,
after_dig_node = vertical_update, after_dig_node = vertical_update,
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
},{ },{
tiles = {"mesecons_wire_off.png"}, tiles = {"mesecons_wire_off.png"},
mesecons = {conductor = { mesecons = {conductor = {
@ -155,7 +155,7 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", {
drop = "mesecons_extrawires:vertical_off", drop = "mesecons_extrawires:vertical_off",
after_place_node = vertical_update, after_place_node = vertical_update,
after_dig_node = vertical_update, after_dig_node = vertical_update,
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
},{ },{
tiles = {"mesecons_wire_off.png"}, tiles = {"mesecons_wire_off.png"},
mesecons = {conductor = { mesecons = {conductor = {

View File

@ -109,7 +109,7 @@ plg.register_nodes({
local is = lcore.deserialize(meta:get_string("instr")) local is = lcore.deserialize(meta:get_string("instr"))
minetest.show_formspec(name, "mesecons:fpga", plg.to_formspec_string(is, nil)) minetest.show_formspec(name, "mesecons:fpga", plg.to_formspec_string(is, nil))
end, end,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = { mesecons = {
effector = { effector = {
rules = {}, -- replaced later rules = {}, -- replaced later

View File

@ -1,3 +1,5 @@
--Aliases
if minetest.get_modpath("default") then if minetest.get_modpath("default") then
minetest.register_alias("mesecons_gamecompat:chest", "default:chest") minetest.register_alias("mesecons_gamecompat:chest", "default:chest")
minetest.register_alias("mesecons_gamecompat:chest_locked", "default:chest_locked") minetest.register_alias("mesecons_gamecompat:chest_locked", "default:chest_locked")
@ -13,14 +15,6 @@ if minetest.get_modpath("default") then
minetest.register_alias("mesecons_gamecompat:steel_ingot", "default:steel_ingot") minetest.register_alias("mesecons_gamecompat:steel_ingot", "default:steel_ingot")
minetest.register_alias("mesecons_gamecompat:steelblock", "default:steelblock") minetest.register_alias("mesecons_gamecompat:steelblock", "default:steelblock")
minetest.register_alias("mesecons_gamecompat:torch", "default:torch") minetest.register_alias("mesecons_gamecompat:torch", "default:torch")
mesecon.node_sound_defaults = default.node_sound_defaults()
mesecon.node_sound_glass_defaults = default.node_sound_glass_defaults()
mesecon.node_sound_leaves_defaults = default.node_sound_leaves_defaults()
mesecon.node_sound_stone_defaults = default.node_sound_stone_defaults()
mesecon.node_sound_wood_defaults = default.node_sound_wood_defaults()
mesecon.steel_block_texture = "default_steel_block.png"
end end
local dye_colors = { local dye_colors = {
@ -33,10 +27,31 @@ if minetest.get_modpath("dye") then
end end
end end
-- Sounds
mesecon.node_sound = {}
mesecon.sound_name = {}
if minetest.get_modpath("default") then
mesecon.node_sound.default = default.node_sound_defaults()
mesecon.node_sound.glass = default.node_sound_glass_defaults()
mesecon.node_sound.leaves = default.node_sound_leaves_defaults()
mesecon.node_sound.stone = default.node_sound_stone_defaults()
mesecon.node_sound.wood = default.node_sound_wood_defaults()
end
if minetest.get_modpath("fire") then if minetest.get_modpath("fire") then
mesecon.sound_name_fire = "fire_fire" mesecon.sound_name.fire = "fire_fire"
end end
if minetest.get_modpath("tnt") then if minetest.get_modpath("tnt") then
mesecon.sound_name_explode = "tnt_explode" mesecon.sound_name.explode = "tnt_explode"
end
-- Textures
mesecon.texture = {}
if minetest.get_modpath("default") then
mesecon.texture.steel_block = "default_steel_block.png"
end end

View File

@ -78,7 +78,7 @@ local function register_gate(name, inputnumber, assess, recipe, description)
selection_box = selection_box, selection_box = selection_box,
node_box = nodebox, node_box = nodebox,
walkable = true, walkable = true,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
assess = assess, assess = assess,
onstate = basename.."_on", onstate = basename.."_on",
offstate = basename.."_off", offstate = basename.."_off",

View File

@ -23,7 +23,7 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", {
type = "fixed", type = "fixed",
fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 }, fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 },
}, },
sounds = mesecon.node_sound_metal_defaults, sounds = mesecon.node_sound.metal,
mesecons = {receptor = { mesecons = {receptor = {
state = mesecon.state.off state = mesecon.state.off
}}, }},
@ -53,7 +53,7 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", {
type = "fixed", type = "fixed",
fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 }, fixed = { -0.5, -0.5, -0.5, 0.5, 1.5, 0.5 },
}, },
sounds = mesecon.node_sound_metal_defaults, sounds = mesecon.node_sound.metal,
mesecons = {receptor = { mesecons = {receptor = {
state = mesecon.state.on state = mesecon.state.on
}}, }},

View File

@ -36,7 +36,7 @@ minetest.register_node("mesecons_insulated:insulated_on", {
}, },
groups = {dig_immediate = 3, not_in_creative_inventory = 1}, groups = {dig_immediate = 3, not_in_creative_inventory = 1},
drop = "mesecons_insulated:insulated_off", drop = "mesecons_insulated:insulated_off",
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = {conductor = { mesecons = {conductor = {
state = mesecon.state.on, state = mesecon.state.on,
offstate = "mesecons_insulated:insulated_off", offstate = "mesecons_insulated:insulated_off",
@ -72,7 +72,7 @@ minetest.register_node("mesecons_insulated:insulated_off", {
fixed = { -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 } fixed = { -16/32-0.001, -17/32, -3/32, 16/32+0.001, -13/32, 3/32 }
}, },
groups = {dig_immediate = 3}, groups = {dig_immediate = 3},
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = {conductor = { mesecons = {conductor = {
state = mesecon.state.off, state = mesecon.state.off,
onstate = "mesecons_insulated:insulated_on", onstate = "mesecons_insulated:insulated_on",

View File

@ -26,7 +26,7 @@ minetest.register_node("mesecons_lamp:lamp_on", {
selection_box = mesecon_lamp_box, selection_box = mesecon_lamp_box,
groups = {dig_immediate = 3,not_in_creative_inventory = 1, mesecon_effector_on = 1}, groups = {dig_immediate = 3,not_in_creative_inventory = 1, mesecon_effector_on = 1},
drop = "mesecons_lamp:lamp_off 1", drop = "mesecons_lamp:lamp_off 1",
sounds = mesecon.node_sound_glass_defaults, sounds = mesecon.node_sound.glass,
mesecons = {effector = { mesecons = {effector = {
action_off = function (pos, node) action_off = function (pos, node)
minetest.swap_node(pos, {name = "mesecons_lamp:lamp_off", param2 = node.param2}) minetest.swap_node(pos, {name = "mesecons_lamp:lamp_off", param2 = node.param2})
@ -51,7 +51,7 @@ minetest.register_node("mesecons_lamp:lamp_off", {
selection_box = mesecon_lamp_box, selection_box = mesecon_lamp_box,
groups = {dig_immediate=3, mesecon_receptor_off = 1, mesecon_effector_off = 1}, groups = {dig_immediate=3, mesecon_receptor_off = 1, mesecon_effector_off = 1},
description = "Mesecon Lamp", description = "Mesecon Lamp",
sounds = mesecon.node_sound_glass_defaults, sounds = mesecon.node_sound.glass,
mesecons = {effector = { mesecons = {effector = {
action_on = function (pos, node) action_on = function (pos, node)
minetest.swap_node(pos, {name = "mesecons_lamp:lamp_on", param2 = node.param2}) minetest.swap_node(pos, {name = "mesecons_lamp:lamp_on", param2 = node.param2})

View File

@ -23,7 +23,7 @@ function mesecon.lightstone_add(name, base_item, texture_off, texture_on, desc)
is_ground_content = false, is_ground_content = false,
groups = {cracky = 2, mesecon_effector_off = 1, mesecon = 2}, groups = {cracky = 2, mesecon_effector_off = 1, mesecon = 2},
description = desc, description = desc,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = {effector = { mesecons = {effector = {
rules = lightstone_rules, rules = lightstone_rules,
action_on = function (pos, node) action_on = function (pos, node)
@ -38,7 +38,7 @@ function mesecon.lightstone_add(name, base_item, texture_off, texture_on, desc)
groups = {cracky = 2, not_in_creative_inventory = 1, mesecon = 2}, groups = {cracky = 2, not_in_creative_inventory = 1, mesecon = 2},
drop = "mesecons_lightstone:lightstone_" .. name .. "_off", drop = "mesecons_lightstone:lightstone_" .. name .. "_off",
light_source = minetest.LIGHT_MAX - 2, light_source = minetest.LIGHT_MAX - 2,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = {effector = { mesecons = {effector = {
rules = lightstone_rules, rules = lightstone_rules,
action_off = function (pos, node) action_off = function (pos, node)

View File

@ -865,7 +865,7 @@ for d = 0, 1 do
node_box = node_box, node_box = node_box,
on_construct = reset_meta, on_construct = reset_meta,
on_receive_fields = on_receive_fields, on_receive_fields = on_receive_fields,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = mesecons, mesecons = mesecons,
digiline = digiline, digiline = digiline,
-- Virtual portstates are the ports that -- Virtual portstates are the ports that
@ -914,7 +914,7 @@ minetest.register_node(BASENAME .. "_burnt", {
node_box = node_box, node_box = node_box,
on_construct = reset_meta, on_construct = reset_meta,
on_receive_fields = on_receive_fields, on_receive_fields = on_receive_fields,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
virtual_portstates = {a = false, b = false, c = false, d = false}, virtual_portstates = {a = false, b = false, c = false, d = false},
mesecons = { mesecons = {
effector = { effector = {

View File

@ -140,7 +140,7 @@ minetest.register_node(nodename, {
yc.reset (pos) yc.reset (pos)
yc.update(pos) yc.update(pos)
end, end,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = mesecons, mesecons = mesecons,
after_dig_node = function (pos, node) after_dig_node = function (pos, node)
rules = microc_rules[node.name] rules = microc_rules[node.name]

View File

@ -129,7 +129,7 @@ mesecon.register_movestone("mesecons_movestones:movestone", {
}, },
groups = {cracky = 3}, groups = {cracky = 3},
description = "Movestone", description = "Movestone",
sounds = mesecon.node_sound_stone_defaults sounds = mesecon.node_sound.stone
}, false, false) }, false, false)
mesecon.register_movestone("mesecons_movestones:sticky_movestone", { mesecon.register_movestone("mesecons_movestones:sticky_movestone", {
@ -143,7 +143,7 @@ mesecon.register_movestone("mesecons_movestones:sticky_movestone", {
}, },
groups = {cracky = 3}, groups = {cracky = 3},
description = "Sticky Movestone", description = "Sticky Movestone",
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
}, true, false) }, true, false)
mesecon.register_movestone("mesecons_movestones:movestone_vertical", { mesecon.register_movestone("mesecons_movestones:movestone_vertical", {
@ -157,7 +157,7 @@ mesecon.register_movestone("mesecons_movestones:movestone_vertical", {
}, },
groups = {cracky = 3}, groups = {cracky = 3},
description = "Vertical Movestone", description = "Vertical Movestone",
sounds = mesecon.node_sound_stone_defaults sounds = mesecon.node_sound.stone
}, false, true) }, false, true)
mesecon.register_movestone("mesecons_movestones:sticky_movestone_vertical", { mesecon.register_movestone("mesecons_movestones:sticky_movestone_vertical", {
@ -171,7 +171,7 @@ mesecon.register_movestone("mesecons_movestones:sticky_movestone_vertical", {
}, },
groups = {cracky = 3}, groups = {cracky = 3},
description = "Vertical Sticky Movestone", description = "Vertical Sticky Movestone",
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
}, true, true) }, true, true)

View File

@ -12,7 +12,7 @@ minetest.register_node("mesecons_noteblock:noteblock", {
mesecon.noteblock_play(pos, node.param2) mesecon.noteblock_play(pos, node.param2)
minetest.set_node(pos, node) minetest.set_node(pos, node)
end, end,
sounds = mesecon.node_sound_wood_defaults, sounds = mesecon.node_sound.wood,
mesecons = {effector = { -- play sound when activated mesecons = {effector = { -- play sound when activated
action_on = function(pos, node) action_on = function(pos, node)
mesecon.noteblock_play(pos, node.param2) mesecon.noteblock_play(pos, node.param2)
@ -48,10 +48,10 @@ local soundnames = {
local node_sounds = {} local node_sounds = {}
for alias, sound in pairs({ for alias, sound in pairs({
["mesecons_gamecompat:lava_source"] = mesecon.sound_name_fire, ["mesecons_gamecompat:lava_source"] = mesecon.sound_name.fire,
["mesecons_gamecompat:chest"] = "mesecons_noteblock_snare", ["mesecons_gamecompat:chest"] = "mesecons_noteblock_snare",
["mesecons_gamecompat:chest_locked"] = "mesecons_noteblock_snare", ["mesecons_gamecompat:chest_locked"] = "mesecons_noteblock_snare",
["mesecons_gamecompat:coalblock"] = mesecon.sound_name_explode, ["mesecons_gamecompat:coalblock"] = mesecon.sound_name.explode,
["mesecons_gamecompat:glass"] = "mesecons_noteblock_hihat", ["mesecons_gamecompat:glass"] = "mesecons_noteblock_hihat",
["mesecons_gamecompat:obsidian_glass"] = "mesecons_noteblock_hihat", ["mesecons_gamecompat:obsidian_glass"] = "mesecons_noteblock_hihat",
}) do }) do

View File

@ -278,7 +278,7 @@ minetest.register_node("mesecons_pistons:piston_normal_off", {
paramtype2 = "facedir", paramtype2 = "facedir",
is_ground_content = false, is_ground_content = false,
after_place_node = piston_orientate, after_place_node = piston_orientate,
sounds = mesecon.node_sound_wood_defaults, sounds = mesecon.node_sound.wood,
mesecons = {effector={ mesecons = {effector={
action_on = piston_on, action_on = piston_on,
rules = piston_get_rules, rules = piston_get_rules,
@ -308,7 +308,7 @@ minetest.register_node("mesecons_pistons:piston_normal_on", {
after_dig_node = piston_after_dig, after_dig_node = piston_after_dig,
node_box = piston_on_box, node_box = piston_on_box,
selection_box = piston_on_box, selection_box = piston_on_box,
sounds = mesecon.node_sound_wood_defaults, sounds = mesecon.node_sound.wood,
mesecons = {effector={ mesecons = {effector={
action_off = piston_off, action_off = piston_off,
rules = piston_get_rules, rules = piston_get_rules,
@ -338,7 +338,7 @@ minetest.register_node("mesecons_pistons:piston_pusher_normal", {
node_box = piston_pusher_box, node_box = piston_pusher_box,
on_rotate = piston_rotate_pusher, on_rotate = piston_rotate_pusher,
drop = "", drop = "",
sounds = mesecon.node_sound_wood_defaults, sounds = mesecon.node_sound.wood,
}) })
-- Sticky ones -- Sticky ones
@ -357,7 +357,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", {
paramtype2 = "facedir", paramtype2 = "facedir",
is_ground_content = false, is_ground_content = false,
after_place_node = piston_orientate, after_place_node = piston_orientate,
sounds = mesecon.node_sound_wood_defaults, sounds = mesecon.node_sound.wood,
mesecons = {effector={ mesecons = {effector={
action_on = piston_on, action_on = piston_on,
rules = piston_get_rules, rules = piston_get_rules,
@ -387,7 +387,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_on", {
after_dig_node = piston_after_dig, after_dig_node = piston_after_dig,
node_box = piston_on_box, node_box = piston_on_box,
selection_box = piston_on_box, selection_box = piston_on_box,
sounds = mesecon.node_sound_wood_defaults, sounds = mesecon.node_sound.wood,
mesecons = {effector={ mesecons = {effector={
action_off = piston_off, action_off = piston_off,
rules = piston_get_rules, rules = piston_get_rules,
@ -417,7 +417,7 @@ minetest.register_node("mesecons_pistons:piston_pusher_sticky", {
node_box = piston_pusher_box, node_box = piston_pusher_box,
on_rotate = piston_rotate_pusher, on_rotate = piston_rotate_pusher,
drop = "", drop = "",
sounds = mesecon.node_sound_wood_defaults, sounds = mesecon.node_sound.wood,
}) })

View File

@ -16,7 +16,7 @@ minetest.register_node("mesecons_powerplant:power_plant", {
type = "fixed", type = "fixed",
fixed = {-0.3, -0.5, -0.3, 0.3, -0.5+0.7, 0.3}, fixed = {-0.3, -0.5, -0.3, 0.3, -0.5+0.7, 0.3},
}, },
sounds = mesecon.node_sound_leaves_defaults, sounds = mesecon.node_sound.leaves,
mesecons = {receptor = { mesecons = {receptor = {
state = mesecon.state.on state = mesecon.state.on
}}, }},

View File

@ -94,7 +94,7 @@ mesecon.register_pressure_plate(
"jeija_pressure_plate_wood_inv.png", "jeija_pressure_plate_wood_inv.png",
{{"group:wood", "group:wood"}}, {{"group:wood", "group:wood"}},
{ choppy = 3, oddly_breakable_by_hand = 3 }, { choppy = 3, oddly_breakable_by_hand = 3 },
mesecon.node_sound_wood_defaults) mesecon.node_sound.wood)
mesecon.register_pressure_plate( mesecon.register_pressure_plate(
"mesecons_pressureplates:pressure_plate_stone", "mesecons_pressureplates:pressure_plate_stone",
@ -105,4 +105,4 @@ mesecon.register_pressure_plate(
"jeija_pressure_plate_stone_inv.png", "jeija_pressure_plate_stone_inv.png",
{{"mesecons_gamecompat:cobble", "mesecons_gamecompat:cobble"}}, {{"mesecons_gamecompat:cobble", "mesecons_gamecompat:cobble"}},
{ cracky = 3, oddly_breakable_by_hand = 3 }, { cracky = 3, oddly_breakable_by_hand = 3 },
mesecon.node_sound_stone_defaults) mesecon.node_sound.stone)

View File

@ -6,7 +6,7 @@ minetest.register_node("mesecons_random:removestone", {
inventory_image = minetest.inventorycube("jeija_removestone_inv.png"), inventory_image = minetest.inventorycube("jeija_removestone_inv.png"),
groups = {cracky=3}, groups = {cracky=3},
description="Removestone", description="Removestone",
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = {effector = { mesecons = {effector = {
action_on = function (pos, node) action_on = function (pos, node)
minetest.remove_node(pos) minetest.remove_node(pos)
@ -34,7 +34,7 @@ minetest.register_node("mesecons_random:ghoststone", {
is_ground_content = false, is_ground_content = false,
inventory_image = minetest.inventorycube("jeija_ghoststone_inv.png"), inventory_image = minetest.inventorycube("jeija_ghoststone_inv.png"),
groups = {cracky=3}, groups = {cracky=3},
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
mesecons = {conductor = { mesecons = {conductor = {
state = mesecon.state.off, state = mesecon.state.off,
rules = mesecon.rules.alldirs, rules = mesecon.rules.alldirs,

View File

@ -56,7 +56,7 @@ mesecon.register_node("mesecons_receiver:receiver", {
}, },
groups = {dig_immediate = 3, not_in_creative_inventory = 1}, groups = {dig_immediate = 3, not_in_creative_inventory = 1},
drop = "mesecons:wire_00000000_off", drop = "mesecons:wire_00000000_off",
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
}, { }, {
tiles = { tiles = {
"receiver_top_off.png", "receiver_top_off.png",
@ -105,7 +105,7 @@ mesecon.register_node("mesecons_receiver:receiver_up", {
}, },
groups = {dig_immediate = 3, not_in_creative_inventory = 1}, groups = {dig_immediate = 3, not_in_creative_inventory = 1},
drop = "mesecons:wire_00000000_off", drop = "mesecons:wire_00000000_off",
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
}, { }, {
tiles = {"mesecons_wire_off.png"}, tiles = {"mesecons_wire_off.png"},
mesecons = {conductor = { mesecons = {conductor = {
@ -150,7 +150,7 @@ mesecon.register_node("mesecons_receiver:receiver_down", {
}, },
groups = {dig_immediate = 3, not_in_creative_inventory = 1}, groups = {dig_immediate = 3, not_in_creative_inventory = 1},
drop = "mesecons:wire_00000000_off", drop = "mesecons:wire_00000000_off",
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
}, { }, {
tiles = {"mesecons_wire_off.png"}, tiles = {"mesecons_wire_off.png"},
mesecons = {conductor = { mesecons = {conductor = {

View File

@ -15,7 +15,7 @@ mesecon.register_node("mesecons_solarpanel:solar_panel", {
wall_top = {-7/16, 7/16, -7/16, 7/16, 8/16, 7/16}, wall_top = {-7/16, 7/16, -7/16, 7/16, 8/16, 7/16},
wall_side = {-8/16, -7/16, -7/16, -7/16, 7/16, 7/16}, wall_side = {-8/16, -7/16, -7/16, -7/16, 7/16, 7/16},
}, },
sounds = mesecon.node_sound_glass_defaults, sounds = mesecon.node_sound.glass,
on_blast = mesecon.on_blastnode, on_blast = mesecon.on_blastnode,
},{ },{
groups = {dig_immediate = 3}, groups = {dig_immediate = 3},

View File

@ -15,5 +15,5 @@ minetest.register_node("mesecons_stickyblocks:sticky_block_all", {
end end
return connected return connected
end, end,
sounds = mesecon.node_sound_wood_defaults, sounds = mesecon.node_sound.wood,
}) })

View File

@ -4,7 +4,7 @@ mesecon.register_node("mesecons_switch:mesecon_switch", {
paramtype2="facedir", paramtype2="facedir",
description="Switch", description="Switch",
is_ground_content = false, is_ground_content = false,
sounds = mesecon.node_sound_stone_defaults, sounds = mesecon.node_sound.stone,
on_rightclick = function (pos, node) on_rightclick = function (pos, node)
if(mesecon.flipstate(pos, node) == "on") then if(mesecon.flipstate(pos, node) == "on") then
mesecon.receptor_on(pos) mesecon.receptor_on(pos)

View File

@ -64,7 +64,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_off", {
selection_box = torch_selectionbox, selection_box = torch_selectionbox,
groups = {dig_immediate = 3, not_in_creative_inventory = 1}, groups = {dig_immediate = 3, not_in_creative_inventory = 1},
drop = "mesecons_torch:mesecon_torch_on", drop = "mesecons_torch:mesecon_torch_on",
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = {receptor = { mesecons = {receptor = {
state = mesecon.state.off, state = mesecon.state.off,
rules = torch_get_output_rules rules = torch_get_output_rules
@ -86,7 +86,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", {
groups = {dig_immediate=3}, groups = {dig_immediate=3},
light_source = minetest.LIGHT_MAX-5, light_source = minetest.LIGHT_MAX-5,
description="Mesecon Torch", description="Mesecon Torch",
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
mesecons = {receptor = { mesecons = {receptor = {
state = mesecon.state.on, state = mesecon.state.on,
rules = torch_get_output_rules rules = torch_get_output_rules

View File

@ -15,7 +15,7 @@ mesecon.register_node("mesecons_walllever:wall_lever", {
type = "fixed", type = "fixed",
fixed = { -8/16, -8/16, 3/16, 8/16, 8/16, 8/16 }, fixed = { -8/16, -8/16, 3/16, 8/16, 8/16, 8/16 },
}, },
sounds = mesecon.node_sound_wood_defaults, sounds = mesecon.node_sound.wood,
on_rightclick = function (pos, node) on_rightclick = function (pos, node)
if(mesecon.flipstate(pos, node) == "on") then if(mesecon.flipstate(pos, node) == "on") then
mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node)) mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node))

View File

@ -216,7 +216,7 @@ local function register_wires()
walkable = false, walkable = false,
drop = "mesecons:wire_00000000_off", drop = "mesecons:wire_00000000_off",
mesecon_wire = true, mesecon_wire = true,
sounds = mesecon.node_sound_defaults, sounds = mesecon.node_sound.default,
on_rotate = false, on_rotate = false,
}, {tiles = tiles_off, mesecons = meseconspec_off, groups = groups_off}, }, {tiles = tiles_off, mesecons = meseconspec_off, groups = groups_off},
{tiles = tiles_on, mesecons = meseconspec_on, groups = groups_on}) {tiles = tiles_on, mesecons = meseconspec_on, groups = groups_on})