update contributor list

fixes #19

.github/workflows/integration-test.yml

@@ -1,15 +0,0 @@
-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/mtinfo.yml

@@ -1,21 +0,0 @@
-name: mtinfo
-
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-20.04
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - name: generate
-      run: ./generate-mtinfo.sh
-
-    - name: deploy
-      if: github.ref == 'refs/heads/master'
-      uses: peaceiris/actions-gh-pages@v3
-      with:
-        github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./output

.gitignore

@@ -45,6 +45,3 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
-
-# generated sources
-output

.luacheckrc

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

README.md

@@ -3,14 +3,11 @@
 # 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.
 
-# Changelog
+# Changes log
 
-* 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)

crafts.lua

@@ -767,16 +767,6 @@ 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",
@@ -1292,13 +1282,10 @@ 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',
+    output = 'scifi_nodes:windowpanel 4',
     recipe = {
-        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
-        {"scifi_nodes:glass_pane","scifi_nodes:glass_pane",""},
-        {"","",""}
+        {"scifi_nodes:glass","",""}
     }
 })
 
@@ -1693,7 +1680,7 @@ minetest.register_craft({
 minetest.register_craft({
     output = 'scifi_nodes:stripes2top 3',
     recipe = {
-        {"scifi_nodes:black","scifi_nodes:black","scifi_nodes:black"},
+        {"scifi_nodes:black","scifi_noedes:black","scifi_nodes:black"},
         {"default:silver_sand","default:silver_sand","default:silver_sand"}
     }
 })
@@ -1705,3 +1692,4 @@ minetest.register_craft({
         {"scifi_nodes:stripes"}
     }
 })
+

generate-mtinfo.sh

@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# prepare config
-CONFIG=/tmp/scifi_nodes_minetest.conf
-echo "mtinfo.autoshutdown = true" > ${CONFIG}
-echo "moreblocks.stairsplus_in_creative_inventory = false" >> ${CONFIG}
-
-# prepare dependent mods
-WORLDMODS_DIR=/tmp/scifi_nodes_worldmods
-git clone --depth=1 https://gitlab.com/VanessaE/unifieddyes.git ${WORLDMODS_DIR}/unifieddyes
-git clone --depth=1 https://gitlab.com/VanessaE/basic_materials.git ${WORLDMODS_DIR}/basic_materials
-git clone --depth=1 https://github.com/minetest-mods/mesecons.git ${WORLDMODS_DIR}/mesecons
-git clone --depth=1 https://github.com/minetest-mods/moreblocks.git ${WORLDMODS_DIR}/moreblocks
-git clone --depth=1 https://github.com/BuckarooBanzay/mtinfo.git ${WORLDMODS_DIR}/mtinfo
-cp . ${WORLDMODS_DIR}/scifi_nodes -R
-
-# start container with mtinfo
-docker run --rm -i \
-	--user root \
-	-v ${CONFIG}:/etc/minetest/minetest.conf:ro \
-	-v ${WORLDMODS_DIR}/:/root/.minetest/worlds/world/worldmods \
-	-v $(pwd)/output:/root/.minetest/worlds/world/mtinfo \
-	registry.gitlab.com/minetest/minetest/server:5.4.0
-
-test -f $(pwd)/output/index.html || exit 1
-test -f $(pwd)/output/data/items.js || exit 1
-test -d $(pwd)/output/textures || exit 1

init.lua

@@ -14,11 +14,9 @@ dofile(MP.."/chest.lua")
 dofile(MP.."/plants.lua")
 dofile(MP.."/nodes.lua")
 dofile(MP.."/doors.lua")
-dofile(MP.."/switch.lua")
-dofile(MP.."/protected_switch.lua")
+dofile(MP.."/switches.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,unifieddyes
+optional_depends = xpanes,mesecons,moreblocks,mesecons_microcontroller,mesecons_button,mesecons_torch,mesecons_receiver,basic_materials

models.lua

@@ -29,7 +29,6 @@ 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
@@ -70,104 +69,106 @@ scifi_nodes.register_slope("blklt2", "Black stripe light", {"scifi_nodes_black_l
 local node = {}
 
 node.types = {
-	{"blue",      "blue lines"},
-	{"holes",       "metal with holes"},
-	{"white2",      "plastic",},
-	{"super_white",      "Super Plastic", 11},
-	{"ultra_white",      "Ultra Plastic", default.LIGHT_MAX},
+	{"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},
 --	{"engine",      "engine",          "engine"},
-	{"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"},
+	{"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"},
 --	{"monitorwall",      "Wall monitors",       "monitorwall"},
-	{"screen3",      "Wall monitor"},
-	{"doomlight",      "Doom light",       12},
-	{"bluwllight",      "Blue wall light", default.LIGHT_MAX},
-	{"bluegrid",      "Blue Grid", 5},
-	{"fan",      "Fan"},
-	{"ppllght",      "Purple wall light", default.LIGHT_MAX},
-	{"pplwll",      "Purple wall"},
-	{"pplwll2",      "Purple wall2"},
-	{"pplwll3",      "Purple wall3"},
-	{"pplwll4",      "Purple wall4"},
-	{"pplblk",      "Purple tile"},
-	{"purple",      "Purple node"},
-	{"rock",      "Moonstone"},
-	{"rock2",      "Moonstone2"},
-	{"blackvnt",      "Black vent"},
-	{"blackplate",      "Black plate"},
+	{"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},
 }
 
 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]
 		-- Node Definition
-		stairsplus:register_all("scifi_nodes", name, "scifi_nodes:"..name, {
-			description = row[2],
+		stairsplus:register_all("scifi_nodes", row[1], "scifi_nodes:"..name, {
+			description = desc,
 			tiles = {"scifi_nodes_"..name..".png"},
-			use_texture_alpha = "clip",
 			groups = {cracky=1},
 			paramtype = "light",
 			paramtype2 = "facedir",
-			light_source = row[3],
+			light_source = light,
 		})
 	end
 end

nodeboxes.lua

@@ -151,8 +151,7 @@ minetest.register_node("scifi_nodes:pad", {
 	paramtype = "light",
 	groups = {cracky=1, oddly_breakable_by_hand=1},
 	light_source = 5,
-    after_place_node = function(pos, placer, itemstack, pointed_thing)
-        local placer_name = placer:get_player_name()
+	on_construct = function(pos, node, placer)
 		local meta = minetest.get_meta(pos)
 		if position1 == nil then
 			position1 = pos
@@ -161,11 +160,10 @@ minetest.register_node("scifi_nodes:pad", {
 			position2 = pos
 			meta:set_int("type", 2)
 		else
-			minetest.chat_send_player(placer_name, "There can only be two teleportation pads at a time!")
+			minetest.chat_send_all("There can only be two teleportation pads at a time!")
 		end
 	end,
 	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(
@@ -238,12 +236,12 @@ minetest.register_node("scifi_nodes:pad", {
 		elseif position1 == nil and meta:get_int("type") ~= 2 then
 		position1 = pos
 		meta:set_int("type", 1)
-		minetest.chat_send_player(clicker_name, "Teleporter 1 connected at "..minetest.pos_to_string(pos))
+		minetest.chat_send_all("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_player(clicker_name, "Teleporter 2 connected at "..minetest.pos_to_string(pos))
-		else minetest.chat_send_player(clicker_name, "Teleporter error!")
+		minetest.chat_send_all("Teleporter 2 connected at "..minetest.pos_to_string(pos))
+		else minetest.chat_send_all("Teleporter error!")
 		end
 	end,
 	on_destruct = function(pos, oldnode, placer)
@@ -281,7 +279,7 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	groups = {cracky=3},
 	sounds = default.node_sound_glass_defaults(),
 	node_box = {
@@ -308,7 +306,7 @@ minetest.register_node("scifi_nodes:gloshroom", {
 	walkable = false,
 	buildable_to = true,
 	sunlight_propagates = false,
-	use_texture_alpha = "blend",
+	use_texture_alpha =  true,
 	groups = {fleshy=1, oddly_breakable_by_hand=1, dig_immediate=3},
 	node_box = {
 		type = "fixed",
@@ -335,7 +333,7 @@ minetest.register_node("scifi_nodes:pot_lid", {
 	},
 	inventory_image = "scifi_nodes_pod_inv.png",
 	wield_image = "scifi_nodes_pod_inv.png",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	groups = {cracky=1, not_in_creative_inventory=1},
@@ -475,12 +473,6 @@ 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},
@@ -529,7 +521,7 @@ minetest.register_node("scifi_nodes:lightbars", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = default.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
@@ -550,7 +542,7 @@ tiles = {{
 		name = "scifi_nodes_liquid.png",
 		animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.00},
 	}},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
@@ -570,7 +562,7 @@ minetest.register_node("scifi_nodes:liquid_pipe2", {
 tiles = {
 		"scifi_nodes_orange.png",
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
@@ -854,7 +846,7 @@ minetest.register_node("scifi_nodes:windowcorner", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -885,7 +877,7 @@ minetest.register_node("scifi_nodes:windowstraight", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -912,7 +904,7 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -943,7 +935,7 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	node_box = {
@@ -970,7 +962,7 @@ minetest.register_node("scifi_nodes:capsule", {
 		"scifi_nodes_capsule.png",
 		"scifi_nodes_capsule.png"
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1000,7 +992,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		"scifi_nodes_capsule3.png",
 		"scifi_nodes_capsule3.png"
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1030,7 +1022,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		"scifi_nodes_capsule2.png",
 		"scifi_nodes_capsule2.png"
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1086,9 +1078,10 @@ 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, taken:to_string())
+				minetest.add_item(pos, wield_item)
 				return item
 			end
 		end
@@ -1118,7 +1111,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		"scifi_nodes_glscrn.png",
 		"scifi_nodes_glscrn.png"
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
@@ -1204,7 +1197,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
     },
     drawtype = "nodebox",
     paramtype = "light",
-    use_texture_alpha = "blend",
+    use_texture_alpha = true,
     sunlight_propagates = true,
     paramtype2 = "facedir",
     node_box = {

nodes.lua

@@ -182,23 +182,6 @@ 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",
@@ -346,7 +329,7 @@ minetest.register_node("scifi_nodes:octrng", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -361,7 +344,7 @@ minetest.register_node("scifi_nodes:octgrn", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -376,7 +359,7 @@ minetest.register_node("scifi_nodes:octbl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -391,7 +374,7 @@ minetest.register_node("scifi_nodes:octppl", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	light_source = 10,
 	groups = {cracky=2},
 	sounds = default.node_sound_glass_defaults(),
@@ -491,7 +474,7 @@ minetest.register_node("scifi_nodes:glass", {
 	tiles = {
 		"scifi_nodes_glass.png"
 	},
-	use_texture_alpha = "blend",
+	use_texture_alpha = true,
 	paramtype = "light",
 	groups = {cracky=1},
 	sounds = default.node_sound_glass_defaults()
@@ -517,15 +500,14 @@ 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", 0, true},
+	{"white2",      "plastic",         "white2"},
     {"super_white",      "Super Plastic",         "super_white", 11},
     {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
 	{"engine",      "engine",          "engine"},
 	{"wall",      "metal wall",        "wall"},
-	{"white",      "plastic wall",     "white", 0, true},
+	{"white",      "plastic wall",     "white"},
 	{"stripes2top",     "dirty metal block","metal2"},
 	{"rough",      "rough metal",      "rough"},
 	{"lighttop",      "metal block",      "metal"},
@@ -546,11 +528,12 @@ 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", 0, true},
-	{"whitetile",      "white tile2",       "whttl", 0, true},
+	{"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"},
@@ -603,16 +586,12 @@ 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
-	local node_def = {
+	minetest.register_node("scifi_nodes:"..name, {
 		description = desc,
 		tiles = {"scifi_nodes_"..name..".png"},
 		groups = {cracky=1},
@@ -620,35 +599,5 @@ for _, row in ipairs(nodetypes) do
 		paramtype2 = "facedir",
 		light_source = light,
 		sounds = default.node_sound_glass_defaults()
-	}
-
-	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

@@ -1,111 +0,0 @@
-
-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 = 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 = "blend",
-    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 = "blend",
-    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

@@ -1,89 +0,0 @@
-
---------------
--- 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"}
-})

switches.lua

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

@@ -1,25 +0,0 @@
-#!/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

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

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