add facedir param2type to lightbars and liquidpipes

Co-authored-by: BuckarooBanzay <BuckarooBanzay@users.noreply.github.com>

.github/workflows/integration-test.yml

@@ -0,0 +1,15 @@
+name: integration-test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+    - uses: actions/checkout@v1
+
+    - name: integration-test
+      run: ./test/integration-test.sh

.github/workflows/luacheck.yml

@@ -1,6 +1,6 @@
 name: luacheck
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:

.luacheckrc

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

README.md

@@ -2,10 +2,15 @@
 
 # scifi_nodes
 
+![](https://github.com/D00Med/scifi_nodes/workflows/luacheck/badge.svg)
+![](https://github.com/D00Med/scifi_nodes/workflows/integration-test/badge.svg)
+[![ContentDB](https://content.minetest.net/packages/D00Med/scifi_nodes/shields/downloads/)](https://content.minetest.net/packages/D00Med/scifi_nodes/)
+
 Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
 
-# Changes log
+# Changelog
 
+* Added support for unifieddyes
 * 14/08/2019 : retrocompatibility fixed (aliases in doors.lua)
 * 13/08/2019 :
   * added mod option doors_open_with_mesecon_only (default = false)
@@ -27,19 +32,28 @@ Minetest mod that adds scifi themed blocks, doors, materials, plants and other a
 
 # Attributions
 
-CC BY-NC 3.0
+CC BY 3.0
 * scifi_nodes_door_normal.ogg tlwmdbt https://freesound.org/people/tlwmdbt/sounds/165862/
-* scifi_nodes_door_mechanic.ogg primeval_polypod https://freesound.org/people/primeval_polypod/sounds/156507/
-* scifi_nodes_digicode.ogg https://freesound.org/people/Robinhood76/sounds/94933/
 * scifi_nodes_switch.ogg http://soundbible.com/1950-Button-Push.html
 * 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/
+
 
 # Contributors:
 
+* D00Med https://github.com/D00Med (creator)
 * tanmayameher https://github.com/tanmayameher
-* naturefreshmilk https://github.com/naturefreshmilk
+* BuckarooBanzay https://github.com/BuckarooBanzay
 * acmgit https://github.com/acmgit
 * catz85 https://github.com/catz85
 * coil0 https://github.com/coil0
+* Grossam https://github.com/Grossam
+* OgelGames https://github.com/OgelGames
+* leftshift https://github.com/leftshift
+* fluxionary https://github.com/fluxionary
+* Niles Corder https://github.com/ncorder

builder.lua

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

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)

crafts.lua

@@ -1,14 +1,38 @@
 -- 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"}
+        }
+    })
+
+    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",
@@ -767,6 +791,16 @@ minetest.register_craft({
     }
 })
 
+-- 4 green light bar from 4 green metal, 2 green dye, 1 lightbar
+minetest.register_craft({
+    output = "scifi_nodes:greenbar_animated 4",
+    recipe = {
+        {"scifi_nodes:greenbar", "", "scifi_nodes:greenbar"},
+        {"", "mesecons:wire_00000000_off", ""},
+        {"scifi_nodes:greenbar", "", "scifi_nodes:greenbar"}
+    }
+})
+
 -- 4 green metal block from 4 green metal
 minetest.register_craft({
     output = "scifi_nodes:green_square 4",
@@ -1089,6 +1123,22 @@ minetest.register_craft({
     }
 })
 
+-- wet metal plant pot from dry metal plant pot
+minetest.register_craft({
+    output = "scifi_nodes:pot2",
+    recipe = {
+        {"scifi_nodes:pot", "bucket:bucket_water"}
+    },
+    replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
+})
+
+-- dry metal plant pot from wet metal plant pot
+minetest.register_craft({
+	type = "cooking",
+	output = "scifi_nodes:pot",
+	recipe = "scifi_nodes:pot2",
+})
+
 -- 6 itemholder from 2 dented metal block and 1 plastic
 minetest.register_craft({
     output = "scifi_nodes:itemholder 6",
@@ -1282,10 +1332,13 @@ minetest.register_craft({
 })
 
 -- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481
+-- with modified recipe
 minetest.register_craft({
-    output = 'scifi_nodes:windowpanel 4',
+    output = 'scifi_nodes:windowpanel',
     recipe = {
-        {"scifi_nodes:glass","",""}
+        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
+        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
+        {"","",""}
     }
 })
 
@@ -1433,9 +1486,9 @@ minetest.register_craft({
 minetest.register_craft({
     output = "scifi_nodes:plant8",
     recipe = {
-        {"flowers:viola","default:junglegrass"},
-        {"default:dirt",""},
-        {"scifi_nodes:greybolts",""}
+        {"flowers:viola","default:junglegrass", "default:grass_1"},
+        {"default:dirt","",""},
+        {"scifi_nodes:greybolts","",""}
     }
 })
 
@@ -1582,15 +1635,6 @@ 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 = {
@@ -1680,7 +1724,7 @@ minetest.register_craft({
 minetest.register_craft({
     output = 'scifi_nodes:stripes2top 3',
     recipe = {
-        {"scifi_nodes:black","scifi_noedes:black","scifi_nodes:black"},
+        {"scifi_nodes:black","scifi_nodes:black","scifi_nodes:black"},
         {"default:silver_sand","default:silver_sand","default:silver_sand"}
     }
 })
@@ -1692,4 +1736,3 @@ minetest.register_craft({
         {"scifi_nodes:stripes"}
     }
 })
-

depends.txt

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

digicode.lua

@@ -122,14 +122,14 @@ minetest.register_node("scifi_nodes:digicode_on", {
 	paramtype2 = "wallmounted",
 	light_source = 5,
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
-	drop = {items = {"scifi_nodes:digicode_off"}},
+	drop = "scifi_nodes:digicode_off",
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
 	on_timer = toggle_digicode,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_metal_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_metal_defaults(),
 })
 
 minetest.register_craft({

doors.lua

@@ -40,10 +40,10 @@ minetest.register_alias("scifi_nodes:door4d","scifi_nodes:green_door_opened_top"
 
 -- This table now uses named parameters and more convenient variables names
 local doors = {
-	{base_name = "Doom", base_ingredient =  "doors:door_obsidian_glass", sound = "scifi_nodes_door_mechanic"},
-	{base_name = "black", base_ingredient = "doors:door_steel", sound = "scifi_nodes_door_mechanic"},
+	{base_name = "Doom", base_ingredient =  "doors:door_obsidian_glass", sound = "scifi_nodes_door_normal"},
+	{base_name = "black", base_ingredient = "doors:door_steel", sound = "scifi_nodes_door_normal"},
 	{base_name = "white", base_ingredient = "doors:door_glass", sound = "scifi_nodes_door_normal"},
-	{base_name = "green", base_ingredient = "doors:door_wood", sound = "scifi_nodes_door_mechanic"},
+	{base_name = "green", base_ingredient = "doors:door_wood", sound = "scifi_nodes_door_normal"},
 	{base_name = "blue", base_ingredient = "default:steelblock", sound = "scifi_nodes_door_normal"}
 }
 
@@ -124,6 +124,37 @@ for _, current_door in ipairs(doors) do
 		minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z},{name="air"})
 	end
 
+	local function change_adjacent(target, pos, node)
+		local target_opposite, target_top
+		if target == opened then
+			target_top = opened_top
+			target_opposite = closed
+		else
+			target_top = closed_top
+			target_opposite = opened
+		end
+
+		for offset = -1,1,2 do
+			local x = pos.x
+			local y = pos.y
+			local z = pos.z
+
+			-- match param2=0 or param2=2
+			if node.param2 % 2 == 0 then
+				x = x + offset
+			else
+				z = z + offset
+			end
+
+			local adjacent = minetest.get_node({x=x, y=y, z=z})
+			if adjacent.name == target_opposite then
+				minetest.set_node({x=x, y=y, z=z}, {name=target, param2 = adjacent.param2})
+				minetest.set_node({x=x, y=y+1, z=z}, {name=target_top, param2 = adjacent.param2})
+			end
+		end
+
+	end
+
 	local function open_door(pos, node, player, itemstack, pointed_thing)
 		-- play sound
 		minetest.sound_play(sound,{
@@ -133,52 +164,13 @@ for _, current_door in ipairs(doors) do
 		})
 
 		local timer = minetest.get_node_timer(pos)
-		local a = minetest.get_node({x=pos.x, y=pos.y, z=pos.z-1})
-		local b = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1})
-		local c = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z})
-		local d = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z})
-		local e = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z-1})
-		local f = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z-1})
-		local g = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z+1})
-		local h = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z+1})
 
