add animated lightbar

* 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

.luacheckrc

@@ -19,6 +19,7 @@ read_globals = {
 	"xpanes",
 	"screwdriver",
 	"minetest",
-	"mesecon"
+	"mesecon",
+	"unifieddyes"
 
 }

README.md

@@ -3,11 +3,14 @@
 # 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)
@@ -42,9 +45,13 @@ CC0
 
 # 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

@@ -767,6 +767,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",
@@ -1282,10 +1292,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",""},
+        {"","",""}
     }
 })
 
@@ -1680,7 +1693,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 +1705,3 @@ minetest.register_craft({
         {"scifi_nodes:stripes"}
     }
 })
-

init.lua

@@ -14,9 +14,11 @@ 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.."/octagon_panes.lua")
 dofile(MP.."/crafts.lua")

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)
@@ -473,6 +475,12 @@ 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,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
@@ -1078,10 +1086,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

nodes.lua

@@ -182,6 +182,23 @@ minetest.register_node("scifi_nodes:disc", {
 	groups = {cracky=1}
 })
 
+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},
+	light_source = 10,
+	sounds = default.node_sound_glass_defaults(),
+	on_place = minetest.rotate_node
+})
 
 minetest.register_node("scifi_nodes:blink", {
 	description = "blinking light",
@@ -500,14 +517,15 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 -- colors available. When crafting, the last recipes will be checked first.
 --add new block using texture name(without "scifi_nodes_" prefix) then the description, and then the name of the block
 local nodetypes = {
+	-- { name, description, shortname?, light, colorable }
 	{"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 +546,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 +603,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 +620,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")

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