fix name typo in github action

fix inventory image parameter value

.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:

README.md

@@ -2,6 +2,9 @@
 
 # scifi_nodes
 
+![](https://github.com/D00Med/scifi_nodes/workflows/luacheck/badge.svg)
+![](https://github.com/D00Med/scifi_nodes/workflows/integration-test/badge.svg)
+
 Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
 
 # Changes log
@@ -27,15 +30,17 @@ 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:
 
 * tanmayameher https://github.com/tanmayameher
@@ -43,3 +48,4 @@ CC BY-NC 3.0
 * acmgit https://github.com/acmgit
 * catz85 https://github.com/catz85
 * coil0 https://github.com/coil0
+* Grossam https://github.com/Grossam

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

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,

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