+		minetest.set_node(pos, {name=opened, param2=node.param2})
+		minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z}, {name=opened_top, param2=node.param2})
 
-			minetest.set_node(pos, {name=opened, param2=node.param2})
-			minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z}, {name=opened_top, param2=node.param2})
+		change_adjacent(opened, pos, node)
 
-			 if a.name == closed then
-			minetest.set_node({x=pos.x, y=pos.y, z=pos.z-1}, {name=opened, param2=a.param2})
-			minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z-1}, {name=opened_top, param2=a.param2})
-			end
-			 if b.name == closed then
-			minetest.set_node({x=pos.x, y=pos.y, z=pos.z+1}, {name=opened, param2=b.param2})
-			minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z+1}, {name=opened_top, param2=b.param2})
-			end
-			 if c.name == closed then
-			minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z}, {name=opened, param2=c.param2})
-			minetest.set_node({x=pos.x+1,y=pos.y+1,z=pos.z}, {name=opened_top, param2=c.param2})
-			end
-			 if d.name == closed then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z}, {name=opened, param2=d.param2})
-			minetest.set_node({x=pos.x-1,y=pos.y+1,z=pos.z}, {name=opened_top, param2=d.param2})
-			end
-			 if e.name == closed then
-			minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z-1}, {name=opened, param2=e.param2})
-			minetest.set_node({x=pos.x+1, y=pos.y+1, z=pos.z-1}, {name=opened_top, param2=e.param2})
-			end
-			 if f.name == closed then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z-1}, {name=opened, param2=f.param2})
-			minetest.set_node({x=pos.x-1, y=pos.y+1, z=pos.z-1}, {name=opened_top, param2=f.param2})
-			end
-			 if g.name == closed then
-			minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z+1}, {name=opened, param2=g.param2})
-			minetest.set_node({x=pos.x+1, y=pos.y+1, z=pos.z+1}, {name=opened_top, param2=g.param2})
-			end
-			 if h.name == closed then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z+1}, {name=opened, param2=h.param2})
-			minetest.set_node({x=pos.x-1, y=pos.y+1, z=pos.z+1}, {name=opened_top, param2=h.param2})
-			end
-			timer:start(3)
+		timer:start(3)
 	end
 
 	local function afterplace(pos, placer, itemstack, pointed_thing)
@@ -195,50 +187,11 @@ for _, current_door in ipairs(doors) do
 		})
 
 		local node = minetest.get_node(pos)
-		local a = minetest.get_node({x=pos.x, y=pos.y, z=pos.z-1})
-		local b = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1})
-		local c = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z})
-		local d = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z})
-		local e = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z-1})
-		local f = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z-1})
-		local g = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z+1})
-		local h = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z+1})
 
 		minetest.set_node(pos, {name=closed, param2=node.param2})
 		minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z}, {name=closed_top, param2=node.param2})
 
-		if a.name == opened then
-			minetest.set_node({x=pos.x, y=pos.y, z=pos.z-1}, {name=closed, param2=a.param2})
-			minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z-1}, {name=closed_top, param2=a.param2})
-		end
-		if b.name == opened then
-			minetest.set_node({x=pos.x, y=pos.y, z=pos.z+1}, {name=closed, param2=b.param2})
-			minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z+1}, {name=closed_top, param2=b.param2})
-		end
-		if c.name == opened then
-			minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z}, {name=closed, param2=c.param2})
-			minetest.set_node({x=pos.x+1,y=pos.y+1,z=pos.z}, {name=closed_top, param2=c.param2})
-		end
-		if d.name == opened then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z}, {name=closed, param2=d.param2})
-			minetest.set_node({x=pos.x-1,y=pos.y+1,z=pos.z}, {name=closed_top, param2=d.param2})
-		end
-		if e.name == opened then
-			minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z-1}, {name=closed, param2=e.param2})
-			minetest.set_node({x=pos.x+1, y=pos.y+1, z=pos.z-1}, {name=closed_top, param2=e.param2})
-		end
-		if f.name == opened then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z-1}, {name=closed, param2=f.param2})
-			minetest.set_node({x=pos.x-1, y=pos.y+1, z=pos.z-1}, {name=closed_top, param2=f.param2})
-		end
-		if g.name == opened then
-		minetest.set_node({x=pos.x+1, y=pos.y, z=pos.z+1}, {name=closed, param2=g.param2})
-		minetest.set_node({x=pos.x+1, y=pos.y+1, z=pos.z+1}, {name=closed_top, param2=g.param2})
-			end
-		if h.name == opened then
-			minetest.set_node({x=pos.x-1, y=pos.y, z=pos.z+1}, {name=closed, param2=h.param2})
-			minetest.set_node({x=pos.x-1, y=pos.y+1, z=pos.z+1}, {name=closed_top, param2=h.param2})
-		end
+		change_adjacent(closed, pos, node)
 	end
 
 	local mesecons_doors_rules = {
@@ -265,6 +218,10 @@ for _, current_door in ipairs(doors) do
 		},
 	}
 
+	local function nodig(pos, digger)
+		return false
+	end
+
 	local doors_rightclick = nil -- Crashes serv if empty table !
 	if not scifi_nodes.doors_open_with_mesecon_only then doors_rightclick = open_door end
 
@@ -300,6 +257,7 @@ 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, {
@@ -314,7 +272,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {cracky = 1},
+		groups = {cracky = 1, dig_generic = 3},
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -327,6 +285,8 @@ for _, current_door in ipairs(doors) do
 				{0, 0, 0, 0, 0, 0},
 			}
 		},
+		can_dig = nodig,
+		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 
 	minetest.register_node(opened, {
@@ -342,7 +302,7 @@ for _, current_door in ipairs(doors) do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		drop = closed,
-		groups = {cracky = 1},
+		groups = {cracky = 1, dig_generic = 3},
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -355,9 +315,10 @@ for _, current_door in ipairs(doors) do
 				{-0.5, -0.5, -0.0625, -0.25, 1.5, 0.0625},
 			}
 		},
-	after_place_node = afterplace,
-	after_destruct = afterdestruct,
-	on_timer = ontimer,
+		after_place_node = afterplace,
+		after_destruct = afterdestruct,
+		on_timer = ontimer,
+		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 
 	minetest.register_node(opened_top, {
@@ -372,7 +333,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {cracky = 1},
+		groups = {cracky = 1, dig_generic = 3},
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -385,5 +346,7 @@ for _, current_door in ipairs(doors) do
 				{0, 0, 0, 0, 0, 0},
 			}
 		},
+		can_dig = nodig,
+		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 end     -- end of doors table browsing

forcefield.lua

@@ -0,0 +1,20 @@
+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,19 +4,31 @@ 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")
-dofile(MP.."/switches.lua")
+dofile(MP.."/switch.lua")
+dofile(MP.."/protected_switch.lua")
 dofile(MP.."/nodeboxes.lua")
 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")

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
+optional_depends = """
+default,
+xpanes,
+mesecons,
+moreblocks,
+mesecons_microcontroller,
+mesecons_button,
+mesecons_torch,
+mesecons_receiver,
+basic_materials,
+dye,
+unifieddyes
+"""

models.lua

@@ -2,7 +2,13 @@
 --Copyright (c) 2011-2015 Calinou and contributors.
 --Licensed under the zlib license.
 
-function scifi_nodes.register_slope(name, desc, texture, light)
+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
 minetest.register_node("scifi_nodes:slope_"..name, {
 	description = desc.." Slope",
 	sunlight_propagates = false,
@@ -29,16 +35,18 @@ minetest.register_node("scifi_nodes:slope_"..name, {
 		},
 	paramtype = "light",
 	paramtype2 = "facedir",
+	use_texture_alpha = "clip",
 	light_source = light,
-	groups = {cracky=1},
-	on_place = minetest.rotate_node
+	groups = {cracky=1, dig_generic = 3},
+	on_place = minetest.rotate_node,
+	sounds = sounds,
 })
 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("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("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)
@@ -53,8 +61,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)
@@ -69,106 +77,112 @@ scifi_nodes.register_slope("blklt2", "Black stripe light", {"scifi_nodes_black_l
 local node = {}
 
 node.types = {
-	{"blue",      "blue lines",        "blue"},
-	{"holes",       "metal with holes","holes"},
-	{"white2",      "plastic",         "white2"},
-    {"super_white",      "Super Plastic",         "super_white", 11},
-    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
+	{"blue",      "blue lines"},
+	{"holes",       "metal with holes"},
+	{"white2",      "plastic",},
+	{"super_white",      "Super Plastic", 11, "stone"},
+	{"ultra_white",      "Ultra Plastic", minetest.LIGHT_MAX},
 --	{"engine",      "engine",          "engine"},
-	{"wall",      "metal wall",        "wall"},
-	{"white",      "plastic wall",     "white"},
-	{"stripes2top",     "dirty metal block","metal2"},
-	{"rough",      "rough metal",      "rough"},
-	{"lighttop",      "metal block",      "metal"},
-	{"red",      "red lines",          "red"},
-	{"green",      "green lines",      "green"},
-	{"vent2",      "vent",              "vent"},
-	{"stripes",      "hazard stripes", "stripes"},
-	{"rust",      "rusty metal",       "rust"},
-	{"mesh",      "metal mesh",       "mesh"},
-	{"black",      "black wall",       "black"},
-	{"blackoct",      "black octagon",       "blackoct"},
-	{"blackpipe",      "black pipe",       "blackpipe"},
-	{"blacktile",      "black tile",       "blktl"},
-	{"blacktile2",      "black tile 2",       "blktl2"},
-	{"blackvent",      "black vent",       "blkvnt"},
-	{"bluebars",      "blue bars",       "bluebars"},
-	{"bluemetal",      "blue metal",       "blumtl"},
-	{"bluetile",      "blue tile",       "blutl"},
-	{"greytile",      "grey tile",       "grytl"},
-	{"mesh2",      "metal floormesh",       "mesh2"},
-	{"white",      "plastic wall",       "white"},
-	{"pipe",      "wall pipe",       "pipe2"},
-	{"pipeside",      "side pipe",       "pipe3"},
-	{"tile",      "white tile",       "tile"},
-	{"whiteoct",      "white octagon",       "whiteoct"},
-	{"whitetile",      "white tile2",       "whttl"},
-	{"black_detail",      "black detail",       "blckdtl"},
-	{"green_square",      "green metal block",       "grnblck"},
-	{"red_square",      "red metal block",       "redblck"},
-	{"grey_square",      "grey metal block",       "greyblck"},
-	{"blue_square",      "blue metal block",       "blublck"},
-	{"black_mesh",      "black vent block",       "blckmsh"},
-	{"dent",      "dented metal block",       "dent"},
-	{"greenmetal",      "green metal wall",       "grnmetl"},
-	{"greenmetal2",      "green metal wall2",       "grnmetl2"},
-	{"greenlights",      "green wall lights",       "grnlt", 10},
-	{"greenlights2",      "green wall lights2",       "grnlt2", 10},
-	{"greenbar",      "green light bar",       "grnlghtbr", 10},
-	{"green2",      "green wall panel",       "grn2"},
-	{"greentubes",      "green pipes",       "grntubes"},
-	{"grey",      "grey wall",       "gry"},
-	{"greybolts",      "grey wall bolts",       "gryblts"},
-	{"greybars",      "grey bars",       "grybrs"},
-	{"greydots",      "grey wall dots",       "grydts"},
-	{"greygreenbar",      "gray power pipe",       "grygrnbr", 10},
-	{"octofloor",      "Doom floor",       "octofloor"},
-	{"octofloor2",      "Brown Doom floor",       "octofloor2"},
-	{"doomwall1",      "Doom wall 1",       "doomwall1"},
-	{"doomwall2",      "Doom wall 2",       "doomwall2"},
-	{"doomwall3",      "Doom wall 3",       "doomwall3"},
-	{"doomwall4",      "Doom wall 4",       "doomwall4"},
-	{"doomwall41",      "Doom wall 4.1",       "doomwall4.1"},
-	{"doomwall42",      "Doom wall 4.2",       "doomwall4.2"},
-	{"doomwall43",      "Doom wall 4.3",       "doomwall4.3"},
-	{"doomwall431",      "Doom wall 4.3.1",       "doomwall4.3.1"},
-	{"doomwall44",      "Doom wall 4.4",       "doomwall4.4"},
-	{"blackdmg",      "Damaged black wall",       "blckdmg"},
-	{"blackdmgstripe",      "Damaged black wall(stripes)",       "blckdmgstripe"},
-	{"doomengine",      "Doom engine wall",       "doomengine"},
+	{"wall",      "metal wall"},
+	{"white",      "plastic wall"},
+	{"stripes2top",     "dirty metal block"},
+	{"rough",      "rough metal"},
+	{"lighttop",      "metal block"},
+	{"red",      "red lines"},
+	{"green",      "green lines"},
+	{"vent2",      "vent"},
+	{"stripes",      "hazard stripes"},
+	{"rust",      "rusty metal"},
+	{"mesh",      "metal mesh"},
+	{"black",      "black wall"},
+	{"blackoct",      "black octagon"},
+	{"blackpipe",      "black pipe"},
+	{"blacktile",      "black tile"},
+	{"blacktile2",      "black tile 2"},
+	{"blackvent",      "black vent"},
+	{"bluebars",      "blue bars"},
+	{"bluemetal",      "blue metal"},
+	{"bluetile",      "blue tile"},
+	{"greytile",      "grey tile"},
+	{"mesh2",      "metal floormesh"},
+	{"pipe",      "wall pipe"},
+	{"pipeside",      "side pipe"},
+	{"tile",      "white tile"},
+	{"whiteoct",      "white octagon"},
+	{"whitetile",      "white tile2"},
+	{"black_detail",      "black detail"},
+	{"green_square",      "green metal block"},
+	{"red_square",      "red metal block"},
+	{"grey_square",      "grey metal block"},
+	{"blue_square",      "blue metal block"},
+	{"black_mesh",      "black vent block"},
+	{"dent",      "dented metal block"},
+	{"greenmetal",      "green metal wall"},
+	{"greenmetal2",      "green metal wall2"},
+	{"greenlights",      "green wall lights",       10},
+	{"greenlights2",      "green wall lights2",     10},
+	{"greenbar",      "green light bar",            10},
+	{"green2",      "green wall panel"},
+	{"greentubes",      "green pipes"},
+	{"grey",      "grey wall"},
+	{"greybolts",      "grey wall bolts"},
+	{"greybars",      "grey bars"},
+	{"greydots",      "grey wall dots"},
+	{"greygreenbar",      "gray power pipe",        10},
+	{"octofloor",      "Doom floor"},
+	{"octofloor2",      "Brown Doom floor"},
+	{"doomwall1",      "Doom wall 1"},
+	{"doomwall2",      "Doom wall 2"},
+	{"doomwall3",      "Doom wall 3"},
+	{"doomwall4",      "Doom wall 4"},
+	{"doomwall41",      "Doom wall 4.1"},
+	{"doomwall42",      "Doom wall 4.2"},
+	{"doomwall43",      "Doom wall 4.3"},
+	{"doomwall431",      "Doom wall 4.3.1"},
+	{"doomwall44",      "Doom wall 4.4"},
+	{"blackdmg",      "Damaged black wall"},
+	{"blackdmgstripe",      "Damaged black wall(stripes)"},
+	{"doomengine",      "Doom engine wall"},
 --	{"monitorwall",      "Wall monitors",       "monitorwall"},
-	{"screen3",      "Wall monitor",       "screen3"},
-	{"doomlight",      "Doom light",       "doomlight", 12},
-	{"bluwllight",      "Blue wall light", "capsule3", default.LIGHT_MAX},
-	{"bluegrid",      "Blue Grid", "bluegrid", 5},
-	{"fan",      "Fan",       "fan"},
-	{"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},
-	{"rock2",      "Moonstone2", "", 0},
-	{"blackvnt",      "Black vent", "", 0},
-	{"blackplate",      "Black plate", "", 0},
+	{"screen3",      "Wall monitor"},
+	{"doomlight",      "Doom light",       12},
+	{"bluwllight",      "Blue wall light", minetest.LIGHT_MAX},
+	{"bluegrid",      "Blue Grid", 5},
+	{"fan",      "Fan"},
+	{"ppllght",      "Purple wall light", minetest.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"},
+	{"blackvnt",      "Black vent"},
+	{"blackplate",      "Black plate"},
 }
 
 if minetest.global_exists("stairsplus") then
-
 	for _, row in ipairs(node.types) do
 		local name = row[1]
-		local desc = row[2]
-		local light = row[4]
+		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", row[1], "scifi_nodes:"..name, {
-			description = desc,
+		stairsplus:register_all("scifi_nodes", name, "scifi_nodes:"..name, {
+			description = row[2],
 			tiles = {"scifi_nodes_"..name..".png"},
-			groups = {cracky=1},
+			use_texture_alpha = "clip",
+			groups = {cracky=1, dig_generic = 3},
 			paramtype = "light",
 			paramtype2 = "facedir",
-			light_source = light,
+			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},
+	groups = {cracky=1, dig_generic = 3},
 	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 = default.node_sound_wood_defaults(),
+	sounds = scifi_nodes.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},
+	groups = {cracky=1, dig_generic = 3},
 	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 = 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", {
@@ -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},
+	groups = {cracky=1, oddly_breakable_by_hand=1, dig_immediate=2, falling_node=1, dig_generic = 3},
 	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 = default.node_sound_wood_defaults()
-	}
+	},
+	sounds = scifi_nodes.node_sound_wood_defaults(),
 })
 
 if minetest.get_modpath("scifi_mobs") then
@@ -151,7 +151,8 @@ minetest.register_node("scifi_nodes:pad", {
 	paramtype = "light",
 	groups = {cracky=1, oddly_breakable_by_hand=1},
 	light_source = 5,
-	on_construct = function(pos, node, placer)
+    after_place_node = function(pos, placer, itemstack, pointed_thing)
+        local placer_name = placer:get_player_name()
 		local meta = minetest.get_meta(pos)
 		if position1 == nil then
 			position1 = pos
@@ -160,10 +161,11 @@ minetest.register_node("scifi_nodes:pad", {
 			position2 = pos
 			meta:set_int("type", 2)
 		else
-			minetest.chat_send_all("There can only be two teleportation pads at a time!")
+			minetest.chat_send_player(placer_name, "There can only be two teleportation pads at a time!")
 		end
 	end,
-	on_rightclick = function(pos, node, clicker)
+    on_rightclick = function(pos, node, clicker)
+        local clicker_name = clicker:get_player_name()
 		local meta = minetest.get_meta(pos)
 		if meta:get_int("type") == 1 and position2 ~= nil and position1 ~= nil then
 		minetest.add_particlespawner(
@@ -217,7 +219,7 @@ minetest.register_node("scifi_nodes:pad", {
 			"scifi_nodes_tp_part.png" --texture
 		)
 		minetest.after(1, function()
-		local ppos = clicker:getpos()
+        local ppos = clicker:getpos()
 		if minetest.get_node({x=ppos.x, y=ppos.y, z=ppos.z}).name == "scifi_nodes:pad" then
 			clicker:setpos(position1)
 		end
@@ -235,13 +237,13 @@ minetest.register_node("scifi_nodes:pad", {
 		end)
 		elseif position1 == nil and meta:get_int("type") ~= 2 then
 		position1 = pos
-		meta:set_int("type", 1)
-		minetest.chat_send_all("Teleporter 1 connected at "..minetest.pos_to_string(pos))
+        meta:set_int("type", 1)
+		minetest.chat_send_player(clicker_name, "Teleporter 1 connected at "..minetest.pos_to_string(pos))
 		elseif position2 == nil and meta:get_int("type") ~= 1 then
 		position2 = pos
 		meta:set_int("type", 2)
-		minetest.chat_send_all("Teleporter 2 connected at "..minetest.pos_to_string(pos))
-		else minetest.chat_send_all("Teleporter error!")
+		minetest.chat_send_player(clicker_name, "Teleporter 2 connected at "..minetest.pos_to_string(pos))
+		else minetest.chat_send_player(clicker_name, "Teleporter error!")
 		end
 	end,
 	on_destruct = function(pos, oldnode, placer)
@@ -262,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 = default.node_sound_wood_defaults()
-	}
+	},
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:pplwndw", {
@@ -279,9 +281,9 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
-	groups = {cracky=3},
-	sounds = default.node_sound_glass_defaults(),
+	use_texture_alpha = "blend",
+	groups = {cracky=3, dig_generic = 4},
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -302,11 +304,11 @@ 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,
-	use_texture_alpha =  true,
+	use_texture_alpha = "blend",
 	groups = {fleshy=1, oddly_breakable_by_hand=1, dig_immediate=3},
 	node_box = {
 		type = "fixed",
@@ -318,54 +320,72 @@ 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", {
-	description = "plant pot lid(place above plant)",
+	description = "Plant Pot Lid",
 	tiles = {
-		"scifi_nodes_glass2.png",
-		"scifi_nodes_glass2.png",
-		"scifi_nodes_glass2.png",
-		"scifi_nodes_glass2.png",
-		"scifi_nodes_glass2.png",
 		"scifi_nodes_glass2.png"
 	},
 	inventory_image = "scifi_nodes_pod_inv.png",
 	wield_image = "scifi_nodes_pod_inv.png",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky=1, not_in_creative_inventory=1},
+	groups = {not_in_creative_inventory = 1},
 	sunlight_propagates = true,
+	diggable = false,
+	drop = "",
 	selection_box = {
 		type = "fixed",
-		fixed = {0, 0, 0, 0, 0, 0}
-	},
-	collision_box = {
-		type = "fixed",
-		fixed = {-0.5, -1.5, -0.5, 0.5, -0.5, 0.5}
+		fixed = {-0.5, -1.5, -0.5, 0.5, -0.25, 0.5}
 	},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.1875, -0.5625, -0.1875, 0.1875, -0.5, 0.1875}, -- NodeBox13
-			{-0.25, -0.625, -0.25, 0.25, -0.5625, 0.25}, -- NodeBox14
-			{-0.3125, -0.6875, -0.3125, 0.3125, -0.625, 0.3125}, -- NodeBox15
-			{-0.375, -0.75, -0.375, 0.375, -0.6875, 0.375}, -- NodeBox16
-			{-0.4375, -0.75, 0.375, 0.4375, -1.5, 0.4375}, -- NodeBox17
-			{-0.4375, -0.75, -0.4375, 0.4375, -1.5, -0.375}, -- NodeBox18
-			{0.375, -0.75, -0.4375, 0.4375, -1.5, 0.4375}, -- NodeBox19
-			{-0.4375, -0.75, -0.4375, -0.375, -1.5, 0.4375}, -- NodeBox20
+			{-0.4375, -1.5, -0.4375, 0.4375, -0.5, -0.375},
+			{-0.4375, -1.5, 0.375, 0.4375, -0.5, 0.4375},
+			{-0.4375, -1.5, -0.375, -0.375, -0.5, 0.375},
+			{0.375, -1.5, -0.375, 0.4375, -0.5, 0.375},
+			{-0.375, -0.5, -0.375, 0.375, -0.4375, 0.375},
+			{-0.3125, -0.4375, -0.3125, 0.3125, -0.375, 0.3125},
+			{-0.25, -0.375, -0.25, 0.25, -0.3125, 0.25},
+			{-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)
+	if not player or minetest.is_protected(pos, player:get_player_name()) then
+		return
+	end
+	local lid_pos = {x = pos.x, y = pos.y+2 , z = pos.z}
+	local lid_node = minetest.get_node(lid_pos)
+	if lid_node.name == "scifi_nodes:pot_lid" then
+		minetest.set_node(lid_pos, {name = "air"})
+	elseif lid_node.name == "air" then
+		minetest.set_node(lid_pos, {name = "scifi_nodes:pot_lid"})
+	end
+end
+
+local function remove_lid(pos)
+	local lid_pos = {x = pos.x, y = pos.y+2 , z = pos.z}
+	local lid_node = minetest.get_node(lid_pos)
+	if lid_node.name == "scifi_nodes:pot_lid" then
+		minetest.set_node(lid_pos, {name = "air"})
+	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, shift+rightclick to plant)",
+	description = "Metal Plant Pot (right-click for lid, sneak + right-click to plant)",
 	tiles = {
-		"scifi_nodes_pot.png",
+		dirt_tex .. "^scifi_nodes_pot.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@@ -374,34 +394,32 @@ minetest.register_node("scifi_nodes:pot", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky=1, soil=1, sand=1},
+	groups = {cracky = 1, soil = 1, sand = 1, dig_generic = 3},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
+	},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5}, -- NodeBox1
-			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5}, -- NodeBox2
-			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875}, -- NodeBox3
-			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5}, -- NodeBox4
-			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
+			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
+			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
+			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
+			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
+			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
 		}
 	},
-	on_rightclick = function(pos, node, clicker, item, _)
-		local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
-		if lid_node.name == "scifi_nodes:pot_lid" then
-			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="air", param2=lid_node.param2})
-		elseif lid_node.name ~= "scifi_nodes:pot_lid" and node.name == "air" then
-			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="scifi_nodes:pot_lid", param2=lid_node.param2})
-		end
-	end,
-	on_destruct = function(pos, node, _)
-		minetest.remove_node({x=pos.x, y=pos.y+2, z=pos.z})
-	end
+	on_rightclick = toggle_lid,
+	on_destruct = remove_lid,
+	sounds = scifi_nodes.node_sound_metal_defaults({
+		footstep = scifi_nodes.node_sound_dirt_defaults().footstep,
+	}),
 })
 
 minetest.register_node("scifi_nodes:pot2", {
-	description = "metal wet plant pot(right click for lid, shift+rightclick to plant)",
+	description = "Metal Plant Pot Wet (right-click for lid, sneak + right-click to plant)",
 	tiles = {
-		"scifi_nodes_pot.png^[colorize:black:100",
+		dirt_tex .. "^scifi_nodes_pot2.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@@ -410,28 +428,26 @@ minetest.register_node("scifi_nodes:pot2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky=1, soil=3, wet=1},
+	groups = {cracky = 1, soil = 3, wet = 1, dig_generic = 3},
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
+	},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5}, -- NodeBox1
-			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5}, -- NodeBox2
-			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875}, -- NodeBox3
-			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5}, -- NodeBox4
-			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
+			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
+			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
+			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
+			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
+			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
 		}
 	},
-	on_rightclick = function(pos, node, clicker, item, _)
-		local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
-		if lid_node.name == "scifi_nodes:pot_lid" then
-			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="air", param2=lid_node.param2})
-		elseif lid_node.name ~= "scifi_nodes:pot_lid" and node.name == "air" then
-			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="scifi_nodes:pot_lid", param2=lid_node.param2})
-		end
-	end,
-	on_destruct = function(pos, node, _)
-		minetest.remove_node({x=pos.x, y=pos.y+2, z=pos.z})
-	end
+	on_rightclick = toggle_lid,
+	on_destruct = remove_lid,
+	sounds = scifi_nodes.node_sound_metal_defaults({
+		footstep = scifi_nodes.node_sound_dirt_defaults().footstep,
+	}),
 })
 
 minetest.register_node("scifi_nodes:lightbar", {
@@ -443,7 +459,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 = {
@@ -456,8 +472,8 @@ minetest.register_node("scifi_nodes:lightbar", {
 			{-0.125, -0.5, -0.5, 0.125, -0.375, 0.5}, -- NodeBox1
 		}
 	},
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:light_dynamic", {
@@ -473,10 +489,16 @@ minetest.register_node("scifi_nodes:light_dynamic", {
 		type = "wallmounted",
 		fixed = {-0.5, -0.5, -0.5, -0.45, 0.5, 0.5}
 	},
+	node_box = {
+		type = "fixed",
+		fixed = {
+			fixed = {-0.5, -0.5, -0.5, -0.45, 0.5, 0.5}
+		}
+	},
 	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", {
@@ -506,8 +528,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,
@@ -521,8 +543,9 @@ minetest.register_node("scifi_nodes:lightbars", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
-	light_source = default.LIGHT_MAX,
+	paramtype2 = "facedir",
+	use_texture_alpha = "blend",
+	light_source = minetest.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -532,8 +555,8 @@ minetest.register_node("scifi_nodes:lightbars", {
 			{0.125, -0.5, -0.375, 0.375, 0.5, -0.125}, -- NodeBox4
 		}
 	},
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:liquid_pipe", {
@@ -542,19 +565,20 @@ tiles = {{
 		name = "scifi_nodes_liquid.png",
 		animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.00},
 	}},
-	use_texture_alpha = true,
-	light_source = default.LIGHT_MAX,
+	use_texture_alpha = "blend",
+	light_source = minetest.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
+	paramtype2 = "facedir",
 	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()
+	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", {
@@ -562,11 +586,12 @@ minetest.register_node("scifi_nodes:liquid_pipe2", {
 tiles = {
 		"scifi_nodes_orange.png",
 	},
-	use_texture_alpha = true,
-	light_source = default.LIGHT_MAX,
+	use_texture_alpha = "blend",
+	light_source = minetest.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
+	paramtype2 = "facedir",
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -574,7 +599,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", {
@@ -619,6 +644,7 @@ minetest.register_node("scifi_nodes:powered_stand", {
 			return item
 		end
 	end,
+	sounds = scifi_nodes.node_sound_wood_defaults()
 })
 
 minetest.register_node("scifi_nodes:cover", {
@@ -641,7 +667,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_metal_defaults(),
 	groups = {cracky=1, oddly_breakable_by_hand=1}
 })
 
@@ -665,7 +691,8 @@ 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}
+	groups = {cracky=1, oddly_breakable_by_hand=1},
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:keysmonitor", {
@@ -691,7 +718,8 @@ 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}
+	groups = {cracky=1, oddly_breakable_by_hand=1},
+	sounds = scifi_nodes.node_sound_defaults(),
 })
 
 minetest.register_node("scifi_nodes:microscope", {
@@ -718,7 +746,8 @@ 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}
+	groups = {cracky=1, oddly_breakable_by_hand=1},
+	sounds = scifi_nodes.node_sound_defaults(),
 })
 
 minetest.register_node("scifi_nodes:table", {
@@ -746,8 +775,8 @@ 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(),
-	groups = {cracky=1}
+	sounds = scifi_nodes.node_sound_metal_defaults(),
+	groups = {cracky=1, dig_generic = 3}
 })
 
 minetest.register_node("scifi_nodes:laptop_open", {
@@ -775,6 +804,7 @@ 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", {
@@ -801,6 +831,7 @@ 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", {
@@ -830,8 +861,9 @@ minetest.register_node("scifi_nodes:pipen", {
 			{-0.5, -0.4375, -0.5, 0.5, -0.375, 0.5}, -- NodeBox9
 		}
 	},
-	groups = {cracky=1},
-	on_place = minetest.rotate_node
+	groups = {cracky=1, dig_generic = 3},
+	on_place = minetest.rotate_node,
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowcorner", {
@@ -846,7 +878,7 @@ minetest.register_node("scifi_nodes:windowcorner", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -860,9 +892,9 @@ minetest.register_node("scifi_nodes:windowcorner", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowstraight", {
@@ -877,7 +909,7 @@ minetest.register_node("scifi_nodes:windowstraight", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -887,9 +919,9 @@ minetest.register_node("scifi_nodes:windowstraight", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowcorner2", {
@@ -904,7 +936,7 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -918,9 +950,9 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowstraight2", {
@@ -935,7 +967,7 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -945,9 +977,9 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1},
+	groups = {cracky=1, dig_generic = 3},
 	on_place = minetest.rotate_node,
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 
@@ -962,7 +994,7 @@ minetest.register_node("scifi_nodes:capsule", {
 		"scifi_nodes_capsule.png",
 		"scifi_nodes_capsule.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -975,8 +1007,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},
-	sounds = default.node_sound_glass_defaults(),
+	groups = {cracky=1, oddly_breakable_by_hand=1, dig_generic = 3},
+	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,
@@ -992,7 +1024,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		"scifi_nodes_capsule3.png",
 		"scifi_nodes_capsule3.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1006,7 +1038,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,
@@ -1022,7 +1054,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		"scifi_nodes_capsule2.png",
 		"scifi_nodes_capsule2.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1036,7 +1068,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,
@@ -1065,8 +1097,8 @@ minetest.register_node("scifi_nodes:itemholder", {
 			{-0.25, -0.5, -0.0625, -0.1875, -0.0625, 0.0625}, -- NodeBox5
 		}
 	},
-	groups = {cracky=1},
-	on_rotate = screwdriver.disallow,
+	groups = {cracky=1, dig_generic = 3},
+	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())
@@ -1078,10 +1110,9 @@ minetest.register_node("scifi_nodes:itemholder", {
 		local meta = minetest.get_meta(pos)
 		if name == meta:get_string("owner") or
 				minetest.check_player_privs(name, "protection_bypass") then
-			local wield_item = clicker:get_wielded_item():get_name()
 			local taken = item:take_item()
 			if taken and not taken:is_empty() then
-				minetest.add_item(pos, wield_item)
+				minetest.add_item(pos, taken:to_string())
 				return item
 			end
 		end
@@ -1099,6 +1130,7 @@ 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", {
@@ -1111,11 +1143,11 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		"scifi_nodes_glscrn.png",
 		"scifi_nodes_glscrn.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	light_source = default.LIGHT_MAX,
+	light_source = minetest.LIGHT_MAX,
 	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
@@ -1125,7 +1157,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(),
 })
 
 
@@ -1156,7 +1188,8 @@ 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}
+	groups = {cracky=1, oddly_breakable_by_hand=1},
+	sounds = scifi_nodes.node_sound_defaults(),
 })
 
 minetest.register_node("scifi_nodes:tallscreen", {
@@ -1186,7 +1219,8 @@ 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}
+	groups = {cracky=1, oddly_breakable_by_hand=1},
+	sounds = scifi_nodes.node_sound_defaults(),
 })
 
 -- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481
@@ -1197,7 +1231,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
     },
     drawtype = "nodebox",
     paramtype = "light",
-    use_texture_alpha = true,
+    use_texture_alpha = "blend",
     sunlight_propagates = true,
     paramtype2 = "facedir",
     node_box = {
@@ -1206,7 +1240,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
             {-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
         }
     },
-    groups = {cracky=1},
+    groups = {cracky=1, dig_generic = 3},
     on_place = minetest.rotate_node,
-    sounds = default.node_sound_glass_defaults(),
+    sounds = scifi_nodes.node_sound_glass_defaults(),
 })

