From ee341d493d38e170a6540a4d836f37d94a10be1a Mon Sep 17 00:00:00 2001 From: unknown <24964441+wsor4035@users.noreply.github.com> Date: Sat, 5 Mar 2022 21:38:34 -0500 Subject: [PATCH] make sounds work --- decorative_tubes.lua | 8 ++++-- devices.lua | 64 ++++++++++++++++++++++++++++++++----------- filter-injector.lua | 4 ++- legacy.lua | 4 ++- lua_tube.lua | 8 ++++-- mod.conf | 2 +- pipes.lua | 8 ++++-- routing_tubes.lua | 4 ++- tube_registration.lua | 4 ++- wielder.lua | 4 ++- 10 files changed, 82 insertions(+), 28 deletions(-) diff --git a/decorative_tubes.lua b/decorative_tubes.lua index 2aebd7e..6b7f80d 100644 --- a/decorative_tubes.lua +++ b/decorative_tubes.lua @@ -16,7 +16,9 @@ minetest.register_node("pipeworks:steel_block_embedded_tube", { paramtype2 = "facedir", groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1}, legacy_facedir_simple = true, - --sounds = default.node_sound_stone_defaults(), + _sound_def = { + key = "node_sound_stone_defaults", + }, tube = { connect_sides = {front = 1, back = 1,}, priority = 50, @@ -70,7 +72,9 @@ minetest.register_node("pipeworks:steel_pane_embedded_tube", { paramtype2 = "facedir", groups = {cracky=1, oddly_breakable_by_hand = 1, tubedevice = 1}, legacy_facedir_simple = true, - --sounds = default.node_sound_stone_defaults(), + _sound_def = { + key = "node_sound_stone_defaults", + }, tube = { connect_sides = {front = 1, back = 1,}, priority = 50, diff --git a/devices.lua b/devices.lua index 887010f..4180292 100644 --- a/devices.lua +++ b/devices.lua @@ -148,7 +148,9 @@ for s in ipairs(states) do paramtype = "light", paramtype2 = "facedir", groups = dgroups, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, pipe_connections = { top = 1 }, after_place_node = function(pos) @@ -200,7 +202,9 @@ for s in ipairs(states) do fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 } }, groups = dgroups, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -248,7 +252,9 @@ minetest.register_node(nodename_valve_loaded, { fixed = { -5/16, -4/16, -8/16, 5/16, 5/16, 8/16 } }, groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -298,7 +304,9 @@ minetest.register_node("pipeworks:grating", { sunlight_propagates = true, paramtype = "light", groups = {snappy=3, pipe=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, pipe_connections = { top = 1 }, after_place_node = function(pos) @@ -323,7 +331,9 @@ minetest.register_node(nodename_spigot_empty, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, pipe_connections = { left=1, right=1, front=1, back=1, left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 }, @@ -358,7 +368,9 @@ minetest.register_node(nodename_spigot_loaded, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, pipe_connections = { left=1, right=1, front=1, back=1, left_param2 = 3, right_param2 = 1, front_param2 = 2, back_param2 = 0 }, @@ -414,7 +426,9 @@ minetest.register_node(nodename_panel_empty, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -434,7 +448,9 @@ minetest.register_node(nodename_panel_loaded, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -464,7 +480,9 @@ minetest.register_node(nodename_sensor_empty, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -503,7 +521,9 @@ minetest.register_node(nodename_sensor_loaded, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -570,7 +590,9 @@ for fill = 0, 10 do paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1, tankfill=fill+1, not_in_creative_inventory=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, drop = "pipeworks:storage_tank_0", pipe_connections = { top = 1, bottom = 1}, @@ -598,7 +620,9 @@ for fill = 0, 10 do paramtype = "light", paramtype2 = "facedir", groups = sgroups, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, drop = "pipeworks:storage_tank_0", pipe_connections = { top = 1, bottom = 1}, @@ -625,7 +649,9 @@ minetest.register_node(nodename_fountain_empty, { sunlight_propagates = true, paramtype = "light", groups = {snappy=3, pipe=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, pipe_connections = { bottom = 1 }, after_place_node = function(pos) @@ -660,7 +686,9 @@ minetest.register_node(nodename_fountain_loaded, { sunlight_propagates = true, paramtype = "light", groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, pipe_connections = { bottom = 1 }, after_place_node = function(pos) @@ -710,7 +738,9 @@ minetest.register_node(nodename_sp_empty, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) @@ -732,7 +762,9 @@ minetest.register_node(nodename_sp_loaded, { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3, pipe=1, not_in_creative_inventory=1}, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, on_place = pipeworks.rotate_on_place, after_dig_node = function(pos) diff --git a/filter-injector.lua b/filter-injector.lua index 56f998c..227072e 100644 --- a/filter-injector.lua +++ b/filter-injector.lua @@ -377,7 +377,9 @@ for _, data in ipairs({ paramtype2 = "facedir", groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, mesecon = 2}, legacy_facedir_simple = true, - --sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, on_construct = function(pos) local meta = minetest.get_meta(pos) set_filter_formspec(data, meta) diff --git a/legacy.lua b/legacy.lua index 72f8cb4..a426a62 100644 --- a/legacy.lua +++ b/legacy.lua @@ -27,7 +27,9 @@ if not minetest.get_modpath("auto_tree_tap") and is_ground_content = true, paramtype2 = "facedir", groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2, mesecon = 2,tubedevice=1, not_in_creative_inventory=1 }, - sounds = default.node_sound_stone_defaults(), + _sound_def = { + key = "node_sound_stone_defaults", + }, tube = {connect_sides={back=1}}, on_construct = function(pos) local meta = minetest.get_meta(pos) diff --git a/lua_tube.lua b/lua_tube.lua index c5fd24c..f157efd 100644 --- a/lua_tube.lua +++ b/lua_tube.lua @@ -918,7 +918,9 @@ for white = 0, 1 do node_box = node_box, on_construct = reset_meta, on_receive_fields = on_receive_fields, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, mesecons = mesecons, digiline = digiline, -- Virtual portstates are the ports that @@ -1028,7 +1030,9 @@ minetest.register_node(BASENAME .. "_burnt", { node_box = node_box, on_construct = reset_meta, on_receive_fields = on_receive_fields, - sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, virtual_portstates = {red = false, blue = false, yellow = false, green = false, black = false, white = false}, mesecons = { diff --git a/mod.conf b/mod.conf index 3452ab8..275785e 100644 --- a/mod.conf +++ b/mod.conf @@ -2,5 +2,5 @@ name = pipeworks description = This mod uses mesh nodes and nodeboxes to supply a complete set of 3D pipes and tubes, along with devices that work with them. #depends = default, basic_materials, screwdriver depends = basic_materials -optional_depends = mesecons, mesecons_mvps, digilines, signs_lib, unified_inventory, default, screwdriver, fl_mapgen +optional_depends = mesecons, mesecons_mvps, digilines, signs_lib, unified_inventory, default, screwdriver, fl_mapgen, sound_api min_minetest_version = 5.2.0 diff --git a/pipes.lua b/pipes.lua index d6e82a2..50eb9b1 100644 --- a/pipes.lua +++ b/pipes.lua @@ -76,7 +76,9 @@ for index, connects in ipairs(cconnects) do fixed = outsel }, groups = pgroups, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, drop = "pipeworks:pipe_1_empty", after_place_node = function(pos) @@ -110,7 +112,9 @@ for index, connects in ipairs(cconnects) do fixed = outsel }, groups = pgroups, - --sounds = default.node_sound_metal_defaults(), + _sound_def = { + key = "node_sound_metal_defaults", + }, walkable = true, drop = "pipeworks:pipe_1_empty", after_place_node = function(pos) diff --git a/routing_tubes.lua b/routing_tubes.lua index 7a9c98a..9fd3935 100644 --- a/routing_tubes.lua +++ b/routing_tubes.lua @@ -178,7 +178,9 @@ if pipeworks.enable_one_way_tube then node_box = {type = "fixed", fixed = {{-1/2, -9/64, -9/64, 1/2, 9/64, 9/64}}}, groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, tubedevice = 1}, - --sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, tube = { connect_sides = {left = 1, right = 1}, can_go = function(pos, node, velocity, stack) diff --git a/tube_registration.lua b/tube_registration.lua index 12a7941..c2d4799 100644 --- a/tube_registration.lua +++ b/tube_registration.lua @@ -102,7 +102,9 @@ local register_one_tube = function(name, tname, dropname, desc, plain, noctrs, e fixed = outboxes }, groups = tgroups, - --sounds = default.node_sound_wood_defaults(), + _sound_def = { + key = "node_sound_wood_defaults", + }, walkable = true, stack_max = 99, basename = name, diff --git a/wielder.lua b/wielder.lua index b86704f..47893a7 100644 --- a/wielder.lua +++ b/wielder.lua @@ -184,7 +184,9 @@ local function register_wielder(data) paramtype2 = "facedir", tubelike = 1, groups = groups, - --sounds = default.node_sound_stone_defaults(), + _sound_def = { + key = "node_sound_stone_defaults", + }, drop = data.name_base.."_off", on_construct = function(pos) local meta = minetest.get_meta(pos)