Merge remote-tracking branch 'upstream/master'

* add pane variants of the octagon glass nodes (single, double and offset)
* fix some indent issues
* added dark glass pane

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

@@ -19,6 +19,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,26 @@ 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/
 
+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

crafts.lua

@@ -1680,7 +1680,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 +1692,3 @@ minetest.register_craft({
         {"scifi_nodes:stripes"}
     }
 })
-

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
 
@@ -327,6 +284,7 @@ for _, current_door in ipairs(doors) do
 				{0, 0, 0, 0, 0, 0},
 			}
 		},
+		can_dig = nodig,
 	})
 
 	minetest.register_node(opened, {
@@ -355,9 +313,9 @@ 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,
 	})
 
 	minetest.register_node(opened_top, {
@@ -385,5 +343,6 @@ for _, current_door in ipairs(doors) do
 				{0, 0, 0, 0, 0, 0},
 			}
 		},
+		can_dig = nodig,
 	})
 end     -- end of doors table browsing

init.lua

@@ -14,9 +14,13 @@ dofile(MP.."/chest.lua")
 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.."/crafts.lua")
+dofile(MP.."/octagon_panes.lua")
+
+minetest.log("action", "[scifi_nodes] loaded.")

mod.conf

@@ -1,4 +1,4 @@
 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 = xpanes,mesecons,moreblocks,mesecons_microcontroller,mesecons_button,mesecons_torch,mesecons_receiver,basic_materials,unifieddyes

nodeboxes.lua

@@ -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)

nodes.lua

@@ -500,14 +500,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 }
 	{"blue",      "blue lines",        "blue"},
 	{"holes",       "metal with holes","holes"},
-	{"white2",      "plastic",         "white2"},
+	{"white2",      "plastic",         "white2", 0, true},
     {"super_white",      "Super Plastic",         "super_white", 11},
     {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
 	{"engine",      "engine",          "engine"},
 	{"wall",      "metal wall",        "wall"},
-	{"white",      "plastic wall",     "white"},
+	{"white",      "plastic wall",     "white", 0, true},
 	{"stripes2top",     "dirty metal block","metal2"},
 	{"rough",      "rough metal",      "rough"},
 	{"lighttop",      "metal block",      "metal"},
@@ -528,12 +529,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"},
@@ -586,12 +586,16 @@ local nodetypes = {
 	{"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]
+
 	-- Node Definition
-	minetest.register_node("scifi_nodes:"..name, {
+	local node_def = {
 		description = desc,
 		tiles = {"scifi_nodes_"..name..".png"},
 		groups = {cracky=1},
@@ -599,5 +603,35 @@ for _, row in ipairs(nodetypes) do
 		paramtype2 = "facedir",
 		light_source = light,
 		sounds = default.node_sound_glass_defaults()
-	})
-end
+	}
+
+	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 = default.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 = true,
+    sounds = default.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 = true,
+    sounds = default.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 = true,
+    sounds = default.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")

plants.lua

@@ -29,7 +29,7 @@ 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,

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 = default.node_sound_glass_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 = default.node_sound_glass_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"}
+})

switch.lua

@@ -33,7 +33,12 @@ 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)
@@ -56,7 +61,11 @@ 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)

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