nodes.lua

@@ -1,14 +1,19 @@
 
 --nodes
 
-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}
-})
+if minetest.get_modpath("default") then
+	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
 
 minetest.register_node("scifi_nodes:light", {
 	description = "blue lightbox",
@@ -23,7 +28,8 @@ minetest.register_node("scifi_nodes:light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1}
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:rfloor", {
@@ -34,8 +40,8 @@ minetest.register_node("scifi_nodes:rfloor", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	light_source = 10,
-	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:bfloor", {
@@ -46,8 +52,8 @@ minetest.register_node("scifi_nodes:bfloor", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	light_source = 10,
-	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 
@@ -63,8 +69,8 @@ minetest.register_node("scifi_nodes:stripes2", {
 		"scifi_nodes_stripes2.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock", {
@@ -79,8 +85,8 @@ minetest.register_node("scifi_nodes:gblock", {
 		"scifi_nodes_gblock.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1};
-	sounds = default.node_sound_metal_defaults()
+	groups = {cracky=1, dig_generic = 3};
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock2", {
@@ -96,8 +102,8 @@ minetest.register_node("scifi_nodes:gblock2", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock3", {
@@ -113,8 +119,8 @@ minetest.register_node("scifi_nodes:gblock3", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 
@@ -132,8 +138,8 @@ minetest.register_node("scifi_nodes:green_light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:red_light", {
@@ -149,8 +155,8 @@ minetest.register_node("scifi_nodes:red_light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:discs", {
@@ -165,8 +171,8 @@ minetest.register_node("scifi_nodes:discs", {
 		"scifi_nodes_discs.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:disc", {
@@ -179,9 +185,27 @@ minetest.register_node("scifi_nodes:disc", {
 	inventory_image = "scifi_nodes_disc.png",
 	wield_image = "scifi_nodes_disc.png",
 	paramtype = "light",
-	groups = {cracky=1}
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_defaults(),
 })
 
+minetest.register_node("scifi_nodes:greenbar_animated", {
+	description = "animated green light bar",
+	sunlight_propagates = false,
+	tiles = {
+		"scifi_nodes_greenbar.png",
+		"scifi_nodes_greenbar.png", {
+			name="scifi_nodes_greenbar_animated.png",
+			animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1.00},
+		}
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	groups = {cracky=1, dig_generic = 3},
+	light_source = 10,
+	sounds = scifi_nodes.node_sound_glass_defaults(),
+	on_place = minetest.rotate_node
+})
 
 minetest.register_node("scifi_nodes:blink", {
 	description = "blinking light",
@@ -191,9 +215,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},
+	groups = {cracky=1, dig_generic = 3},
 	light_source = 5,
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:black_lights", {
@@ -204,8 +228,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},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:black_screen", {
@@ -216,9 +240,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},
+	groups = {cracky=1, dig_generic = 3},
 	light_source = 1,
-	sounds = default.node_sound_stone_defaults()
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:screen", {
@@ -229,9 +253,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},
+	groups = {cracky=1, dig_generic = 3},
 	light_source = 5,
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:screen2", {
@@ -242,9 +266,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},
+	groups = {cracky=1, dig_generic = 3},
 	light_source = 5,
-	sounds = default.node_sound_glass_defaults()
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 
@@ -262,8 +286,8 @@ minetest.register_node("scifi_nodes:white_pad", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:white_base", {
@@ -279,8 +303,8 @@ minetest.register_node("scifi_nodes:white_base", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:grnpipe", {
@@ -296,8 +320,8 @@ minetest.register_node("scifi_nodes:grnpipe", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults(),
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -315,8 +339,8 @@ minetest.register_node("scifi_nodes:grnpipe2", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1},
-	sounds = default.node_sound_metal_defaults(),
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -329,10 +353,10 @@ minetest.register_node("scifi_nodes:octrng", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2},
-	sounds = default.node_sound_glass_defaults(),
+	groups = {cracky=2, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octgrn", {
@@ -344,10 +368,10 @@ minetest.register_node("scifi_nodes:octgrn", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2},
-	sounds = default.node_sound_glass_defaults(),
+	groups = {cracky=2, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octbl", {
@@ -359,10 +383,10 @@ minetest.register_node("scifi_nodes:octbl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2},
-	sounds = default.node_sound_glass_defaults(),
+	groups = {cracky=2, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:octppl", {
@@ -374,10 +398,10 @@ minetest.register_node("scifi_nodes:octppl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	light_source = 10,
-	groups = {cracky=2},
-	sounds = default.node_sound_glass_defaults(),
+	groups = {cracky=2, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:tower", {
@@ -391,8 +415,8 @@ minetest.register_node("scifi_nodes:tower", {
 	visual_scale = 2,
 	inventory_image = "scifi_nodes_tower.png",
 	paramtype = "light",
-	groups = {cracky=2},
-	sounds = default.node_sound_metal_defaults()
+	groups = {cracky=2, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:junk", {
@@ -409,7 +433,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},
 })
 
 
@@ -426,8 +450,8 @@ minetest.register_node("scifi_nodes:blumetlight", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 
@@ -437,10 +461,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()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:blklt2", {
@@ -451,8 +475,8 @@ minetest.register_node("scifi_nodes:blklt2", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:blumetstr", {
@@ -463,8 +487,8 @@ minetest.register_node("scifi_nodes:blumetstr", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:glass", {
@@ -474,10 +498,10 @@ minetest.register_node("scifi_nodes:glass", {
 	tiles = {
 		"scifi_nodes_glass.png"
 	},
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	paramtype = "light",
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:whtlightbnd", {
@@ -488,8 +512,8 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1},
-	sounds = default.node_sound_glass_defaults()
+	groups = {cracky=1, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 --edited wool code (Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>)
@@ -500,14 +524,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 }
 	{"blue",      "blue lines",        "blue"},
 	{"holes",       "metal with holes","holes"},
-	{"white2",      "plastic",         "white2"},
-    {"super_white",      "Super Plastic",         "super_white", 11},
-    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
+	{"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"},
 	{"engine",      "engine",          "engine"},
 	{"wall",      "metal wall",        "wall"},
-	{"white",      "plastic wall",     "white"},
+	{"white",      "plastic wall",     "white", 0, true, "stone"},
 	{"stripes2top",     "dirty metal block","metal2"},
 	{"rough",      "rough metal",      "rough"},
 	{"lighttop",      "metal block",      "metal"},
@@ -528,12 +553,11 @@ local nodetypes = {
 	{"bluetile",      "blue tile",       "blutl"},
 	{"greytile",      "grey tile",       "grytl"},
 	{"mesh2",      "metal floormesh",       "mesh2"},
-	{"white",      "plastic wall",       "white"},
 	{"pipe",      "wall pipe",       "pipe2"},
 	{"pipeside",      "side pipe",       "pipe3"},
 	{"tile",      "white tile",       "tile"},
-	{"whiteoct",      "white octagon",       "whiteoct"},
-	{"whitetile",      "white tile2",       "whttl"},
+	{"whiteoct",      "white octagon",       "whiteoct", 0, true},
+	{"whitetile",      "white tile2",       "whttl", 0, true},
 	{"black_detail",      "black detail",       "blckdtl"},
 	{"green_square",      "green metal block",       "grnblck"},
 	{"red_square",      "red metal block",       "redblck"},
@@ -553,8 +577,8 @@ local nodetypes = {
 	{"greybars",      "grey bars",       "grybrs"},
 	{"greydots",      "grey wall dots",       "grydts"},
 	{"greygreenbar",      "gray power pipe",       "grygrnbr", 10},
-	{"octofloor",      "Doom floor",       "octofloor"},
-	{"octofloor2",      "Brown Doom floor",       "octofloor2"},
+	{"octofloor",      "Doom floor",       "octofloor", nil, nil, "stone"},
+	{"octofloor2",      "Brown Doom floor",       "octofloor2", nil, nil, "stone"},
 	{"doomwall1",      "Doom wall 1",       "doomwall1"},
 	{"doomwall2",      "Doom wall 2",       "doomwall2"},
 	{"doomwall3",      "Doom wall 3",       "doomwall3"},
@@ -570,34 +594,76 @@ 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},
 	{"pplwll4",      "Purple wall4", "", 0},
 	{"pplblk",      "Purple tile", "", 0},
 	{"purple",      "Purple node", "", 0},
-	{"rock",      "Moonstone", "", 0},
-	{"rock2",      "Moonstone2", "", 0},
+	{"rock",      "Moonstone", "", 0, nil, "stone"},
+	{"rock2",      "Moonstone2", "", 0, nil, "stone"},
 	{"blackvnt",      "Black vent", "", 0},
 	{"blackplate",      "Black plate", "", 0},
 }
 
+local has_unifieddyes_mod = minetest.get_modpath("unifieddyes")
+
 for _, row in ipairs(nodetypes) do
 	local name = row[1]
 	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
-	minetest.register_node("scifi_nodes:"..name, {
+	local node_def = {
 		description = desc,
 		tiles = {"scifi_nodes_"..name..".png"},
-		groups = {cracky=1},
+		groups = {cracky=1, dig_generic = 3},
 		paramtype = "light",
 		paramtype2 = "facedir",
 		light_source = light,
-		sounds = default.node_sound_glass_defaults()
-	})
-end
+		sounds = sounds,
+	}
+
+	if is_colorable and has_unifieddyes_mod then
+		-- overwrite attributes on the "uncolored" node
+		node_def.palette = "unifieddyes_palette_extended.png"
+		node_def.groups.ud_param2_colorable = 1
+		node_def.airbrush_replacement_node = "scifi_nodes:"..name.."_colored"
+	end
+
+	-- register node
+	minetest.register_node("scifi_nodes:"..name, node_def)
+
+	if is_colorable and has_unifieddyes_mod then
+		-- register colored node
+		minetest.register_node("scifi_nodes:"..name.."_colored", {
+			description = desc,
+			tiles = {"scifi_nodes_"..name..".png"},
+			groups = {
+				cracky = 1,
+				ud_param2_colorable = 1,
+				not_in_creative_inventory = 1
+			},
+			palette = "unifieddyes_palette_extended.png",
+			paramtype = "light",
+			paramtype2 = "color",
+			light_source = light,
+			sounds = scifi_nodes.node_sound_glass_defaults(),
+			on_construct = unifieddyes.on_construct,
+			on_dig = unifieddyes.on_dig
+		})
+	end
+end

octagon_panes.lua

@@ -0,0 +1,111 @@
+
+local function register(basename, description, texture)
+  local nodename_single = "scifi_nodes:" .. basename .. "_pane"
+  local nodename_double = "scifi_nodes:" .. basename .. "_pane_double"
+  local nodename_offset = "scifi_nodes:" .. basename .. "_pane_offset"
+  local recipe_ingredient = "scifi_nodes:" .. basename
+
+  -- single height
+  minetest.register_node(nodename_single, {
+    description = description,
+    drawtype = "nodebox",
+    tiles = {
+      texture
+    },
+    wield_image = texture,
+    paramtype = "light",
+    paramtype2 = "facedir",
+    sunlight_propagates = true,
+    is_ground_content = false,
+    node_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, -0.03125, 0.5, 0.5, 0.03125}},
+    },
+    selection_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, -0.25, 0.5, 0.5, 0.25}},
+    },
+    groups = {cracky = 3, oddly_breakable_by_hand = 3},
+    use_texture_alpha = "blend",
+    sounds = scifi_nodes.node_sound_glass_defaults()
+  })
+
+  -- double height
+  minetest.register_node(nodename_double, {
+    description = description,
+    drawtype = "nodebox",
+    tiles = {
+      texture
+    },
+    wield_image = texture,
+    paramtype = "light",
+    paramtype2 = "facedir",
+    sunlight_propagates = true,
+    is_ground_content = false,
+    node_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, -0.03125, 0.5, 1.5, 0.03125}},
+    },
+    selection_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, -0.25, 0.5, 1.5, 0.25}},
+    },
+    groups = {cracky = 3, oddly_breakable_by_hand = 3},
+    use_texture_alpha = "blend",
+    sounds = scifi_nodes.node_sound_glass_defaults()
+  })
+
+  -- single height with offset
+  minetest.register_node(nodename_offset, {
+    description = description,
+    drawtype = "nodebox",
+    tiles = {
+      texture
+    },
+    wield_image = texture,
+    paramtype = "light",
+    paramtype2 = "facedir",
+    sunlight_propagates = true,
+    is_ground_content = false,
+    node_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, 0.96875, 0.5, 0.5, 1.03125}},
+    },
+    selection_box = {
+      type = "fixed",
+      fixed = {{-0.5, -0.5, 0.75, 0.5, 0.5, 1.25}},
+    },
+    groups = {cracky = 3, oddly_breakable_by_hand = 3},
+    use_texture_alpha = "blend",
+    sounds = scifi_nodes.node_sound_glass_defaults()
+  })
+
+  -- register recipes
+
+  minetest.register_craft({
+    output = nodename_single .. " 16",
+    recipe = {
+      {recipe_ingredient}
+    },
+  })
+
+  minetest.register_craft({
+    output = nodename_double .. " 16",
+    recipe = {
+      {recipe_ingredient},
+      {recipe_ingredient}
+    },
+  })
+
+  minetest.register_craft({
+    output = nodename_offset,
+    type = "shapeless",
+    recipe = {nodename_single},
+  })
+end
+
+register("octrng", "Orange Octagon Glass pane", "scifi_nodes_octrng.png")
+register("octgrn", "Green Octagon Glass pane", "scifi_nodes_octgrn.png")
+register("octbl", "Blue Octagon Glass pane", "scifi_nodes_octbl.png")
+register("octppl", "Purple Octagon Glass pane", "scifi_nodes_octppl.png")
+register("glass", "Dark Glass pane", "scifi_nodes_glass.png")

palm_scanner.lua

@@ -22,6 +22,8 @@ local function activate_palm_scanner(pos, node, player)
 
 	-- check protection
 	minetest.after(2, function()
+		if minetest.get_node(pos).name ~= node.name then return end
+
 		if minetest.is_protected(pos, name or "") then
 			-- clicker has no access to area
 			minetest.chat_send_player(name, "Access denied !")
@@ -36,6 +38,7 @@ local function activate_palm_scanner(pos, node, player)
 
 		-- reset state
 		minetest.after(1, function()
+			if minetest.get_node(pos).name ~= node.name then return end
 			node.name = "scifi_nodes:palm_scanner_off"
 			minetest.swap_node(pos, node)
 			mesecon.receptor_off(pos, scifi_nodes.get_switch_rules(node.param2))
@@ -62,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_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:palm_scanner_checking", {
@@ -80,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_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:palm_scanner_on", {
@@ -103,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_metal_defaults(),
 })
 
 minetest.register_craft({

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},
@@ -29,11 +29,10 @@ for _, row in ipairs(plants) do
 		description = desc,
 		tiles = {"scifi_nodes_"..name..".png"},
 		drawtype = "plantlike",
-		inventory_image = {"scifi_nodes_"..name..".png"},
+		inventory_image = "scifi_nodes_"..name..".png",
 		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 = {
@@ -44,5 +43,6 @@ for _, row in ipairs(plants) do
 		},
 		is_ground_content = false,
 		light_source = light,
+		sounds = scifi_nodes.node_sound_plant_defaults(),
 	})
 end

protected_switch.lua

@@ -0,0 +1,89 @@
+
+--------------
+-- Switches --
+--------------
+
+local has_mesecons = minetest.get_modpath("mesecons")
+
+local function toggle_switch(pos, _, player)
+	local node = minetest.get_node(pos)
+	local name = node.name
+	if name == "scifi_nodes:protected_switch_on" then
+		-- toggle off
+		minetest.sound_play("scifi_nodes_switch", {max_hear_distance = 8, pos = pos})
+		minetest.set_node(pos, {name = "scifi_nodes:protected_switch_off", param2 = node.param2})
+		mesecon.receptor_off(pos, scifi_nodes.get_switch_rules(node.param2))
+	elseif name == "scifi_nodes:protected_switch_off" then
+		-- toggle on, check protection first
+		if player and minetest.is_protected(pos, player:get_player_name()) then
+			-- position is protected, abort
+			minetest.sound_play("scifi_nodes_scanner_refused", {max_hear_distance = 8, pos = pos})
+			return
+		end
+		minetest.sound_play("scifi_nodes_switch", {max_hear_distance = 8, pos = pos})
+		minetest.set_node(pos, {name = "scifi_nodes:protected_switch_on", param2 = node.param2})
+		mesecon.receptor_on(pos, scifi_nodes.get_switch_rules(node.param2))
+		minetest.get_node_timer(pos):start(2)
+	end
+end
+
+minetest.register_node("scifi_nodes:protected_switch_on", {
+	description = "Protected wall switch",
+	sunlight_propagates = true,
+	buildable_to = false,
+	tiles = {"scifi_nodes_switch_on.png",},
+	inventory_image = "scifi_nodes_switch_on.png",
+	wield_image = "scifi_nodes_switch_on.png",
+	drawtype = "signlike",
+	node_box = {type = "wallmounted",},
+	selection_box = {type = "wallmounted",},
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	light_source = 5,
+	groups = {
+		cracky=1,
+		oddly_breakable_by_hand = 1,
+		not_in_creative_inventory = 1,
+		mesecon_needs_receiver = 1
+	},
+	mesecons = {
+		receptor = {
+			state = (has_mesecons and mesecon.state.on)
+		}
+	},
+	sounds = scifi_nodes.node_sound_metal_defaults(),
+	on_rightclick = (has_mesecons and toggle_switch),
+	on_timer = (has_mesecons and toggle_switch)
+})
+
+minetest.register_node("scifi_nodes:protected_switch_off", {
+	description = "Protected wall switch",
+	tiles = {"scifi_nodes_switch_off.png",},
+	inventory_image = "scifi_nodes_switch_on.png",
+	wield_image = "scifi_nodes_switch_on.png",
+	drawtype = "signlike",
+	sunlight_propagates = true,
+	buildable_to = false,
+	node_box = {type = "wallmounted",},
+	selection_box = {type = "wallmounted",},
+	paramtype = "light",
+	paramtype2 = "wallmounted",
+	groups = {
+		cracky = 1,
+		oddly_breakable_by_hand = 1,
+		mesecon_needs_receiver = 1
+	},
+	mesecons = {
+		receptor = {
+			state = (has_mesecons and mesecon.state.off)
+		}
+	},
+	sounds = scifi_nodes.node_sound_metal_defaults(),
+	on_rightclick = (has_mesecons and toggle_switch)
+})
+
+minetest.register_craft({
+	output = "scifi_nodes:protected_switch_off 2",
+	type = "shapeless",
+	recipe = {"scifi_nodes:switch_off", "default:steel_ingot"}
+})

settingtypes.txt

@@ -1,2 +1,5 @@
-#    Doors can only be opened by mesecon signal
-scifi_nodes.doors_open_with_mesecon_only (disables right click on doors) bool true
+# 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

sounds.lua

@@ -0,0 +1,50 @@
+-- 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

@@ -33,13 +33,18 @@ minetest.register_node("scifi_nodes:switch_on", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	light_source = 5,
-	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
+	groups = {
+		cracky=1,
+		oddly_breakable_by_hand = 1,
+		not_in_creative_inventory = 1,
+		mesecon_needs_receiver = 1
+	},
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch),
 	on_timer = (has_mesecons and toggle_switch)
 })
@@ -56,13 +61,17 @@ minetest.register_node("scifi_nodes:switch_off", {
 	selection_box = {type = "wallmounted",},
 	paramtype = "light",
 	paramtype2 = "wallmounted",
-	groups = {cracky=1, oddly_breakable_by_hand=1, mesecon_needs_receiver = 1},
+	groups = {
+		cracky = 1,
+		oddly_breakable_by_hand = 1,
+		mesecon_needs_receiver = 1
+	},
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.off)
 		}
 	},
-	sounds = default.node_sound_glass_defaults(),
+	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })
 

test/integration-test.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+# Spins up a test world to ensure proper working recipes and registrations
+
+CWD=$(dirname $0)
+cd ${CWD}/../
+
+CFG=/tmp/minetest.conf
+MTDIR=/tmp/mt
+WORLDDIR=${MTDIR}/worlds/world
+
+cat <<EOF > ${CFG}
+ # empty
+EOF
+
+mkdir -p ${WORLDDIR}
+chmod 777 ${MTDIR} -R
+docker run --rm -i \
+	-v ${CFG}:/etc/minetest/minetest.conf:ro \
+	-v ${MTDIR}:/var/lib/minetest/.minetest \
+	-v $(pwd)/:/var/lib/minetest/.minetest/worlds/world/worldmods/scifi_nodes \
+  -v $(pwd)/test/test_mod/:/var/lib/minetest/.minetest/worlds/world/worldmods/scifi_nodes_test \
+  --network host \
+	registry.gitlab.com/minetest/minetest/server:5.2.0
+
+test -f ${WORLDDIR}/integration_test.json && exit 0 || exit 1

test/test_mod/init.lua

@@ -0,0 +1,40 @@
+
+minetest.log("warning", "[TEST] integration-test enabled!")
+
+-- those mods have to be present
+local assert_mods = {
+	"scifi_nodes"
+}
+
+-- those nodes have to be present
+local assert_nodes = {
+	"scifi_nodes:crate",
+	"scifi_nodes:door1a"
+}
+
+minetest.register_on_mods_loaded(function()
+	minetest.after(0, function()
+		-- check mods
+		for _, modname in ipairs(assert_mods) do
+			if not minetest.get_modpath(modname) then
+				error("Mod not present: " .. modname)
+			end
+		end
+
+		-- check nodes
+		for _, nodename in ipairs(assert_nodes) do
+			if not minetest.registered_nodes[nodename] then
+				error("Node not present: " .. nodename)
+			end
+		end
+
+		local data = minetest.write_json({ success = true }, true);
+		local file = io.open(minetest.get_worldpath().."/integration_test.json", "w" );
+		if file then
+			file:write(data)
+			file:close()
+		end
+		minetest.request_shutdown("success")
+
+	end)
+end)

test/test_mod/mod.conf

@@ -0,0 +1,2 @@
+name = scifi_nodes_test
+depends = scifi_nodes