Merge remote-tracking branch 'upstream/master'

2021-08-31 19:59:22 +02:00 · 2021-08-31 19:59:22 +02:00 · eb231d7ca7
commit eb231d7ca7
parent 2fd4de11c0 3d7e7a82a5
14 changed files with 164 additions and 105 deletions
--- a/chest.lua
+++ b/chest.lua
@ -43,7 +43,7 @@ minetest.register_node("scifi_nodes:crate", {
 	groups = {cracky = 1, oddly_breakable_by_hand = 2, fuel = 8},
 	legacy_facedir_simple = true,
 	is_ground_content = false,
-	sounds = default.node_sound_wood_defaults(),
+	sounds = scifi_nodes.node_sound_wood_defaults(),

 	after_dig_node = drop_chest_stuff(),
 	on_construct = function(pos)
@ -82,7 +82,7 @@ minetest.register_node("scifi_nodes:box", {
 	groups = {cracky = 1},
 	legacy_facedir_simple = true,
 	is_ground_content = false,
-	sounds = default.node_sound_metal_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),

 	after_dig_node = drop_chest_stuff(),
 	on_construct = function(pos)
--- a/crafts.lua
+++ b/crafts.lua
@ -1,14 +1,24 @@
 -- CRAFTING RECIPES FOR SCIFI NODES

-- 6 basic plastic from 9 homedecor plastic sheet
-minetest.register_craft({
-	output = "scifi_nodes:white2 6",
-	recipe = {
-		{"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"},
-		{"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"},
-		{"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}
-	}
-})
+if minetest.get_modpath("basic_materials") then
+    -- 6 basic plastic from 9 homedecor plastic sheet
+    minetest.register_craft({
+        output = "scifi_nodes:white2 6",
+        recipe = {
+            {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"},
+            {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"},
+            {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}
+        }
+    })
+end
+
+if not minetest.get_modpath("default") or not minetest.get_modpath("dye") then
+    -- the default and dye mod are required for most of the recipes
+    -- if either of them is missing (because we are not in the default game)
+    -- then just skip the recipes entirely
+    -- TODO: potentially switch recipes depending on current game
+    return
+end

 minetest.register_craft({
 	output = "scifi_nodes:super_white",
--- a/digicode.lua
+++ b/digicode.lua
@ -129,7 +129,7 @@ minetest.register_node("scifi_nodes:digicode_on", {
 		}
 	},
 	on_timer = toggle_digicode,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:digicode_off", {
@ -152,7 +152,7 @@ minetest.register_node("scifi_nodes:digicode_off", {
 	},
 	after_place_node = set_owner,
 	on_rightclick = show_digicode_formspec,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_craft({
--- a/init.lua
+++ b/init.lua
@ -4,13 +4,22 @@ scifi_nodes = {}

 local MP = minetest.get_modpath("scifi_nodes")

+
+dofile(MP.."/sounds.lua")
+
 if minetest.get_modpath("xpanes") then
 	dofile(MP.."/panes.lua")
 end

 dofile(MP.."/common.lua")
-dofile(MP.."/builder.lua")
-dofile(MP.."/chest.lua")
+
+if minetest.get_modpath("default") then
+	-- only load builder and chest if the default mod is available
+	-- the formspecs depend on it
+	dofile(MP.."/builder.lua")
+	dofile(MP.."/chest.lua")
+end
+
 dofile(MP.."/plants.lua")
 dofile(MP.."/nodes.lua")
 dofile(MP.."/doors.lua")
--- a/mod.conf
+++ b/mod.conf
@ -1,4 +1,15 @@
 name = scifi_nodes
 description = Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
-depends = default,dye
-optional_depends = xpanes,mesecons,moreblocks,mesecons_microcontroller,mesecons_button,mesecons_torch,mesecons_receiver,basic_materials,unifieddyes
+optional_depends = """
+default,
+xpanes,
+mesecons,
+moreblocks,
+mesecons_microcontroller,
+mesecons_button,
+mesecons_torch,
+mesecons_receiver,
+basic_materials,
+dye,
+unifieddyes
+"""
--- a/models.lua
+++ b/models.lua
@ -39,7 +39,7 @@ end
 -- register some blocks in stairsplus if available (part of moreblocks)
 scifi_nodes.register_slope("white2", "Plastic", {"scifi_nodes_white2.png",}, 0)
 scifi_nodes.register_slope("super_white", "Super Plastic", {"scifi_nodes_super_white.png",}, 11)
-scifi_nodes.register_slope("ultra_white", "Super Plastic", {"scifi_nodes_ultra_white.png",}, default.LIGHT_MAX)
+scifi_nodes.register_slope("ultra_white", "Super Plastic", {"scifi_nodes_ultra_white.png",}, minetest.LIGHT_MAX)
 scifi_nodes.register_slope("black", "Black", {"scifi_nodes_black.png",}, 0)
 scifi_nodes.register_slope("white", "White", {"scifi_nodes_white.png",}, 0)
 scifi_nodes.register_slope("grey", "Grey", {"scifi_nodes_grey.png",}, 0)
@ -54,8 +54,8 @@ scifi_nodes.register_slope("holes", "Holes", {"scifi_nodes_holes.png",}, 0)
 scifi_nodes.register_slope("pipe", "Pipe", {"scifi_nodes_pipe.png",}, 0)
 scifi_nodes.register_slope("stripes", "Stripes", {"scifi_nodes_stripes.png",}, 0)
 scifi_nodes.register_slope("screen", "Screen", {"scifi_nodes_screen3.png",}, 5)
-scifi_nodes.register_slope("lightstripe", "Lightstripe", {"scifi_nodes_lightstripe.png",}, default.LIGHT_MAX)
-scifi_nodes.register_slope("blight2", "Blue Light 2", {"scifi_nodes_capsule3.png",}, default.LIGHT_MAX)
+scifi_nodes.register_slope("lightstripe", "Lightstripe", {"scifi_nodes_lightstripe.png",}, minetest.LIGHT_MAX)
+scifi_nodes.register_slope("blight2", "Blue Light 2", {"scifi_nodes_capsule3.png",}, minetest.LIGHT_MAX)
 scifi_nodes.register_slope("wallpipe", "Alien Pipe", {"scifi_nodes_wallpipe.png",}, 0)
 scifi_nodes.register_slope("alien", "Alien Wall", {"scifi_nodes_alnslp.png",}, 0)
 scifi_nodes.register_slope("purple", "Purple", {"scifi_nodes_purple.png",}, 0)
@ -74,7 +74,7 @@ node.types = {
 	{"holes",       "metal with holes"},
 	{"white2",      "plastic",},
 	{"super_white",      "Super Plastic", 11},
-	{"ultra_white",      "Ultra Plastic", default.LIGHT_MAX},
+	{"ultra_white",      "Ultra Plastic", minetest.LIGHT_MAX},
 --	{"engine",      "engine",          "engine"},
 	{"wall",      "metal wall"},
 	{"white",      "plastic wall"},
@ -139,10 +139,10 @@ node.types = {
 --	{"monitorwall",      "Wall monitors",       "monitorwall"},
 	{"screen3",      "Wall monitor"},
 	{"doomlight",      "Doom light",       12},
-	{"bluwllight",      "Blue wall light", default.LIGHT_MAX},
+	{"bluwllight",      "Blue wall light", minetest.LIGHT_MAX},
 	{"bluegrid",      "Blue Grid", 5},
 	{"fan",      "Fan"},
-	{"ppllght",      "Purple wall light", default.LIGHT_MAX},
+	{"ppllght",      "Purple wall light", minetest.LIGHT_MAX},
 	{"pplwll",      "Purple wall"},
 	{"pplwll2",      "Purple wall2"},
 	{"pplwll3",      "Purple wall3"},
--- a/nodeboxes.lua
+++ b/nodeboxes.lua
@ -32,7 +32,7 @@ minetest.register_node("scifi_nodes:alienslope", {
 			{-0.125, 0.375, -0.5, 0.5, 0.5, 0.5}, -- NodeBox17
 		}
 	},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = scifi_nodes.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node
 })

@ -62,7 +62,7 @@ minetest.register_node("scifi_nodes:wallpipe", {
 			{-0.5, -0.125, 0, 0.5, 0, 0.0625}, -- NodeBox24
 		}
 	},
-	sounds = default.node_sound_wood_defaults()
+	sounds = scifi_nodes.node_sound_wood_defaults()
 })

 minetest.register_node("scifi_nodes:plant_trap", {
@ -91,7 +91,7 @@ minetest.register_node("scifi_nodes:plant_trap", {
 			{-0.0625, -0.5, 0.3125, 0, 0.5, 0.375}, -- NodeBox28
 		}
 	},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = scifi_nodes.node_sound_wood_defaults(),
 })

 minetest.register_node("scifi_nodes:egg", {
@ -122,7 +122,7 @@ minetest.register_node("scifi_nodes:egg", {
 			{-0.125, 0.75, -0.125, 0.125, 0.8125, 0.125}, -- NodeBox8
 			{-0.375, -0.3125, -0.4375, 0.375, 0.3125, 0.4375}, -- NodeBox9
 		},
-	sounds = default.node_sound_wood_defaults()
+	sounds = scifi_nodes.node_sound_wood_defaults()
 	}
 })

@ -264,7 +264,7 @@ minetest.register_node("scifi_nodes:pad", {
 			{-0.875, -0.5, -0.8125, 0.8125, -0.375, 0.8125}, -- NodeBox3
 			{-0.8125, -0.5, -0.75, 0.75, -0.3125, 0.75}, -- NodeBox4
 		},
-	sounds = default.node_sound_wood_defaults()
+	sounds = scifi_nodes.node_sound_wood_defaults()
 	}
 })

@ -283,7 +283,7 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
 	groups = {cracky=3},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@ -304,7 +304,7 @@ minetest.register_node("scifi_nodes:gloshroom", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	walkable = false,
 	buildable_to = true,
 	sunlight_propagates = false,
@ -354,7 +354,7 @@ minetest.register_node("scifi_nodes:pot_lid", {
 			{-0.1875, -0.3125, -0.1875, 0.1875, -0.25, 0.1875}
 		}
 	},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 local function toggle_lid(pos, node, player, itemstack)
@ -407,7 +407,7 @@ minetest.register_node("scifi_nodes:pot", {
 	},
 	on_rightclick = toggle_lid,
 	on_destruct = remove_lid,
-	sounds = default.node_sound_metal_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 })

 minetest.register_node("scifi_nodes:pot2", {
@ -439,7 +439,7 @@ minetest.register_node("scifi_nodes:pot2", {
 	},
 	on_rightclick = toggle_lid,
 	on_destruct = remove_lid,
-	sounds = default.node_sound_metal_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 })

 minetest.register_node("scifi_nodes:lightbar", {
@ -451,7 +451,7 @@ minetest.register_node("scifi_nodes:lightbar", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	sunlight_propagates = true,
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@ -465,7 +465,7 @@ minetest.register_node("scifi_nodes:lightbar", {
 		}
 	},
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:light_dynamic", {
@ -488,9 +488,9 @@ minetest.register_node("scifi_nodes:light_dynamic", {
 		}
 	},
 	paramtype2 = "wallmounted",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:ladder", {
@ -520,7 +520,7 @@ minetest.register_node("scifi_nodes:ladder", {
 			{0.3125, -0.5, 0.0625, 0.4375, -0.375, 0.1875}, -- NodeBox25
 			{0.3125, -0.5, -0.1875, 0.4375, -0.375, -0.0625}, -- NodeBox26
 		},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 	},
 	paramtype2 = "wallmounted",
 	walkable = false,
@ -536,7 +536,7 @@ minetest.register_node("scifi_nodes:lightbars", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	use_texture_alpha = "blend",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@ -547,7 +547,7 @@ minetest.register_node("scifi_nodes:lightbars", {
 		}
 	},
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:liquid_pipe", {
@ -557,7 +557,7 @@ tiles = {{
 		animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.00},
 	}},
 	use_texture_alpha = "blend",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
@ -568,7 +568,7 @@ tiles = {{
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:liquid_pipe2", {
@ -577,7 +577,7 @@ tiles = {
 		"scifi_nodes_orange.png",
 	},
 	use_texture_alpha = "blend",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
@ -588,7 +588,7 @@ tiles = {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:powered_stand", {
@ -655,7 +655,7 @@ minetest.register_node("scifi_nodes:cover", {
 			{-0.3125, -0.375, -0.3125, 0.3125, -0.3125, 0.3125}, -- NodeBox6
 		}
 	},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = scifi_nodes.node_sound_wood_defaults(),
 	groups = {cracky=1, oddly_breakable_by_hand=1}
 })

@ -760,7 +760,7 @@ minetest.register_node("scifi_nodes:table", {
 			{-0.0625, 0.25, -0.125, 0.0625, 0.4375, -0.0625}, -- NodeBox7
 		}
 	},
-	sounds = default.node_sound_metal_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 	groups = {cracky=1}
 })

@ -876,7 +876,7 @@ minetest.register_node("scifi_nodes:windowcorner", {
 	},
 	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:windowstraight", {
@ -903,7 +903,7 @@ minetest.register_node("scifi_nodes:windowstraight", {
 	},
 	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:windowcorner2", {
@ -934,7 +934,7 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 	},
 	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:windowstraight2", {
@ -961,7 +961,7 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 	},
 	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })


@ -990,7 +990,7 @@ minetest.register_node("scifi_nodes:capsule", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule2", param2=node.param2})
 	end,
@ -1020,7 +1020,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule", param2=node.param2})
 	end,
@ -1050,7 +1050,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule3", param2=node.param2})
 	end,
@ -1080,7 +1080,7 @@ minetest.register_node("scifi_nodes:itemholder", {
 		}
 	},
 	groups = {cracky=1},
-	on_rotate = screwdriver.disallow,
+	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner",placer:get_player_name())
@ -1128,7 +1128,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
@ -1138,7 +1138,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })


@ -1221,5 +1221,5 @@ minetest.register_node("scifi_nodes:windowpanel", {
    },
    groups = {cracky=1},
    on_place = minetest.rotate_node,
-    sounds = default.node_sound_glass_defaults(),
+    sounds = scifi_nodes.node_sound_glass_defaults(),
 })
--- a/nodes.lua
+++ b/nodes.lua
@ -35,7 +35,7 @@ minetest.register_node("scifi_nodes:rfloor", {
 	paramtype2 = "facedir",
 	light_source = 10,
 	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })

 minetest.register_node("scifi_nodes:bfloor", {
@ -47,7 +47,7 @@ minetest.register_node("scifi_nodes:bfloor", {
 	paramtype2 = "facedir",
 	light_source = 10,
 	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })


@ -64,7 +64,7 @@ minetest.register_node("scifi_nodes:stripes2", {
 	},
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })

 minetest.register_node("scifi_nodes:gblock", {
@ -80,7 +80,7 @@ minetest.register_node("scifi_nodes:gblock", {
 	},
 	paramtype = "light",
 	groups = {cracky=1};
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })

 minetest.register_node("scifi_nodes:gblock2", {
@ -97,7 +97,7 @@ minetest.register_node("scifi_nodes:gblock2", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })

 minetest.register_node("scifi_nodes:gblock3", {
@ -114,7 +114,7 @@ minetest.register_node("scifi_nodes:gblock3", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })


@ -133,7 +133,7 @@ minetest.register_node("scifi_nodes:green_light", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:red_light", {
@ -150,7 +150,7 @@ minetest.register_node("scifi_nodes:red_light", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:discs", {
@ -166,7 +166,7 @@ minetest.register_node("scifi_nodes:discs", {
 	},
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:disc", {
@ -196,7 +196,7 @@ minetest.register_node("scifi_nodes:greenbar_animated", {
 	paramtype2 = "facedir",
 	groups = {cracky=1},
 	light_source = 10,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })

@ -210,7 +210,7 @@ minetest.register_node("scifi_nodes:blink", {
 	paramtype = "light",
 	groups = {cracky=1},
 	light_source = 5,
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:black_lights", {
@ -222,7 +222,7 @@ minetest.register_node("scifi_nodes:black_lights", {
 	}},
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:black_screen", {
@ -235,7 +235,7 @@ minetest.register_node("scifi_nodes:black_screen", {
 	paramtype = "light",
 	groups = {cracky=1},
 	light_source = 1,
-	sounds = default.node_sound_stone_defaults()
+	sounds = scifi_nodes.node_sound_stone_defaults()
 })

 minetest.register_node("scifi_nodes:screen", {
@ -248,7 +248,7 @@ minetest.register_node("scifi_nodes:screen", {
 	paramtype = "light",
 	groups = {cracky=1},
 	light_source = 5,
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:screen2", {
@ -261,7 +261,7 @@ minetest.register_node("scifi_nodes:screen2", {
 	paramtype = "light",
 	groups = {cracky=1},
 	light_source = 5,
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })


@ -280,7 +280,7 @@ minetest.register_node("scifi_nodes:white_pad", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:white_base", {
@ -297,7 +297,7 @@ minetest.register_node("scifi_nodes:white_base", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:grnpipe", {
@ -314,7 +314,7 @@ minetest.register_node("scifi_nodes:grnpipe", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })

@ -333,7 +333,7 @@ minetest.register_node("scifi_nodes:grnpipe2", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })

@ -349,7 +349,7 @@ minetest.register_node("scifi_nodes:octrng", {
 	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:octgrn", {
@ -364,7 +364,7 @@ minetest.register_node("scifi_nodes:octgrn", {
 	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:octbl", {
@ -379,7 +379,7 @@ minetest.register_node("scifi_nodes:octbl", {
 	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:octppl", {
@ -394,7 +394,7 @@ minetest.register_node("scifi_nodes:octppl", {
 	use_texture_alpha = "blend",
 	light_source = 10,
 	groups = {cracky=2},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:tower", {
@ -409,7 +409,7 @@ minetest.register_node("scifi_nodes:tower", {
 	inventory_image = "scifi_nodes_tower.png",
 	paramtype = "light",
 	groups = {cracky=2},
-	sounds = default.node_sound_metal_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })

 minetest.register_node("scifi_nodes:junk", {
@ -444,7 +444,7 @@ minetest.register_node("scifi_nodes:blumetlight", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })


@ -454,10 +454,10 @@ minetest.register_node("scifi_nodes:lightstp", {
 	tiles = {
 		"scifi_nodes_lightstripe.png"
 	},
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:blklt2", {
@ -469,7 +469,7 @@ minetest.register_node("scifi_nodes:blklt2", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:blumetstr", {
@ -481,7 +481,7 @@ minetest.register_node("scifi_nodes:blumetstr", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:glass", {
@ -494,7 +494,7 @@ minetest.register_node("scifi_nodes:glass", {
 	use_texture_alpha = "blend",
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:whtlightbnd", {
@ -506,7 +506,7 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 --edited wool code (Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>)
@ -522,7 +522,7 @@ local nodetypes = {
 	{"holes",       "metal with holes","holes"},
 	{"white2",      "plastic",         "white2", 0, true},
    {"super_white",      "Super Plastic",         "super_white", 11},
-    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
+    {"ultra_white",      "Ultra Plastic",         "ultra_white", minetest.LIGHT_MAX},
 	{"engine",      "engine",          "engine"},
 	{"wall",      "metal wall",        "wall"},
 	{"white",      "plastic wall",     "white", 0, true},
@ -587,10 +587,10 @@ local nodetypes = {
 	{"monitorwall",      "Wall monitors",       "monitorwall"},
 	{"screen3",      "Wall monitor",       "screen3"},
 	{"doomlight",      "Doom light",       "doomlight", 12},
-	{"bluwllight",      "Blue wall light", "capsule3", default.LIGHT_MAX},
+	{"bluwllight",      "Blue wall light", "capsule3", minetest.LIGHT_MAX},
 	{"bluegrid",      "Blue Grid", "bluegrid", 5},
 	{"fan",      "Fan",       "fan"},
-	{"ppllght",      "Purple wall light", "", default.LIGHT_MAX},
+	{"ppllght",      "Purple wall light", "", minetest.LIGHT_MAX},
 	{"pplwll",      "Purple wall", "", 0},
 	{"pplwll2",      "Purple wall2", "", 0},
 	{"pplwll3",      "Purple wall3", "", 0},
@ -619,7 +619,7 @@ for _, row in ipairs(nodetypes) do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		light_source = light,
-		sounds = default.node_sound_glass_defaults()
+		sounds = scifi_nodes.node_sound_glass_defaults()
 	}

 	if is_colorable and has_unifieddyes_mod then
@ -646,7 +646,7 @@ for _, row in ipairs(nodetypes) do
 			paramtype = "light",
 			paramtype2 = "color",
 			light_source = light,
-			sounds = default.node_sound_glass_defaults(),
+			sounds = scifi_nodes.node_sound_glass_defaults(),
 			on_construct = unifieddyes.on_construct,
 			on_dig = unifieddyes.on_dig
 		})
--- a/octagon_panes.lua
+++ b/octagon_panes.lua
@ -27,7 +27,7 @@ local function register(basename, description, texture)
    },
    groups = {cracky = 3, oddly_breakable_by_hand = 3},
    use_texture_alpha = "blend",
-    sounds = default.node_sound_glass_defaults()
+    sounds = scifi_nodes.node_sound_glass_defaults()
  })

  -- double height
@ -52,7 +52,7 @@ local function register(basename, description, texture)
    },
    groups = {cracky = 3, oddly_breakable_by_hand = 3},
    use_texture_alpha = "blend",
-    sounds = default.node_sound_glass_defaults()
+    sounds = scifi_nodes.node_sound_glass_defaults()
  })

  -- single height with offset
@ -77,7 +77,7 @@ local function register(basename, description, texture)
    },
    groups = {cracky = 3, oddly_breakable_by_hand = 3},
    use_texture_alpha = "blend",
-    sounds = default.node_sound_glass_defaults()
+    sounds = scifi_nodes.node_sound_glass_defaults()
  })

  -- register recipes
--- a/palm_scanner.lua
+++ b/palm_scanner.lua
@ -65,7 +65,7 @@ minetest.register_node("scifi_nodes:palm_scanner_off", {
 		}
 	},
 	on_rightclick = (has_mesecons and activate_palm_scanner),
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_node("scifi_nodes:palm_scanner_checking", {
@ -83,7 +83,7 @@ minetest.register_node("scifi_nodes:palm_scanner_checking", {
 	paramtype2 = "wallmounted",
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
 	drop = "scifi_nodes:palm_scanner_off",
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })

 minetest.register_node("scifi_nodes:palm_scanner_on", {
@ -106,7 +106,7 @@ minetest.register_node("scifi_nodes:palm_scanner_on", {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })

 minetest.register_craft({
--- a/plants.lua
+++ b/plants.lua
@ -1,11 +1,11 @@

 local plants = {
-	{"flower1", "Glow Flower", 1,0, default.LIGHT_MAX},
+	{"flower1", "Glow Flower", 1,0, minetest.LIGHT_MAX},
 	{"flower2", "Pink Flower", 1.5,0, 10},
 	{"flower3", "Triffid", 2,5, 0},
 	{"flower4", "Weeping flower", 1.5,0, 0},
 	{"plant1", "Bulb Plant", 1,0, 0},
-	{"plant2", "Trap Plant", 1.5,0, default.LIGHT_MAX},
+	{"plant2", "Trap Plant", 1.5,0, minetest.LIGHT_MAX},
 	{"plant3", "Blue Jelly Plant", 1.2,0, 10},
 	{"plant4", "Green Jelly Plant", 1.2,0, 10},
 	{"plant5", "Fern Plant", 1.7,0, 0},
--- a/protected_switch.lua
+++ b/protected_switch.lua
@ -51,7 +51,7 @@ minetest.register_node("scifi_nodes:protected_switch_on", {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch),
 	on_timer = (has_mesecons and toggle_switch)
 })
@ -78,7 +78,7 @@ minetest.register_node("scifi_nodes:protected_switch_off", {
 			state = (has_mesecons and mesecon.state.off)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })

--- a/sounds.lua
+++ b/sounds.lua
@ -0,0 +1,29 @@
+-- sound definitions
+
+function scifi_nodes.node_sound_wood_defaults()
+    if minetest.get_modpath("default") then
+        -- default game
+        return default.node_sound_wood_defaults()
+    end
+end
+
+function scifi_nodes.node_sound_glass_defaults()
+    if minetest.get_modpath("default") then
+        -- default game
+        return default.node_sound_glass_defaults()
+    end
+end
+
+function scifi_nodes.node_sound_metal_defaults()
+    if minetest.get_modpath("default") then
+        -- default game
+        return default.node_sound_metal_defaults()
+    end
+end
+
+function scifi_nodes.node_sound_stone_defaults()
+    if minetest.get_modpath("default") then
+        -- default game
+        return default.node_sound_stone_defaults()
+    end
+end
--- a/switch.lua
+++ b/switch.lua
@ -44,7 +44,7 @@ minetest.register_node("scifi_nodes:switch_on", {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch),
 	on_timer = (has_mesecons and toggle_switch)
 })
@ -71,7 +71,7 @@ minetest.register_node("scifi_nodes:switch_off", {
 			state = (has_mesecons and mesecon.state.off)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })