Merge remote-tracking branch 'upstream/master'

And optimize textures with optipng

.luacheckrc

@@ -1,5 +1,4 @@
 unused_args = false
-max_line_length = 180
 
 globals = {
 	"scifi_nodes"
@@ -21,6 +20,6 @@ read_globals = {
 	"screwdriver",
 	"minetest",
 	"mesecon",
-	"unifieddyes",
-	"letters"
+	"unifieddyes"
+
 }

README.md

@@ -38,7 +38,6 @@ CC BY 3.0
 * scifi_nodes_palm_scanner.ogg https://freesound.org/people/THE_bizniss/sounds/39313/
 * scifi_nodes_access_granted https://freesound.org/people/TheBuilder15/sounds/415762/
 * scifi_nodes_access_refused https://freesound.org/people/RICHERlandTV/sounds/216090/
-* scifi_nodes_forcefield.png https://github.com/minetest-mods/technic/
 
 CC0
 * scifi_nodes_digicode.ogg https://freesound.org/people/benjaminharveydesign/sounds/315921/
@@ -56,4 +55,3 @@ CC0
 * OgelGames https://github.com/OgelGames
 * leftshift https://github.com/leftshift
 * fluxionary https://github.com/fluxionary
-* Niles Corder https://github.com/ncorder

builder.lua

@@ -105,6 +105,5 @@ minetest.register_node("scifi_nodes:builder", {
 	end,
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })

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 = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.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 = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_metal_defaults(),
 
 	after_dig_node = drop_chest_stuff(),
 	on_construct = function(pos)

crafts.lua

@@ -1,38 +1,14 @@
 -- CRAFTING RECIPES FOR SCIFI NODES
 
-if minetest.get_modpath("basic_materials") then
-    -- 6 basic plastic from 9 homedecor plastic sheet
-    minetest.register_craft({
+-- 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.settings:get_bool("scifi_nodes.teleporter_enable_crafting", false) then
-        -- enable the teleporter pad crafting recipe only if the setting is enabled
-        minetest.register_craft({
-            output = "scifi_nodes:pad",
-            recipe = {
-                {"homedecor:plastic_sheeting", "quartz:block", "homedecor:plastic_sheeting"},
-                {"default:mese_crystal", "quartz:block", "default:mese_crystal"},
-                {"homedecor:plastic_sheeting", "quartz:block", "homedecor:plastic_sheeting"}
-            }
-        })
-    end
-
-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",
@@ -1486,9 +1462,9 @@ minetest.register_craft({
 minetest.register_craft({
     output = "scifi_nodes:plant8",
     recipe = {
-        {"flowers:viola","default:junglegrass", "default:grass_1"},
-        {"default:dirt","",""},
-        {"scifi_nodes:greybolts","",""}
+        {"flowers:viola","default:junglegrass"},
+        {"default:dirt",""},
+        {"scifi_nodes:greybolts",""}
     }
 })
 
@@ -1635,6 +1611,15 @@ minetest.register_craft({
     }
 })
 
+minetest.register_craft({
+    output = 'scifi_nodes:doomwall43 6',
+    recipe = {
+        {"scifi_nodes:white","dye:black","scifi_nodes:white"},
+        {"scifi_nodes:black","dye:dark_green","scifi_nodes:black"},
+        {"scifi_nodes:white","dye:yellow","scifi_nodes:white"}
+    }
+})
+
 minetest.register_craft({
     output = 'scifi_nodes:doomwall43 6',
     recipe = {

depends.txt

@@ -0,0 +1,10 @@
+default
+basic_materials
+mesecons
+xpanes?
+moreblocks?
+mesecons_microcontroller?
+mesecons_button?
+mesecons_torch?
+mesecons_receiver?
+dye?

digicode.lua

@@ -129,7 +129,7 @@ minetest.register_node("scifi_nodes:digicode_on", {
 		}
 	},
 	on_timer = toggle_digicode,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.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 = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_craft({

doors.lua

@@ -257,7 +257,6 @@ for _, current_door in ipairs(doors) do
 		on_place = onplace,
 		after_destruct = afterdestruct,
 		on_rightclick = doors_rightclick,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 
 	minetest.register_node(closed_top, {
@@ -272,7 +271,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {cracky = 1, dig_generic = 3},
+		groups = {cracky = 1},
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -286,7 +285,6 @@ for _, current_door in ipairs(doors) do
 			}
 		},
 		can_dig = nodig,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 
 	minetest.register_node(opened, {
@@ -302,7 +300,7 @@ for _, current_door in ipairs(doors) do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		drop = closed,
-		groups = {cracky = 1, dig_generic = 3},
+		groups = {cracky = 1},
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -318,7 +316,6 @@ for _, current_door in ipairs(doors) do
 		after_place_node = afterplace,
 		after_destruct = afterdestruct,
 		on_timer = ontimer,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 
 	minetest.register_node(opened_top, {
@@ -333,7 +330,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {cracky = 1, dig_generic = 3},
+		groups = {cracky = 1},
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -347,6 +344,5 @@ for _, current_door in ipairs(doors) do
 			}
 		},
 		can_dig = nodig,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 end     -- end of doors table browsing

forcefield.lua

@@ -1,20 +0,0 @@
-minetest.register_node("scifi_nodes:forcefield", {
-	description = "Forcefield",
-	sunlight_propagates = true,
-	drawtype = "glasslike",
-	groups = {},
-	paramtype = "light",
-	light_source = minetest.LIGHT_MAX,
-	diggable = false,
-	drop = '',
-	tiles = {{
-		name = "scifi_nodes_forcefield.png",
-		animation = {
-			type = "vertical_frames",
-			aspect_w = 16,
-			aspect_h = 16,
-			length = 1.0,
-		}
-	}},
-	on_blast = function() end,
-})

init.lua

@@ -4,22 +4,13 @@ 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")
-
-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.."/builder.lua")
+dofile(MP.."/chest.lua")
 dofile(MP.."/plants.lua")
 dofile(MP.."/nodes.lua")
 dofile(MP.."/doors.lua")
@@ -30,10 +21,5 @@ dofile(MP.."/palm_scanner.lua")
 dofile(MP.."/digicode.lua")
 dofile(MP.."/models.lua")
 dofile(MP.."/octagon_panes.lua")
-dofile(MP.."/forcefield.lua")
 dofile(MP.."/crafts.lua")
-
-if minetest.get_modpath("letters") then
-	-- register letter nodes
-	dofile(MP.."/letters.lua")
-end
+minetest.log("action", "[scifi_nodes] loaded.")

letters.lua

@@ -1,5 +0,0 @@
-letters.register_letters("scifi_nodes", "black", "scifi_nodes:black", "Black wall", "scifi_nodes_black.png")
-letters.register_letters("scifi_nodes", "white2", "scifi_nodes:white2", "Plastic", "scifi_nodes_white2.png")
-letters.register_letters("scifi_nodes", "purple", "scifi_nodes:purple", "Purple node", "scifi_nodes_purple.png")
-letters.register_letters("scifi_nodes", "bluemetal", "scifi_nodes:bluemetal", "Blue metal", "scifi_nodes_bluemetal.png")
-letters.register_letters("scifi_nodes", "greenmetal", "scifi_nodes:greenmetal", "Green metal", "scifi_nodes_greenmetal.png")

mod.conf

@@ -1,16 +1,4 @@
 name = scifi_nodes
 description = Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
-optional_depends = """
-default,
-xpanes,
-mesecons,
-moreblocks,
-mesecons_microcontroller,
-mesecons_button,
-mesecons_torch,
-mesecons_receiver,
-basic_materials,
-dye,
-unifieddyes,
-letters
-"""
+depends = default,dye
+optional_depends = xpanes,mesecons,moreblocks,mesecons_microcontroller,mesecons_button,mesecons_torch,mesecons_receiver,basic_materials,unifieddyes

models.lua

@@ -2,13 +2,7 @@
 --Copyright (c) 2011-2015 Calinou and contributors.
 --Licensed under the zlib license.
 
-function scifi_nodes.register_slope(name, desc, texture, light, soundtype)
-local sounds
-if soundtype == "stone" then
-	sounds = scifi_nodes.node_sound_stone_defaults()
-else
-	sounds = scifi_nodes.node_sound_metal_defaults()
-end
+function scifi_nodes.register_slope(name, desc, texture, light)
 minetest.register_node("scifi_nodes:slope_"..name, {
 	description = desc.." Slope",
 	sunlight_propagates = false,
@@ -37,16 +31,15 @@ minetest.register_node("scifi_nodes:slope_"..name, {
 	paramtype2 = "facedir",
 	use_texture_alpha = "clip",
 	light_source = light,
-	groups = {cracky=1, dig_generic = 3},
-	on_place = minetest.rotate_node,
-	sounds = sounds,
+	groups = {cracky=1},
+	on_place = minetest.rotate_node
 })
 end
 
 -- register some blocks in stairsplus if available (part of moreblocks)
-scifi_nodes.register_slope("white2", "Plastic", {"scifi_nodes_white2.png",}, 0, "stone")
-scifi_nodes.register_slope("super_white", "Super Plastic", {"scifi_nodes_super_white.png",}, 11, "stone")
-scifi_nodes.register_slope("ultra_white", "Super Plastic", {"scifi_nodes_ultra_white.png",}, minetest.LIGHT_MAX, "stone")
+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("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)
@@ -61,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",}, minetest.LIGHT_MAX)
-scifi_nodes.register_slope("blight2", "Blue Light 2", {"scifi_nodes_capsule3.png",}, minetest.LIGHT_MAX)
+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("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)
@@ -80,8 +73,8 @@ node.types = {
 	{"blue",      "blue lines"},
 	{"holes",       "metal with holes"},
 	{"white2",      "plastic",},
-	{"super_white",      "Super Plastic", 11, "stone"},
-	{"ultra_white",      "Ultra Plastic", minetest.LIGHT_MAX},
+	{"super_white",      "Super Plastic", 11},
+	{"ultra_white",      "Ultra Plastic", default.LIGHT_MAX},
 --	{"engine",      "engine",          "engine"},
 	{"wall",      "metal wall"},
 	{"white",      "plastic wall"},
@@ -146,18 +139,18 @@ node.types = {
 --	{"monitorwall",      "Wall monitors",       "monitorwall"},
 	{"screen3",      "Wall monitor"},
 	{"doomlight",      "Doom light",       12},
-	{"bluwllight",      "Blue wall light", minetest.LIGHT_MAX},
+	{"bluwllight",      "Blue wall light", default.LIGHT_MAX},
 	{"bluegrid",      "Blue Grid", 5},
 	{"fan",      "Fan"},
-	{"ppllght",      "Purple wall light", minetest.LIGHT_MAX},
+	{"ppllght",      "Purple wall light", default.LIGHT_MAX},
 	{"pplwll",      "Purple wall"},
 	{"pplwll2",      "Purple wall2"},
 	{"pplwll3",      "Purple wall3"},
 	{"pplwll4",      "Purple wall4"},
 	{"pplblk",      "Purple tile"},
 	{"purple",      "Purple node"},
-	{"rock",      "Moonstone", nil, "stone"},
-	{"rock2",      "Moonstone2", nil, "stone"},
+	{"rock",      "Moonstone"},
+	{"rock2",      "Moonstone2"},
 	{"blackvnt",      "Black vent"},
 	{"blackplate",      "Black plate"},
 }
@@ -165,24 +158,16 @@ node.types = {
 if minetest.global_exists("stairsplus") then
 	for _, row in ipairs(node.types) do
 		local name = row[1]
-		local soundtype = row[4]
-		local sounds
-		if soundtype == "stone" then
-			sounds = scifi_nodes.node_sound_stone_defaults()
-		else
-			sounds = scifi_nodes.node_sound_metal_defaults()
-		end
 
 		-- Node Definition
 		stairsplus:register_all("scifi_nodes", name, "scifi_nodes:"..name, {
 			description = row[2],
 			tiles = {"scifi_nodes_"..name..".png"},
 			use_texture_alpha = "clip",
-			groups = {cracky=1, dig_generic = 3},
+			groups = {cracky=1},
 			paramtype = "light",
 			paramtype2 = "facedir",
 			light_source = row[3],
-			sounds = sounds,
 		})
 	end
 end

nodeboxes.lua

@@ -18,7 +18,7 @@ minetest.register_node("scifi_nodes:alienslope", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -32,7 +32,7 @@ minetest.register_node("scifi_nodes:alienslope", {
 			{-0.125, 0.375, -0.5, 0.5, 0.5, 0.5}, -- NodeBox17
 		}
 	},
-	sounds = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -49,7 +49,7 @@ minetest.register_node("scifi_nodes:wallpipe", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -62,7 +62,7 @@ minetest.register_node("scifi_nodes:wallpipe", {
 			{-0.5, -0.125, 0, 0.5, 0, 0.0625}, -- NodeBox24
 		}
 	},
-	sounds = scifi_nodes.node_sound_wood_defaults()
+	sounds = default.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 = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("scifi_nodes:egg", {
@@ -107,7 +107,7 @@ minetest.register_node("scifi_nodes:egg", {
 	sunlight_propagates = false,
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky=1, oddly_breakable_by_hand=1, dig_immediate=2, falling_node=1, dig_generic = 3},
+	groups = {cracky=1, oddly_breakable_by_hand=1, dig_immediate=2, falling_node=1},
 	light_source = 5,
 	node_box = {
 		type = "fixed",
@@ -122,8 +122,8 @@ 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 = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults()
+	}
 })
 
 if minetest.get_modpath("scifi_mobs") then
@@ -264,8 +264,8 @@ 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 = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_wood_defaults()
+	}
 })
 
 minetest.register_node("scifi_nodes:pplwndw", {
@@ -282,8 +282,8 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
-	groups = {cracky=3, dig_generic = 4},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=3},
+	sounds = default.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 = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	walkable = false,
 	buildable_to = true,
 	sunlight_propagates = false,
@@ -320,8 +320,7 @@ minetest.register_node("scifi_nodes:gloshroom", {
 			{-0.1875, 0.125, -0.1875, 0.1875, 0.1875, 0.1875}, -- NodeBox5
 			{-0.375, -0.0625, -0.4375, 0.375, 0, 0.4375}, -- NodeBox6
 		}
-	},
-	sounds = scifi_nodes.node_sound_plant_defaults(),
+	}
 })
 
 minetest.register_node("scifi_nodes:pot_lid", {
@@ -355,7 +354,7 @@ minetest.register_node("scifi_nodes:pot_lid", {
 			{-0.1875, -0.3125, -0.1875, 0.1875, -0.25, 0.1875}
 		}
 	},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 local function toggle_lid(pos, node, player, itemstack)
@@ -379,13 +378,10 @@ local function remove_lid(pos)
 	end
 end
 
-local dirt_tex = "default_dirt.png"
-if not minetest.get_modpath("default") then dirt_tex = "[combine:16x16^[noalpha^[colorize:#654321" end
-
 minetest.register_node("scifi_nodes:pot", {
 	description = "Metal Plant Pot (right-click for lid, sneak + right-click to plant)",
 	tiles = {
-		dirt_tex .. "^scifi_nodes_pot.png",
+		"default_dirt.png^scifi_nodes_pot.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@@ -394,7 +390,7 @@ minetest.register_node("scifi_nodes:pot", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky = 1, soil = 1, sand = 1, dig_generic = 3},
+	groups = {cracky = 1, soil = 1, sand = 1},
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
@@ -411,15 +407,13 @@ minetest.register_node("scifi_nodes:pot", {
 	},
 	on_rightclick = toggle_lid,
 	on_destruct = remove_lid,
-	sounds = scifi_nodes.node_sound_metal_defaults({
-		footstep = scifi_nodes.node_sound_dirt_defaults().footstep,
-	}),
+	sounds = default.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:pot2", {
 	description = "Metal Plant Pot Wet (right-click for lid, sneak + right-click to plant)",
 	tiles = {
-		dirt_tex .. "^scifi_nodes_pot2.png",
+		"default_dirt.png^scifi_nodes_pot2.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@@ -428,7 +422,7 @@ minetest.register_node("scifi_nodes:pot2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky = 1, soil = 3, wet = 1, dig_generic = 3},
+	groups = {cracky = 1, soil = 3, wet = 1},
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
@@ -445,9 +439,7 @@ minetest.register_node("scifi_nodes:pot2", {
 	},
 	on_rightclick = toggle_lid,
 	on_destruct = remove_lid,
-	sounds = scifi_nodes.node_sound_metal_defaults({
-		footstep = scifi_nodes.node_sound_dirt_defaults().footstep,
-	}),
+	sounds = default.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:lightbar", {
@@ -459,7 +451,7 @@ minetest.register_node("scifi_nodes:lightbar", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	sunlight_propagates = true,
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -472,8 +464,8 @@ minetest.register_node("scifi_nodes:lightbar", {
 			{-0.125, -0.5, -0.5, 0.125, -0.375, 0.5}, -- NodeBox1
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:light_dynamic", {
@@ -496,9 +488,9 @@ minetest.register_node("scifi_nodes:light_dynamic", {
 		}
 	},
 	paramtype2 = "wallmounted",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:ladder", {
@@ -528,8 +520,8 @@ 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,
 	climbable = true,
@@ -544,7 +536,7 @@ minetest.register_node("scifi_nodes:lightbars", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	use_texture_alpha = "blend",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -554,8 +546,8 @@ minetest.register_node("scifi_nodes:lightbars", {
 			{0.125, -0.5, -0.375, 0.375, 0.5, -0.125}, -- NodeBox4
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:liquid_pipe", {
@@ -565,27 +557,7 @@ tiles = {{
 		animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.00},
 	}},
 	use_texture_alpha = "blend",
-	light_source = minetest.LIGHT_MAX,
-	drawtype = "nodebox",
-	sunlight_propagates = true,
-	paramtype = "light",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.375, -0.5, -0.375, 0.375, 0.5, 0.375}, -- NodeBox1
-		}
-	},
-	groups = {cracky=1, oddly_breakable_by_hand=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
-})
-
-minetest.register_node("scifi_nodes:liquid_pipe2", {
-	description = "Liquid pipe 2",
-tiles = {
-		"scifi_nodes_orange.png",
-	},
-	use_texture_alpha = "blend",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
@@ -596,7 +568,27 @@ tiles = {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
+})
+
+minetest.register_node("scifi_nodes:liquid_pipe2", {
+	description = "Liquid pipe 2",
+tiles = {
+		"scifi_nodes_orange.png",
+	},
+	use_texture_alpha = "blend",
+	light_source = default.LIGHT_MAX,
+	drawtype = "nodebox",
+	sunlight_propagates = true,
+	paramtype = "light",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.375, -0.5, -0.375, 0.375, 0.5, 0.375}, -- NodeBox1
+		}
+	},
+	groups = {cracky=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:powered_stand", {
@@ -641,7 +633,6 @@ minetest.register_node("scifi_nodes:powered_stand", {
 			return item
 		end
 	end,
-	sounds = scifi_nodes.node_sound_wood_defaults()
 })
 
 minetest.register_node("scifi_nodes:cover", {
@@ -664,7 +655,7 @@ minetest.register_node("scifi_nodes:cover", {
 			{-0.3125, -0.375, -0.3125, 0.3125, -0.3125, 0.3125}, -- NodeBox6
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	groups = {cracky=1, oddly_breakable_by_hand=1}
 })
 
@@ -688,8 +679,7 @@ minetest.register_node("scifi_nodes:computer", {
 			{-0.4375, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox1
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })
 
 minetest.register_node("scifi_nodes:keysmonitor", {
@@ -715,8 +705,7 @@ minetest.register_node("scifi_nodes:keysmonitor", {
 			{-0.5, -0.3125, 0.25, 0.5, 0.5, 0.375}, -- NodeBox4
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })
 
 minetest.register_node("scifi_nodes:microscope", {
@@ -743,8 +732,7 @@ minetest.register_node("scifi_nodes:microscope", {
 			{-0.125, -0.25, -0.125, 0.125, -0.1875, 0.1875}, -- NodeBox5
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })
 
 minetest.register_node("scifi_nodes:table", {
@@ -772,8 +760,8 @@ minetest.register_node("scifi_nodes:table", {
 			{-0.0625, 0.25, -0.125, 0.0625, 0.4375, -0.0625}, -- NodeBox7
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
-	groups = {cracky=1, dig_generic = 3}
+	sounds = default.node_sound_metal_defaults(),
+	groups = {cracky=1}
 })
 
 minetest.register_node("scifi_nodes:laptop_open", {
@@ -801,7 +789,6 @@ minetest.register_node("scifi_nodes:laptop_open", {
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:laptop_closed", param2=node.param2})
 	end,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:laptop_closed", {
@@ -828,7 +815,6 @@ minetest.register_node("scifi_nodes:laptop_closed", {
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:laptop_open", param2=node.param2})
 	end,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:pipen", {
@@ -858,9 +844,8 @@ minetest.register_node("scifi_nodes:pipen", {
 			{-0.5, -0.4375, -0.5, 0.5, -0.375, 0.5}, -- NodeBox9
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
-	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1},
+	on_place = minetest.rotate_node
 })
 
 minetest.register_node("scifi_nodes:windowcorner", {
@@ -889,9 +874,9 @@ minetest.register_node("scifi_nodes:windowcorner", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowstraight", {
@@ -916,9 +901,9 @@ minetest.register_node("scifi_nodes:windowstraight", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowcorner2", {
@@ -947,9 +932,9 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowstraight2", {
@@ -974,9 +959,9 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 
@@ -1004,8 +989,8 @@ minetest.register_node("scifi_nodes:capsule", {
 			{-0.3125, -0.4375, -0.1875, 0.3125, -0.0625, 0.1875}, -- NodeBox3
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule2", param2=node.param2})
 	end,
@@ -1035,7 +1020,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule", param2=node.param2})
 	end,
@@ -1065,7 +1050,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule3", param2=node.param2})
 	end,
@@ -1094,8 +1079,8 @@ minetest.register_node("scifi_nodes:itemholder", {
 			{-0.25, -0.5, -0.0625, -0.1875, -0.0625, 0.0625}, -- NodeBox5
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
-	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow,
+	groups = {cracky=1},
+	on_rotate = screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner",placer:get_player_name())
@@ -1127,7 +1112,6 @@ minetest.register_node("scifi_nodes:itemholder", {
 			minetest.add_item(pos, meta:get_string("item"))
 		end
 	end,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:glassscreen", {
@@ -1144,7 +1128,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
@@ -1154,7 +1138,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 
@@ -1185,8 +1169,7 @@ minetest.register_node("scifi_nodes:widescreen", {
 			{-0.5, 0.25, 0.375, 0.5, 0.3125, 0.5},         -- NodeBox7
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })
 
 minetest.register_node("scifi_nodes:tallscreen", {
@@ -1216,8 +1199,7 @@ minetest.register_node("scifi_nodes:tallscreen", {
 			{0.25, -0.5, 0.375, 0.3125, 0.5, 0.5}, -- NodeBox7
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
-	sounds = scifi_nodes.node_sound_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1}
 })
 
 -- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481
@@ -1237,7 +1219,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
             {-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
         }
     },
-    groups = {cracky=1, dig_generic = 3},
+    groups = {cracky=1},
     on_place = minetest.rotate_node,
-    sounds = scifi_nodes.node_sound_glass_defaults(),
+    sounds = default.node_sound_glass_defaults(),
 })

nodes.lua

@@ -1,19 +1,14 @@
 
 --nodes
 
-if minetest.get_modpath("default") then
-	minetest.register_node("scifi_nodes:grassblk", {
+minetest.register_node("scifi_nodes:grassblk", {
 	description = "Dirt With Alien Grass",
 	tiles = {"default_grass.png^[colorize:cyan:80", "default_dirt.png",
 		{name = "default_dirt.png^(default_grass_side.png^[colorize:cyan:80)",
 			tileable_vertical = false}},
 	light_source = 2,
-		groups = {crumbly=1, oddly_breakable_by_hand=1, soil=1},
-		sounds = scifi_nodes.node_sound_dirt_defaults({
-			footstep = scifi_nodes.node_sound_plant_defaults().footstep,
-		}),
-	})
-end
+	groups = {crumbly=1, oddly_breakable_by_hand=1, soil=1}
+})
 
 minetest.register_node("scifi_nodes:light", {
 	description = "blue lightbox",
@@ -28,8 +23,7 @@ minetest.register_node("scifi_nodes:light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1}
 })
 
 minetest.register_node("scifi_nodes:rfloor", {
@@ -40,8 +34,8 @@ minetest.register_node("scifi_nodes:rfloor", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	light_source = 10,
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:bfloor", {
@@ -52,8 +46,8 @@ minetest.register_node("scifi_nodes:bfloor", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	light_source = 10,
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults()
 })
 
 
@@ -69,8 +63,8 @@ minetest.register_node("scifi_nodes:stripes2", {
 		"scifi_nodes_stripes2.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock", {
@@ -85,8 +79,8 @@ minetest.register_node("scifi_nodes:gblock", {
 		"scifi_nodes_gblock.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3};
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1};
+	sounds = default.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock2", {
@@ -102,8 +96,8 @@ minetest.register_node("scifi_nodes:gblock2", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock3", {
@@ -119,8 +113,8 @@ minetest.register_node("scifi_nodes:gblock3", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults()
 })
 
 
@@ -138,8 +132,8 @@ minetest.register_node("scifi_nodes:green_light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:red_light", {
@@ -155,8 +149,8 @@ minetest.register_node("scifi_nodes:red_light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:discs", {
@@ -171,8 +165,8 @@ minetest.register_node("scifi_nodes:discs", {
 		"scifi_nodes_discs.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:disc", {
@@ -185,8 +179,7 @@ minetest.register_node("scifi_nodes:disc", {
 	inventory_image = "scifi_nodes_disc.png",
 	wield_image = "scifi_nodes_disc.png",
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_defaults(),
+	groups = {cracky=1}
 })
 
 minetest.register_node("scifi_nodes:greenbar_animated", {
@@ -201,9 +194,9 @@ minetest.register_node("scifi_nodes:greenbar_animated", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	light_source = 10,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -215,9 +208,9 @@ minetest.register_node("scifi_nodes:blink", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.00},
 	}},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	light_source = 5,
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:black_lights", {
@@ -228,8 +221,8 @@ minetest.register_node("scifi_nodes:black_lights", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.50},
 	}},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:black_screen", {
@@ -240,9 +233,9 @@ minetest.register_node("scifi_nodes:black_screen", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.00},
 	}},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	light_source = 1,
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_node("scifi_nodes:screen", {
@@ -253,9 +246,9 @@ minetest.register_node("scifi_nodes:screen", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.50},
 	}},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	light_source = 5,
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:screen2", {
@@ -266,9 +259,9 @@ minetest.register_node("scifi_nodes:screen2", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.50},
 	}},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
 	light_source = 5,
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 
@@ -286,8 +279,8 @@ minetest.register_node("scifi_nodes:white_pad", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:white_base", {
@@ -303,8 +296,8 @@ minetest.register_node("scifi_nodes:white_base", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:grnpipe", {
@@ -320,8 +313,8 @@ minetest.register_node("scifi_nodes:grnpipe", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -339,8 +332,8 @@ minetest.register_node("scifi_nodes:grnpipe2", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1},
+	sounds = default.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -355,8 +348,8 @@ minetest.register_node("scifi_nodes:octrng", {
 	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octgrn", {
@@ -370,8 +363,8 @@ minetest.register_node("scifi_nodes:octgrn", {
 	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octbl", {
@@ -385,8 +378,8 @@ minetest.register_node("scifi_nodes:octbl", {
 	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octppl", {
@@ -400,8 +393,8 @@ minetest.register_node("scifi_nodes:octppl", {
 	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	groups = {cracky=2},
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:tower", {
@@ -415,8 +408,8 @@ minetest.register_node("scifi_nodes:tower", {
 	visual_scale = 2,
 	inventory_image = "scifi_nodes_tower.png",
 	paramtype = "light",
-	groups = {cracky=2, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=2},
+	sounds = default.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:junk", {
@@ -433,7 +426,7 @@ minetest.register_node("scifi_nodes:junk", {
 	tiles = {
 		"scifi_nodes_junk.png"
 	},
-	groups = {snappy=1, oddly_breakable_by_hand=1, liquid=3, dig_immediate=1},
+	groups = {snappy=1, oddly_breakable_by_hand=1, liquid=3, dig_immediate=1}
 })
 
 
@@ -450,8 +443,8 @@ minetest.register_node("scifi_nodes:blumetlight", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 
@@ -461,10 +454,10 @@ minetest.register_node("scifi_nodes:lightstp", {
 	tiles = {
 		"scifi_nodes_lightstripe.png"
 	},
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:blklt2", {
@@ -475,8 +468,8 @@ minetest.register_node("scifi_nodes:blklt2", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:blumetstr", {
@@ -487,8 +480,8 @@ minetest.register_node("scifi_nodes:blumetstr", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:glass", {
@@ -500,8 +493,8 @@ minetest.register_node("scifi_nodes:glass", {
 	},
 	use_texture_alpha = "blend",
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:whtlightbnd", {
@@ -512,8 +505,8 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	groups = {cracky=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 --edited wool code (Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>)
@@ -524,15 +517,15 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 -- colors available. When crafting, the last recipes will be checked first.
 --add new block using texture name(without "scifi_nodes_" prefix) then the description, and then the name of the block
 local nodetypes = {
-	-- { name, description, shortname?, light, colorable, sounds }
+	-- { name, description, shortname?, light, colorable }
 	{"blue",      "blue lines",        "blue"},
 	{"holes",       "metal with holes","holes"},
-	{"white2",      "plastic",         "white2", 0, true, "stone"},
-    {"super_white",      "Super Plastic",         "super_white", 11, nil, "stone"},
-    {"ultra_white",      "Ultra Plastic",         "ultra_white", minetest.LIGHT_MAX, nil, "stone"},
+	{"white2",      "plastic",         "white2", 0, true},
+    {"super_white",      "Super Plastic",         "super_white", 11},
+    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
 	{"engine",      "engine",          "engine"},
 	{"wall",      "metal wall",        "wall"},
-	{"white",      "plastic wall",     "white", 0, true, "stone"},
+	{"white",      "plastic wall",     "white", 0, true},
 	{"stripes2top",     "dirty metal block","metal2"},
 	{"rough",      "rough metal",      "rough"},
 	{"lighttop",      "metal block",      "metal"},
@@ -577,8 +570,8 @@ local nodetypes = {
 	{"greybars",      "grey bars",       "grybrs"},
 	{"greydots",      "grey wall dots",       "grydts"},
 	{"greygreenbar",      "gray power pipe",       "grygrnbr", 10},
-	{"octofloor",      "Doom floor",       "octofloor", nil, nil, "stone"},
-	{"octofloor2",      "Brown Doom floor",       "octofloor2", nil, nil, "stone"},
+	{"octofloor",      "Doom floor",       "octofloor"},
+	{"octofloor2",      "Brown Doom floor",       "octofloor2"},
 	{"doomwall1",      "Doom wall 1",       "doomwall1"},
 	{"doomwall2",      "Doom wall 2",       "doomwall2"},
 	{"doomwall3",      "Doom wall 3",       "doomwall3"},
@@ -594,18 +587,18 @@ local nodetypes = {
 	{"monitorwall",      "Wall monitors",       "monitorwall"},
 	{"screen3",      "Wall monitor",       "screen3"},
 	{"doomlight",      "Doom light",       "doomlight", 12},
-	{"bluwllight",      "Blue wall light", "capsule3", minetest.LIGHT_MAX},
+	{"bluwllight",      "Blue wall light", "capsule3", default.LIGHT_MAX},
 	{"bluegrid",      "Blue Grid", "bluegrid", 5},
 	{"fan",      "Fan",       "fan"},
-	{"ppllght",      "Purple wall light", "", minetest.LIGHT_MAX},
+	{"ppllght",      "Purple wall light", "", default.LIGHT_MAX},
 	{"pplwll",      "Purple wall", "", 0},
 	{"pplwll2",      "Purple wall2", "", 0},
 	{"pplwll3",      "Purple wall3", "", 0},
 	{"pplwll4",      "Purple wall4", "", 0},
 	{"pplblk",      "Purple tile", "", 0},
 	{"purple",      "Purple node", "", 0},
-	{"rock",      "Moonstone", "", 0, nil, "stone"},
-	{"rock2",      "Moonstone2", "", 0, nil, "stone"},
+	{"rock",      "Moonstone", "", 0},
+	{"rock2",      "Moonstone2", "", 0},
 	{"blackvnt",      "Black vent", "", 0},
 	{"blackplate",      "Black plate", "", 0},
 }
@@ -617,24 +610,16 @@ for _, row in ipairs(nodetypes) do
 	local desc = row[2]
 	local light = row[4]
 	local is_colorable = row[5]
-	local soundtype = row[6]
-
-	local sounds
-	if soundtype == "stone" then
-		sounds = scifi_nodes.node_sound_stone_defaults()
-	else
-		sounds = scifi_nodes.node_sound_metal_defaults()
-	end
 
 	-- Node Definition
 	local node_def = {
 		description = desc,
 		tiles = {"scifi_nodes_"..name..".png"},
-		groups = {cracky=1, dig_generic = 3},
+		groups = {cracky=1},
 		paramtype = "light",
 		paramtype2 = "facedir",
 		light_source = light,
-		sounds = sounds,
+		sounds = default.node_sound_glass_defaults()
 	}
 
 	if is_colorable and has_unifieddyes_mod then
@@ -661,7 +646,7 @@ for _, row in ipairs(nodetypes) do
 			paramtype = "light",
 			paramtype2 = "color",
 			light_source = light,
-			sounds = scifi_nodes.node_sound_glass_defaults(),
+			sounds = default.node_sound_glass_defaults(),
 			on_construct = unifieddyes.on_construct,
 			on_dig = unifieddyes.on_dig
 		})

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 = scifi_nodes.node_sound_glass_defaults()
+    sounds = default.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 = scifi_nodes.node_sound_glass_defaults()
+    sounds = default.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 = scifi_nodes.node_sound_glass_defaults()
+    sounds = default.node_sound_glass_defaults()
   })
 
   -- register recipes

palm_scanner.lua

@@ -65,7 +65,7 @@ minetest.register_node("scifi_nodes:palm_scanner_off", {
 		}
 	},
 	on_rightclick = (has_mesecons and activate_palm_scanner),
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.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 = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.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 = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_craft({

plants.lua

@@ -1,11 +1,11 @@
 
 local plants = {
-	{"flower1", "Glow Flower", 1,0, minetest.LIGHT_MAX},
+	{"flower1", "Glow Flower", 1,0, default.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, minetest.LIGHT_MAX},
+	{"plant2", "Trap Plant", 1.5,0, default.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},
@@ -33,6 +33,7 @@ for _, row in ipairs(plants) do
 		groups = {snappy=1, oddly_breakable_by_hand=1, dig_immediate=3, flora=1},
 		paramtype = "light",
 		visual_scale = size,
+		buildable_to = true,
 		walkable = false,
 		damage_per_second = dmg,
 		selection_box = {
@@ -43,6 +44,5 @@ for _, row in ipairs(plants) do
 		},
 		is_ground_content = false,
 		light_source = light,
-		sounds = scifi_nodes.node_sound_plant_defaults(),
 	})
 end

protected_switch.lua

@@ -51,7 +51,7 @@ minetest.register_node("scifi_nodes:protected_switch_on", {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.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 = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })
 

settingtypes.txt

@@ -1,5 +1,2 @@
 #    Doors can only be opened by mesecon signal
-scifi_nodes.doors_open_with_mesecon_only (disables right click on doors) bool false
-
-# Teleporter recipe flag
-scifi_nodes.teleporter_enable_crafting (enables the teleporter recipe) bool false
+scifi_nodes.doors_open_with_mesecon_only (disables right click on doors) bool true

sounds.lua

@@ -1,50 +0,0 @@
--- sound definitions
-
-function scifi_nodes.node_sound_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_defaults(param)
-    end
-end
-
-function scifi_nodes.node_sound_wood_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_wood_defaults(param)
-    end
-end
-
-function scifi_nodes.node_sound_glass_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_glass_defaults(param)
-    end
-end
-
-function scifi_nodes.node_sound_metal_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_metal_defaults(param)
-    end
-end
-
-function scifi_nodes.node_sound_stone_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_stone_defaults(param)
-    end
-end
-
-function scifi_nodes.node_sound_dirt_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_dirt_defaults(param)
-    end
-end
-
-function scifi_nodes.node_sound_plant_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_leaves_defaults(param)
-    end
-end

switch.lua

@@ -44,7 +44,7 @@ minetest.register_node("scifi_nodes:switch_on", {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.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 = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })