From 090c36b585aba0fe5530ae1334414a2ce23495ad Mon Sep 17 00:00:00 2001 From: Jude Melton-Houghton Date: Thu, 21 Apr 2022 08:59:30 -0400 Subject: [PATCH] Rename/reorganize compat stuff --- mesecons_blinkyplant/init.lua | 2 +- mesecons_button/init.lua | 4 ++-- mesecons_commandblock/init.lua | 4 ++-- mesecons_delayer/init.lua | 2 +- mesecons_detector/init.lua | 10 ++++---- mesecons_extrawires/corner.lua | 4 ++-- mesecons_extrawires/crossover.lua | 8 +++---- mesecons_extrawires/doublecorner.lua | 2 +- mesecons_extrawires/tjunction.lua | 4 ++-- mesecons_extrawires/vertical.lua | 6 ++--- mesecons_fpga/init.lua | 2 +- mesecons_gamecompat/init.lua | 35 ++++++++++++++++++++-------- mesecons_gates/init.lua | 2 +- mesecons_hydroturbine/init.lua | 4 ++-- mesecons_insulated/init.lua | 4 ++-- mesecons_lamp/init.lua | 4 ++-- mesecons_lightstone/init.lua | 4 ++-- mesecons_luacontroller/init.lua | 4 ++-- mesecons_microcontroller/init.lua | 2 +- mesecons_movestones/init.lua | 8 +++---- mesecons_noteblock/init.lua | 6 ++--- mesecons_pistons/init.lua | 12 +++++----- mesecons_powerplant/init.lua | 2 +- mesecons_pressureplates/init.lua | 4 ++-- mesecons_random/init.lua | 4 ++-- mesecons_receiver/init.lua | 6 ++--- mesecons_solarpanel/init.lua | 2 +- mesecons_stickyblocks/init.lua | 2 +- mesecons_switch/init.lua | 2 +- mesecons_torch/init.lua | 4 ++-- mesecons_walllever/init.lua | 2 +- mesecons_wires/init.lua | 2 +- 32 files changed, 89 insertions(+), 74 deletions(-) diff --git a/mesecons_blinkyplant/init.lua b/mesecons_blinkyplant/init.lua index bc46cf2..28cb054 100644 --- a/mesecons_blinkyplant/init.lua +++ b/mesecons_blinkyplant/init.lua @@ -26,7 +26,7 @@ mesecon.register_node("mesecons_blinkyplant:blinky_plant", { paramtype = "light", is_ground_content = false, walkable = false, - sounds = mesecon.node_sound_leaves_defaults, + sounds = mesecon.node_sound.leaves, selection_box = { type = "fixed", fixed = {-0.3, -0.5, -0.3, 0.3, -0.5+0.7, 0.3}, diff --git a/mesecons_button/init.lua b/mesecons_button/init.lua index 49510b2..7c70923 100644 --- a/mesecons_button/init.lua +++ b/mesecons_button/init.lua @@ -52,7 +52,7 @@ minetest.register_node("mesecons_button:button_off", { minetest.sound_play("mesecons_button_push", { pos = pos }, true) minetest.get_node_timer(pos):start(1) end, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = {receptor = { state = mesecon.state.off, 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}, drop = 'mesecons_button:button_off', description = "Button", - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = {receptor = { state = mesecon.state.on, rules = mesecon.rules.buttonlike_get diff --git a/mesecons_commandblock/init.lua b/mesecons_commandblock/init.lua index 37496f9..c96cfe8 100644 --- a/mesecons_commandblock/init.lua +++ b/mesecons_commandblock/init.lua @@ -189,7 +189,7 @@ minetest.register_node("mesecons_commandblock:commandblock_off", { after_place_node = after_place, on_receive_fields = receive_fields, can_dig = can_dig, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = {effector = { action_on = commandblock_action_on }}, @@ -206,7 +206,7 @@ minetest.register_node("mesecons_commandblock:commandblock_on", { after_place_node = after_place, on_receive_fields = receive_fields, can_dig = can_dig, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = {effector = { action_off = commandblock_action_off }}, diff --git a/mesecons_delayer/init.lua b/mesecons_delayer/init.lua index d275917..bc95806 100644 --- a/mesecons_delayer/init.lua +++ b/mesecons_delayer/init.lua @@ -69,7 +69,7 @@ local def = { sunlight_propagates = true, is_ground_content = false, delayer_time = delaytime[i], - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, on_blast = mesecon.on_blastnode, drop = "mesecons_delayer:delayer_off_1", } diff --git a/mesecons_detector/init.lua b/mesecons_detector/init.lua index 1d6c6de..d460936 100644 --- a/mesecons_detector/init.lua +++ b/mesecons_detector/init.lua @@ -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" @@ -78,7 +78,7 @@ minetest.register_node("mesecons_detector:object_detector_off", { }}, on_construct = object_detector_make_formspec, on_receive_fields = object_detector_on_receive_fields, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, digiline = object_detector_digiline, on_blast = mesecon.on_blastnode, }) @@ -96,7 +96,7 @@ minetest.register_node("mesecons_detector:object_detector_on", { }}, on_construct = object_detector_make_formspec, on_receive_fields = object_detector_on_receive_fields, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, digiline = object_detector_digiline, on_blast = mesecon.on_blastnode, }) @@ -253,7 +253,7 @@ minetest.register_node("mesecons_detector:node_detector_off", { }}, on_construct = node_detector_make_formspec, on_receive_fields = node_detector_on_receive_fields, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, digiline = node_detector_digiline, on_blast = mesecon.on_blastnode, }) @@ -271,7 +271,7 @@ minetest.register_node("mesecons_detector:node_detector_on", { }}, on_construct = node_detector_make_formspec, on_receive_fields = node_detector_on_receive_fields, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, digiline = node_detector_digiline, on_blast = mesecon.on_blastnode, }) diff --git a/mesecons_extrawires/corner.lua b/mesecons_extrawires/corner.lua index 34e0395..1651b46 100644 --- a/mesecons_extrawires/corner.lua +++ b/mesecons_extrawires/corner.lua @@ -32,7 +32,7 @@ minetest.register_node("mesecons_extrawires:corner_on", { selection_box = corner_selectionbox, groups = {dig_immediate = 3, not_in_creative_inventory = 1}, drop = "mesecons_extrawires:corner_off", - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = {conductor = { state = mesecon.state.on, @@ -58,7 +58,7 @@ minetest.register_node("mesecons_extrawires:corner_off", { sunlight_propagates = true, selection_box = corner_selectionbox, groups = {dig_immediate = 3}, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = {conductor = { state = mesecon.state.off, diff --git a/mesecons_extrawires/crossover.lua b/mesecons_extrawires/crossover.lua index 8ff4e54..bf7f0db 100644 --- a/mesecons_extrawires/crossover.lua +++ b/mesecons_extrawires/crossover.lua @@ -32,7 +32,7 @@ minetest.register_node("mesecons_extrawires:crossover_off", { stack_max = 99, selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}}, groups = {dig_immediate=3, mesecon=3}, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = { conductor = { states = crossover_states, @@ -59,7 +59,7 @@ minetest.register_node("mesecons_extrawires:crossover_01", { stack_max = 99, 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}, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = { conductor = { states = crossover_states, @@ -86,7 +86,7 @@ minetest.register_node("mesecons_extrawires:crossover_10", { stack_max = 99, 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}, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = { conductor = { states = crossover_states, @@ -113,7 +113,7 @@ minetest.register_node("mesecons_extrawires:crossover_on", { stack_max = 99, 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}, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = { conductor = { states = crossover_states, diff --git a/mesecons_extrawires/doublecorner.lua b/mesecons_extrawires/doublecorner.lua index 4bb7b54..fbb39c0 100644 --- a/mesecons_extrawires/doublecorner.lua +++ b/mesecons_extrawires/doublecorner.lua @@ -61,7 +61,7 @@ for k, state in ipairs(doublecorner_states) do selection_box = doublecorner_selectionbox, groups = groups, drop = doublecorner_states[1], - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = { conductor = { states = doublecorner_states, diff --git a/mesecons_extrawires/tjunction.lua b/mesecons_extrawires/tjunction.lua index d632523..3829edb 100644 --- a/mesecons_extrawires/tjunction.lua +++ b/mesecons_extrawires/tjunction.lua @@ -44,7 +44,7 @@ minetest.register_node("mesecons_extrawires:tjunction_on", { node_box = tjunction_nodebox, groups = {dig_immediate = 3, not_in_creative_inventory = 1}, drop = "mesecons_extrawires:tjunction_off", - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = {conductor = { state = mesecon.state.on, @@ -74,7 +74,7 @@ minetest.register_node("mesecons_extrawires:tjunction_off", { selection_box = tjunction_selectionbox, node_box = tjunction_nodebox, groups = {dig_immediate = 3}, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = {conductor = { state = mesecon.state.off, diff --git a/mesecons_extrawires/vertical.lua b/mesecons_extrawires/vertical.lua index 983f296..72084fc 100644 --- a/mesecons_extrawires/vertical.lua +++ b/mesecons_extrawires/vertical.lua @@ -89,7 +89,7 @@ mesecon.register_node("mesecons_extrawires:vertical", { drop = "mesecons_extrawires:vertical_off", after_place_node = vertical_update, after_dig_node = vertical_update, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, },{ tiles = {"mesecons_wire_off.png"}, groups = {dig_immediate=3}, @@ -123,7 +123,7 @@ mesecon.register_node("mesecons_extrawires:vertical_top", { drop = "mesecons_extrawires:vertical_off", after_place_node = vertical_update, after_dig_node = vertical_update, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, },{ tiles = {"mesecons_wire_off.png"}, mesecons = {conductor = { @@ -155,7 +155,7 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", { drop = "mesecons_extrawires:vertical_off", after_place_node = vertical_update, after_dig_node = vertical_update, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, },{ tiles = {"mesecons_wire_off.png"}, mesecons = {conductor = { diff --git a/mesecons_fpga/init.lua b/mesecons_fpga/init.lua index 5c63469..1898177 100644 --- a/mesecons_fpga/init.lua +++ b/mesecons_fpga/init.lua @@ -109,7 +109,7 @@ plg.register_nodes({ local is = lcore.deserialize(meta:get_string("instr")) minetest.show_formspec(name, "mesecons:fpga", plg.to_formspec_string(is, nil)) end, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = { effector = { rules = {}, -- replaced later diff --git a/mesecons_gamecompat/init.lua b/mesecons_gamecompat/init.lua index 9235b58..d235c5d 100644 --- a/mesecons_gamecompat/init.lua +++ b/mesecons_gamecompat/init.lua @@ -1,3 +1,5 @@ +--Aliases + if minetest.get_modpath("default") then minetest.register_alias("mesecons_gamecompat:chest", "default:chest") 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:steelblock", "default:steelblock") 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 local dye_colors = { @@ -33,10 +27,31 @@ if minetest.get_modpath("dye") then 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 - mesecon.sound_name_fire = "fire_fire" + mesecon.sound_name.fire = "fire_fire" end 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 diff --git a/mesecons_gates/init.lua b/mesecons_gates/init.lua index bedb9f6..e42f548 100644 --- a/mesecons_gates/init.lua +++ b/mesecons_gates/init.lua @@ -78,7 +78,7 @@ local function register_gate(name, inputnumber, assess, recipe, description) selection_box = selection_box, node_box = nodebox, walkable = true, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, assess = assess, onstate = basename.."_on", offstate = basename.."_off", diff --git a/mesecons_hydroturbine/init.lua b/mesecons_hydroturbine/init.lua index f4d7475..99ac130 100644 --- a/mesecons_hydroturbine/init.lua +++ b/mesecons_hydroturbine/init.lua @@ -23,7 +23,7 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_off", { type = "fixed", 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 = { state = mesecon.state.off }}, @@ -53,7 +53,7 @@ minetest.register_node("mesecons_hydroturbine:hydro_turbine_on", { type = "fixed", 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 = { state = mesecon.state.on }}, diff --git a/mesecons_insulated/init.lua b/mesecons_insulated/init.lua index 62f5935..ceb7302 100644 --- a/mesecons_insulated/init.lua +++ b/mesecons_insulated/init.lua @@ -36,7 +36,7 @@ minetest.register_node("mesecons_insulated:insulated_on", { }, groups = {dig_immediate = 3, not_in_creative_inventory = 1}, drop = "mesecons_insulated:insulated_off", - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = {conductor = { state = mesecon.state.on, 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 } }, groups = {dig_immediate = 3}, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = {conductor = { state = mesecon.state.off, onstate = "mesecons_insulated:insulated_on", diff --git a/mesecons_lamp/init.lua b/mesecons_lamp/init.lua index 59205c1..aff1f26 100644 --- a/mesecons_lamp/init.lua +++ b/mesecons_lamp/init.lua @@ -26,7 +26,7 @@ minetest.register_node("mesecons_lamp:lamp_on", { selection_box = mesecon_lamp_box, groups = {dig_immediate = 3,not_in_creative_inventory = 1, mesecon_effector_on = 1}, drop = "mesecons_lamp:lamp_off 1", - sounds = mesecon.node_sound_glass_defaults, + sounds = mesecon.node_sound.glass, mesecons = {effector = { action_off = function (pos, node) 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, groups = {dig_immediate=3, mesecon_receptor_off = 1, mesecon_effector_off = 1}, description = "Mesecon Lamp", - sounds = mesecon.node_sound_glass_defaults, + sounds = mesecon.node_sound.glass, mesecons = {effector = { action_on = function (pos, node) minetest.swap_node(pos, {name = "mesecons_lamp:lamp_on", param2 = node.param2}) diff --git a/mesecons_lightstone/init.lua b/mesecons_lightstone/init.lua index 94f0f08..f2ea147 100644 --- a/mesecons_lightstone/init.lua +++ b/mesecons_lightstone/init.lua @@ -23,7 +23,7 @@ function mesecon.lightstone_add(name, base_item, texture_off, texture_on, desc) is_ground_content = false, groups = {cracky = 2, mesecon_effector_off = 1, mesecon = 2}, description = desc, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = {effector = { rules = lightstone_rules, 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}, drop = "mesecons_lightstone:lightstone_" .. name .. "_off", light_source = minetest.LIGHT_MAX - 2, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = {effector = { rules = lightstone_rules, action_off = function (pos, node) diff --git a/mesecons_luacontroller/init.lua b/mesecons_luacontroller/init.lua index 7312024..5799f8e 100644 --- a/mesecons_luacontroller/init.lua +++ b/mesecons_luacontroller/init.lua @@ -865,7 +865,7 @@ for d = 0, 1 do node_box = node_box, on_construct = reset_meta, on_receive_fields = on_receive_fields, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = mesecons, digiline = digiline, -- Virtual portstates are the ports that @@ -914,7 +914,7 @@ minetest.register_node(BASENAME .. "_burnt", { node_box = node_box, on_construct = reset_meta, 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}, mesecons = { effector = { diff --git a/mesecons_microcontroller/init.lua b/mesecons_microcontroller/init.lua index ea325ce..2e11afa 100644 --- a/mesecons_microcontroller/init.lua +++ b/mesecons_microcontroller/init.lua @@ -140,7 +140,7 @@ minetest.register_node(nodename, { yc.reset (pos) yc.update(pos) end, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = mesecons, after_dig_node = function (pos, node) rules = microc_rules[node.name] diff --git a/mesecons_movestones/init.lua b/mesecons_movestones/init.lua index 32743a3..e50103c 100644 --- a/mesecons_movestones/init.lua +++ b/mesecons_movestones/init.lua @@ -129,7 +129,7 @@ mesecon.register_movestone("mesecons_movestones:movestone", { }, groups = {cracky = 3}, description = "Movestone", - sounds = mesecon.node_sound_stone_defaults + sounds = mesecon.node_sound.stone }, false, false) mesecon.register_movestone("mesecons_movestones:sticky_movestone", { @@ -143,7 +143,7 @@ mesecon.register_movestone("mesecons_movestones:sticky_movestone", { }, groups = {cracky = 3}, description = "Sticky Movestone", - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, }, true, false) mesecon.register_movestone("mesecons_movestones:movestone_vertical", { @@ -157,7 +157,7 @@ mesecon.register_movestone("mesecons_movestones:movestone_vertical", { }, groups = {cracky = 3}, description = "Vertical Movestone", - sounds = mesecon.node_sound_stone_defaults + sounds = mesecon.node_sound.stone }, false, true) mesecon.register_movestone("mesecons_movestones:sticky_movestone_vertical", { @@ -171,7 +171,7 @@ mesecon.register_movestone("mesecons_movestones:sticky_movestone_vertical", { }, groups = {cracky = 3}, description = "Vertical Sticky Movestone", - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, }, true, true) diff --git a/mesecons_noteblock/init.lua b/mesecons_noteblock/init.lua index 9a19002..f0e7044 100644 --- a/mesecons_noteblock/init.lua +++ b/mesecons_noteblock/init.lua @@ -12,7 +12,7 @@ minetest.register_node("mesecons_noteblock:noteblock", { mesecon.noteblock_play(pos, node.param2) minetest.set_node(pos, node) end, - sounds = mesecon.node_sound_wood_defaults, + sounds = mesecon.node_sound.wood, mesecons = {effector = { -- play sound when activated action_on = function(pos, node) mesecon.noteblock_play(pos, node.param2) @@ -48,10 +48,10 @@ local soundnames = { local node_sounds = {} 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_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:obsidian_glass"] = "mesecons_noteblock_hihat", }) do diff --git a/mesecons_pistons/init.lua b/mesecons_pistons/init.lua index 5e32dbf..bc940d0 100644 --- a/mesecons_pistons/init.lua +++ b/mesecons_pistons/init.lua @@ -278,7 +278,7 @@ minetest.register_node("mesecons_pistons:piston_normal_off", { paramtype2 = "facedir", is_ground_content = false, after_place_node = piston_orientate, - sounds = mesecon.node_sound_wood_defaults, + sounds = mesecon.node_sound.wood, mesecons = {effector={ action_on = piston_on, rules = piston_get_rules, @@ -308,7 +308,7 @@ minetest.register_node("mesecons_pistons:piston_normal_on", { after_dig_node = piston_after_dig, node_box = piston_on_box, selection_box = piston_on_box, - sounds = mesecon.node_sound_wood_defaults, + sounds = mesecon.node_sound.wood, mesecons = {effector={ action_off = piston_off, rules = piston_get_rules, @@ -338,7 +338,7 @@ minetest.register_node("mesecons_pistons:piston_pusher_normal", { node_box = piston_pusher_box, on_rotate = piston_rotate_pusher, drop = "", - sounds = mesecon.node_sound_wood_defaults, + sounds = mesecon.node_sound.wood, }) -- Sticky ones @@ -357,7 +357,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_off", { paramtype2 = "facedir", is_ground_content = false, after_place_node = piston_orientate, - sounds = mesecon.node_sound_wood_defaults, + sounds = mesecon.node_sound.wood, mesecons = {effector={ action_on = piston_on, rules = piston_get_rules, @@ -387,7 +387,7 @@ minetest.register_node("mesecons_pistons:piston_sticky_on", { after_dig_node = piston_after_dig, node_box = piston_on_box, selection_box = piston_on_box, - sounds = mesecon.node_sound_wood_defaults, + sounds = mesecon.node_sound.wood, mesecons = {effector={ action_off = piston_off, rules = piston_get_rules, @@ -417,7 +417,7 @@ minetest.register_node("mesecons_pistons:piston_pusher_sticky", { node_box = piston_pusher_box, on_rotate = piston_rotate_pusher, drop = "", - sounds = mesecon.node_sound_wood_defaults, + sounds = mesecon.node_sound.wood, }) diff --git a/mesecons_powerplant/init.lua b/mesecons_powerplant/init.lua index ab146b0..90724bd 100644 --- a/mesecons_powerplant/init.lua +++ b/mesecons_powerplant/init.lua @@ -16,7 +16,7 @@ minetest.register_node("mesecons_powerplant:power_plant", { type = "fixed", 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 = { state = mesecon.state.on }}, diff --git a/mesecons_pressureplates/init.lua b/mesecons_pressureplates/init.lua index 14feaf1..737d7cd 100644 --- a/mesecons_pressureplates/init.lua +++ b/mesecons_pressureplates/init.lua @@ -94,7 +94,7 @@ mesecon.register_pressure_plate( "jeija_pressure_plate_wood_inv.png", {{"group:wood", "group:wood"}}, { choppy = 3, oddly_breakable_by_hand = 3 }, - mesecon.node_sound_wood_defaults) + mesecon.node_sound.wood) mesecon.register_pressure_plate( "mesecons_pressureplates:pressure_plate_stone", @@ -105,4 +105,4 @@ mesecon.register_pressure_plate( "jeija_pressure_plate_stone_inv.png", {{"mesecons_gamecompat:cobble", "mesecons_gamecompat:cobble"}}, { cracky = 3, oddly_breakable_by_hand = 3 }, - mesecon.node_sound_stone_defaults) + mesecon.node_sound.stone) diff --git a/mesecons_random/init.lua b/mesecons_random/init.lua index 44d0637..cc57a46 100644 --- a/mesecons_random/init.lua +++ b/mesecons_random/init.lua @@ -6,7 +6,7 @@ minetest.register_node("mesecons_random:removestone", { inventory_image = minetest.inventorycube("jeija_removestone_inv.png"), groups = {cracky=3}, description="Removestone", - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = {effector = { action_on = function (pos, node) minetest.remove_node(pos) @@ -34,7 +34,7 @@ minetest.register_node("mesecons_random:ghoststone", { is_ground_content = false, inventory_image = minetest.inventorycube("jeija_ghoststone_inv.png"), groups = {cracky=3}, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, mesecons = {conductor = { state = mesecon.state.off, rules = mesecon.rules.alldirs, diff --git a/mesecons_receiver/init.lua b/mesecons_receiver/init.lua index 667e77c..d95b333 100644 --- a/mesecons_receiver/init.lua +++ b/mesecons_receiver/init.lua @@ -56,7 +56,7 @@ mesecon.register_node("mesecons_receiver:receiver", { }, groups = {dig_immediate = 3, not_in_creative_inventory = 1}, drop = "mesecons:wire_00000000_off", - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, }, { tiles = { "receiver_top_off.png", @@ -105,7 +105,7 @@ mesecon.register_node("mesecons_receiver:receiver_up", { }, groups = {dig_immediate = 3, not_in_creative_inventory = 1}, drop = "mesecons:wire_00000000_off", - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, }, { tiles = {"mesecons_wire_off.png"}, mesecons = {conductor = { @@ -150,7 +150,7 @@ mesecon.register_node("mesecons_receiver:receiver_down", { }, groups = {dig_immediate = 3, not_in_creative_inventory = 1}, drop = "mesecons:wire_00000000_off", - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, }, { tiles = {"mesecons_wire_off.png"}, mesecons = {conductor = { diff --git a/mesecons_solarpanel/init.lua b/mesecons_solarpanel/init.lua index eb8e4da..84bbfd3 100644 --- a/mesecons_solarpanel/init.lua +++ b/mesecons_solarpanel/init.lua @@ -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_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, },{ groups = {dig_immediate = 3}, diff --git a/mesecons_stickyblocks/init.lua b/mesecons_stickyblocks/init.lua index f90b06c..622455a 100644 --- a/mesecons_stickyblocks/init.lua +++ b/mesecons_stickyblocks/init.lua @@ -15,5 +15,5 @@ minetest.register_node("mesecons_stickyblocks:sticky_block_all", { end return connected end, - sounds = mesecon.node_sound_wood_defaults, + sounds = mesecon.node_sound.wood, }) diff --git a/mesecons_switch/init.lua b/mesecons_switch/init.lua index 3151447..4d650b1 100644 --- a/mesecons_switch/init.lua +++ b/mesecons_switch/init.lua @@ -4,7 +4,7 @@ mesecon.register_node("mesecons_switch:mesecon_switch", { paramtype2="facedir", description="Switch", is_ground_content = false, - sounds = mesecon.node_sound_stone_defaults, + sounds = mesecon.node_sound.stone, on_rightclick = function (pos, node) if(mesecon.flipstate(pos, node) == "on") then mesecon.receptor_on(pos) diff --git a/mesecons_torch/init.lua b/mesecons_torch/init.lua index f7c2390..34f3c4d 100644 --- a/mesecons_torch/init.lua +++ b/mesecons_torch/init.lua @@ -64,7 +64,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_off", { selection_box = torch_selectionbox, groups = {dig_immediate = 3, not_in_creative_inventory = 1}, drop = "mesecons_torch:mesecon_torch_on", - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = {receptor = { state = mesecon.state.off, rules = torch_get_output_rules @@ -86,7 +86,7 @@ minetest.register_node("mesecons_torch:mesecon_torch_on", { groups = {dig_immediate=3}, light_source = minetest.LIGHT_MAX-5, description="Mesecon Torch", - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, mesecons = {receptor = { state = mesecon.state.on, rules = torch_get_output_rules diff --git a/mesecons_walllever/init.lua b/mesecons_walllever/init.lua index 1236f78..670dab5 100644 --- a/mesecons_walllever/init.lua +++ b/mesecons_walllever/init.lua @@ -15,7 +15,7 @@ mesecon.register_node("mesecons_walllever:wall_lever", { type = "fixed", 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) if(mesecon.flipstate(pos, node) == "on") then mesecon.receptor_on(pos, mesecon.rules.buttonlike_get(node)) diff --git a/mesecons_wires/init.lua b/mesecons_wires/init.lua index f6d12c3..21565ea 100644 --- a/mesecons_wires/init.lua +++ b/mesecons_wires/init.lua @@ -216,7 +216,7 @@ local function register_wires() walkable = false, drop = "mesecons:wire_00000000_off", mesecon_wire = true, - sounds = mesecon.node_sound_defaults, + sounds = mesecon.node_sound.default, on_rotate = false, }, {tiles = tiles_off, mesecons = meseconspec_off, groups = groups_off}, {tiles = tiles_on, mesecons = meseconspec_on, groups = groups_on})