Merge remote-tracking branch 'upstream/master'

And optimize textures with optipng

.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,10 +1,17 @@
 name: luacheck
+
 on: [push, pull_request]
+
 jobs:
-  luacheck:
+  build:
+
     runs-on: ubuntu-latest
+
     steps:
-      - name: Checkout
+    - uses: actions/checkout@v1
-        uses: actions/checkout@main
+    - name: apt
-      - name: Luacheck
+      run: sudo apt-get install -y luarocks
-        uses: lunarmodules/luacheck@master
+    - name: luacheck install
+      run: luarocks install --local luacheck
+    - name: luacheck run
+      run: $HOME/.luarocks/bin/luacheck ./

.github/workflows/test.yml

@@ -1,12 +0,0 @@
-name: test
-on: [push, pull_request]
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: buckaroobanzay/mtt@main
-      with:
-        modname: scifi_nodes
-        enable_coverage: "true"
-    - uses: coverallsapp/github-action@v1

.luacheckrc

@@ -1,14 +1,20 @@
-std = "min+minetest"
-
 unused_args = false
+max_line_length = 180
 
 globals = {
 	"scifi_nodes"
 }
 
 read_globals = {
+	-- Stdlib
+	string = {fields = {"split"}},
+	table = {fields = {"copy", "getn"}},
+
+	-- Minetest
+	"vector", "ItemStack",
+	"dump",
+
 	-- optional deps
-	"advtrains",
 	"default",
 	"stairsplus",
 	"xpanes",
@@ -17,8 +23,5 @@ read_globals = {
 	"mesecon",
 	"unifieddyes",
 	"letters",
-	"signs_api",
+	"stealthnode"
-	"stealthnode",
-	"slats",
-	"mtt"
 }

README.md

@@ -3,8 +3,7 @@
 # scifi_nodes
 
 ![](https://github.com/D00Med/scifi_nodes/workflows/luacheck/badge.svg)
-![](https://github.com/D00Med/scifi_nodes/workflows/test/badge.svg)
+![](https://github.com/D00Med/scifi_nodes/workflows/integration-test/badge.svg)
-[![Coverage Status](https://coveralls.io/repos/github/D00Med/scifi_nodes/badge.svg?branch=master)](https://coveralls.io/github/D00Med/scifi_nodes?branch=master)
 [![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.
@@ -43,10 +42,9 @@ CC BY 3.0
 * scifi_nodes_access_refused https://freesound.org/people/RICHERlandTV/sounds/216090/
 * scifi_nodes_forcefield.png https://github.com/minetest-mods/technic/
 * scifi_nodes_dirt.png https://github.com/minetest/minetest_game
-* scifi_nodes_grass_top.png https://github.com/minetest/minetest_game
+* scifi_nodes_grass.png https://github.com/minetest/minetest_game
 * scifi_nodes_grass_side.png https://github.com/minetest/minetest_game
 * scifi_nodes_wood.png https://github.com/minetest/minetest_game
-* scifi_nodes_plastcrete.png https://github.com/mt-mods/basic_materials
 
 CC0
 * scifi_nodes_digicode.ogg https://freesound.org/people/benjaminharveydesign/sounds/315921/

builder.lua

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

chest.lua

@@ -14,7 +14,7 @@ local chest_formspec =
 
 -- Helper functions
 local function drop_chest_stuff()
-	return function(pos, _, oldmetadata)
+	return function(pos, oldnode, oldmetadata, digger)
 		local meta = minetest.get_meta(pos)
 		meta:from_table(oldmetadata)
 		local inv = meta:get_inventory()

common.lua

@@ -1,5 +1,7 @@
 
-function scifi_nodes.get_switch_rules(param2)
+
+scifi_nodes.get_switch_rules = function(param2)
+
 	-- param2 = 2
 	local rules = {
 		{x=1, y=-1, z=-1},
@@ -18,23 +20,3 @@ function scifi_nodes.get_switch_rules(param2)
 	end
 	return rules
 end
-
-scifi_nodes.slope_box = {
-	type = "fixed",
-	fixed = {
-		{-0.5,  -0.5,  -0.5, 0.5, -0.25, 0.5},
-		{-0.5, -0.25, -0.25, 0.5,     0, 0.5},
-		{-0.5,     0,     0, 0.5,  0.25, 0.5},
-		{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
-	}
-}
-
-scifi_nodes.slope_box_simple = {
-	type = "fixed",
-	fixed = {
-		{-0.5,  -0.5,  -0.5, 0.5, -0.25, -0.25},
-		{-0.5, -0.25, -0.25, 0.5,     0, 0},
-		{-0.5,     0,     0, 0.5,  0.25, 0.25},
-		{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
-	}
-}

crafts.lua

@@ -34,15 +34,6 @@ if not minetest.get_modpath("default") or not minetest.get_modpath("dye") then
     return
 end
 
-minetest.register_craft({
-    output = "scifi_nodes:plastcrete 6",
-    recipe = {
-        {"scifi_nodes:white2", "default:gravel", "scifi_nodes:white2"},
-        {"default:gravel", "scifi_nodes:white2", "default:gravel"},
-        {"scifi_nodes:white2", "default:gravel", "scifi_nodes:white2"}
-    }
-})
-
 minetest.register_craft({
 	output = "scifi_nodes:super_white",
 	recipe = {
@@ -243,7 +234,7 @@ minetest.register_craft({
     }
 })
 
--- 4 electronic screen from 4 plastic, 1 lightbar, 2 cyan dye, 2
+-- 4 electronic screen from 4 plastic, 1 trap glow glass, 2 cyan dye, 2
 -- microcontroller
 minetest.register_craft({
     output = "scifi_nodes:screen 4",
@@ -254,7 +245,7 @@ minetest.register_craft({
     }
 })
 
--- 4 electronic screen2 from 4 plastic, 1 lightbar, 2 green dye, 2
+-- 4 electronic screen2 from 4 plastic, 1 trap glow glass, 2 green dye, 2
 -- microcontroller
 minetest.register_craft({
     output = "scifi_nodes:screen2 4",
@@ -265,18 +256,6 @@ minetest.register_craft({
     }
 })
 
-
--- 4 electronic screen3 from 4 plastic, 1 lightbar, 2 black dye, 2
--- microcontroller
-minetest.register_craft({
-    output = "scifi_nodes:screen3 4",
-    recipe = {
-        {"scifi_nodes:white2", "mesecons_microcontroller:microcontroller0000", "scifi_nodes:white2"},
-        {"dye:black", "scifi_nodes:lightbar", "dye:black"},
-        {"scifi_nodes:white2", "mesecons_microcontroller:microcontroller0000", "scifi_nodes:white2"}
-    }
-})
-
 -- 4 black wall screen from 4 black meshes and 1 electronic screen2
 minetest.register_craft({
     output = "scifi_nodes:black_screen 4",
@@ -352,16 +331,6 @@ minetest.register_craft({
     }
 })
 
--- 6 black vnt from 6 black wall block and 6 stripes
-minetest.register_craft({
-    output = "scifi_nodes:blackvnt 6",
-    recipe = {
-        {"scifi_nodes:black", "scifi_nodes:black", "scifi_nodes:black"},
-        {"scifi_nodes:stripes", "scifi_nodes:stripes", "scifi_nodes:stripes"},
-        {"", "", ""}
-    }
-})
-
 -- 6 black vent from 6 black wall
 minetest.register_craft({
     output = "scifi_nodes:blackvent 6",
@@ -764,16 +733,6 @@ minetest.register_craft({
     }
 })
 
--- 6 black pipe from 6 lighttop and 1 vent
-minetest.register_craft({
-    output = "scifi_nodes:blackpipe 6",
-    recipe = {
-        {"scifi_nodes:lighttop", "", "scifi_nodes:lighttop"},
-        {"scifi_nodes:lighttop", "scifi_nodes:vent2", "scifi_nodes:lighttop"},
-        {"scifi_nodes:lighttop", "", "scifi_nodes:lighttop"}
-    }
-})
-
 -- 1 broken green pipe from 1 green pipe
 minetest.register_craft({
     output = "scifi_nodes:grnpipe2",
@@ -937,16 +896,6 @@ minetest.register_craft({
     }
 })
 
--- 4 holes from 4 grey and 1 black dye and 1 white dye and 1 metal mesh
-minetest.register_craft({
-    output = "scifi_nodes:holes 4",
-    recipe = {
-        {"scifi_nodes:grey", "dye:black", "scifi_nodes:grey"},
-        {"", "scifi_nodes:mesh", ""},
-        {"scifi_nodes:grey", "dye:white", "scifi_nodes:grey"}
-    }
-})
-
 -- 4 metal table from 2 grey and 2 dented metal block
 minetest.register_craft({
     output = "scifi_nodes:table 4",
@@ -1686,25 +1635,6 @@ minetest.register_craft({
     }
 })
 
-minetest.register_craft({
-    output = 'scifi_nodes:green2 6',
-    recipe = {
-        {"scifi_nodes:white","dye:dark_green","scifi_nodes:white"},
-        {"scifi_nodes:black","dye:dark_green","scifi_nodes:black"},
-        {"scifi_nodes:white","dye:green","scifi_nodes:white"}
-    }
-})
-
-
-minetest.register_craft({
-    output = 'scifi_nodes:doomwall4 6',
-    recipe = {
-        {"scifi_nodes:white","dye:dark_green","scifi_nodes:white"},
-        {"scifi_nodes:black","dye:dark_green","scifi_nodes:black"},
-        {"scifi_nodes:white","dye:dark_green","scifi_nodes:white"}
-    }
-})
-
 minetest.register_craft({
     output = 'scifi_nodes:doomwall41 6',
     recipe = {
@@ -1851,21 +1781,3 @@ minetest.register_craft({
         {"scifi_nodes:octbl", 	"", 					"scifi_nodes:octbl"}
     }
 })
-
-minetest.register_craft({
-	output = "scifi_nodes:vent3 4",
-	recipe = {
-        {"scifi_nodes:vent2", 	"", 					"scifi_nodes:vent2"},
-        {"", 					"scifi_nodes:glass", 	""},
-        {"scifi_nodes:vent2", 	"", 					"scifi_nodes:vent2"}
-    }
-})
-
-minetest.register_craft({
-	output = "scifi_nodes:mesh3 4",
-	recipe = {
-        {"scifi_nodes:mesh2", 	"", 					"scifi_nodes:mesh2"},
-        {"", 					"scifi_nodes:glass", 	""},
-        {"scifi_nodes:mesh2", 	"", 					"scifi_nodes:mesh2"}
-    }
-})

digicode.lua

@@ -11,7 +11,7 @@ local digicode_context = {}
 
 -- after_place_node, use by digicode and palm_scanner
 -- placer is a player object
-local function set_owner(pos, placer)
+local function set_owner(pos, placer, itemstack, pointed_thing)
 	local meta = minetest.get_meta(pos)
 	meta:set_string("owner", placer:get_player_name())
 	meta:set_string("code", secret_code)
@@ -48,7 +48,7 @@ local function update_code(pos, code)
 	meta:set_string("code", code)
 end
 
-local function show_digicode_formspec(pos, _, player)
+local function show_digicode_formspec(pos, node, player, itemstack, pointed_thing)
 	local meta = minetest.get_meta(pos)
 	local owner = meta:get_string("owner")
 	local current_code = meta:get_string("code")
@@ -122,7 +122,6 @@ minetest.register_node("scifi_nodes:digicode_on", {
 	paramtype2 = "wallmounted",
 	light_source = 5,
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
-	is_ground_content = false,
 	drop = "scifi_nodes:digicode_off",
 	mesecons = {
 		receptor = {
@@ -146,7 +145,6 @@ minetest.register_node("scifi_nodes:digicode_off", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	groups = {cracky=1, oddly_breakable_by_hand=1, mesecon_needs_receiver = 1},
-	is_ground_content = false,
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.off)

doors.lua

@@ -120,7 +120,7 @@ for _, current_door in ipairs(doors) do
 		return itemstack;
 	end
 
-	local function afterdestruct(pos)
+	local function afterdestruct(pos, oldnode)
 		minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z},{name="air"})
 	end
 
@@ -173,12 +173,12 @@ for _, current_door in ipairs(doors) do
 		timer:start(3)
 	end
 
-	local function afterplace(pos)
+	local function afterplace(pos, placer, itemstack, pointed_thing)
 		local node = minetest.get_node(pos)
 		minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z},{name=opened_top,param2=node.param2})
 	end
 
-	local function ontimer(pos)
+	local function ontimer(pos, elapsed)
 		-- play sound
 		minetest.sound_play(sound,{
 			max_hear_distance = 16,
@@ -218,7 +218,7 @@ for _, current_door in ipairs(doors) do
 		},
 	}
 
-	local function nodig()
+	local function nodig(pos, digger)
 		return false
 	end
 
@@ -243,10 +243,8 @@ for _, current_door in ipairs(doors) do
 		groups = {
 			cracky = 3,
 			oddly_breakable_by_hand = 1,
-			scifi_nodes_door = 1,
+			scifi_nodes_door = 1
-			door = 1
 		},
-		is_ground_content = false,
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -279,8 +277,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {cracky = 1, dig_generic = 3, door = 1},
+		groups = {cracky = 1, dig_generic = 3},
-		is_ground_content = false,
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -310,8 +307,7 @@ for _, current_door in ipairs(doors) do
 		paramtype = "light",
 		paramtype2 = "facedir",
 		drop = closed,
-		groups = {cracky = 1, dig_generic = 3, door = 2},
+		groups = {cracky = 1, dig_generic = 3},
-		is_ground_content = false,
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -342,8 +338,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {cracky = 1, dig_generic = 3, door = 2},
+		groups = {cracky = 1, dig_generic = 3},
-		is_ground_content = false,
 		node_box = {
 			type = "fixed",
 			fixed = {

forcefield.lua

@@ -6,7 +6,6 @@ minetest.register_node("scifi_nodes:forcefield", {
 		cracky = 1,
 		level = 3
 	},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults(),
 	paramtype = "light",
 	light_source = minetest.LIGHT_MAX,

init.lua

@@ -30,7 +30,6 @@ dofile(MP.."/nodeboxes.lua")
 dofile(MP.."/palm_scanner.lua")
 dofile(MP.."/digicode.lua")
 dofile(MP.."/octagon_panes.lua")
-dofile(MP.."/octagon_glass.lua")
 dofile(MP.."/forcefield.lua")
 dofile(MP.."/crafts.lua")
 
@@ -44,6 +43,4 @@ if minetest.get_modpath("mesecons_stealthnode") then
 	dofile(MP.."/stealthnodes.lua")
 end
 
-if minetest.get_modpath("mtt") and mtt.enabled then
+minetest.log("action", "[scifi_nodes] loaded.")
-	dofile(MP .. "/mtt.lua")
-end

mod.conf

@@ -1,7 +1,6 @@
 name = scifi_nodes
 description = Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
 optional_depends = """
-advtrains,
 default,
 xpanes,
 mesecons,
@@ -14,8 +13,5 @@ basic_materials,
 dye,
 unifieddyes,
 letters,
-mesecons_stealthnode,
+mesecons_stealthnode
-mtt,
-slats,
-signs_api
 """

models.lua

@@ -16,14 +16,29 @@ function scifi_nodes.register_slope(name, desc, texture, light, soundtype)
 		drawtype = "mesh",
 		mesh = "scifi_nodes_slope.obj",
 		tiles = texture,
-		selection_box = scifi_nodes.slope_box,
+			selection_box = {
-		collision_box = scifi_nodes.slope_box,
+				type = "fixed",
+		fixed = {
+			{-0.5,  -0.5,  -0.5, 0.5, -0.25, 0.5},
+			{-0.5, -0.25, -0.25, 0.5,     0, 0.5},
+			{-0.5,     0,     0, 0.5,  0.25, 0.5},
+			{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
+		}
+			},
+			collision_box = {
+				type = "fixed",
+		fixed = {
+			{-0.5,  -0.5,  -0.5, 0.5, -0.25, 0.5},
+			{-0.5, -0.25, -0.25, 0.5,     0, 0.5},
+			{-0.5,     0,     0, 0.5,  0.25, 0.5},
+			{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
+		}
+			},
 		paramtype = "light",
 		paramtype2 = "facedir",
 		use_texture_alpha = "clip",
 		light_source = light,
 		groups = {cracky=1, dig_generic = 3},
-		is_ground_content = false,
 		on_place = minetest.rotate_node,
 		sounds = sounds,
 	})

models/scifi_nodes_slope_simple.obj

@@ -1,12 +0,0 @@
-g top
-v 0.500000 0.500000 0.500000
-v -0.500000 0.500000 0.500000
-v -0.500000 -0.500000 -0.500000
-v 0.500000 -0.500000 -0.500000
-vt 1.0000 1.0000
-vt 0.0000 1.0000
-vt 0.0000 0.0000
-vt 1.0000 0.0000
-vn 0.0000 0.7071 -0.7071
-s off
-f 2/1/1 1/2/1 4/3/1 3/4/1

mtt.lua

@@ -1,2 +0,0 @@
-
-mtt.validate_nodenames(minetest.get_modpath("scifi_nodes") .. "/nodenames.txt")

nodeboxes.lua

@@ -19,7 +19,6 @@ minetest.register_node("scifi_nodes:alienslope", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -51,7 +50,6 @@ minetest.register_node("scifi_nodes:wallpipe", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -84,7 +82,6 @@ minetest.register_node("scifi_nodes:plant_trap", {
 	walkable = false,
 	sunlight_propagates = false,
 	groups = {snappy=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -111,7 +108,6 @@ minetest.register_node("scifi_nodes:egg", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	groups = {cracky=1, oddly_breakable_by_hand=1, dig_immediate=2, falling_node=1, dig_generic = 3},
-	is_ground_content = false,
 	light_source = 5,
 	node_box = {
 		type = "fixed",
@@ -154,7 +150,6 @@ minetest.register_node("scifi_nodes:pad", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	light_source = 5,
     after_place_node = function(pos, placer, itemstack, pointed_thing)
         local placer_name = placer:get_player_name()
@@ -248,8 +243,7 @@ minetest.register_node("scifi_nodes:pad", {
 		position2 = pos
 		meta:set_int("type", 2)
 		minetest.chat_send_player(clicker_name, "Teleporter 2 connected at "..minetest.pos_to_string(pos))
-		else
+		else minetest.chat_send_player(clicker_name, "Teleporter error!")
-			minetest.chat_send_player(clicker_name, "Teleporter error!")
 		end
 	end,
 	on_destruct = function(pos, oldnode, placer)
@@ -290,7 +284,6 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	use_texture_alpha = "blend",
 	groups = {cracky=3, dig_generic = 4},
 	sounds = scifi_nodes.node_sound_glass_defaults(),
-	is_ground_content = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -317,7 +310,6 @@ minetest.register_node("scifi_nodes:gloshroom", {
 	sunlight_propagates = false,
 	use_texture_alpha = "blend",
 	groups = {fleshy=1, oddly_breakable_by_hand=1, dig_immediate=3},
-	is_ground_content = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -343,7 +335,6 @@ minetest.register_node("scifi_nodes:pot_lid", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	groups = {not_in_creative_inventory = 1},
-	is_ground_content = false,
 	sunlight_propagates = true,
 	diggable = false,
 	drop = "",
@@ -401,7 +392,6 @@ minetest.register_node("scifi_nodes:pot", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	groups = {cracky = 1, soil = 1, sand = 1, dig_generic = 3},
-	is_ground_content = false,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
@@ -436,7 +426,6 @@ minetest.register_node("scifi_nodes:pot2", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	groups = {cracky = 1, soil = 3, wet = 1, dig_generic = 3},
-	is_ground_content = false,
 	selection_box = {
 		type = "fixed",
 		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
@@ -481,7 +470,6 @@ minetest.register_node("scifi_nodes:lightbar", {
 		}
 	},
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -507,7 +495,6 @@ minetest.register_node("scifi_nodes:light_dynamic", {
 	paramtype2 = "wallmounted",
 	light_source = minetest.LIGHT_MAX,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -544,7 +531,6 @@ minetest.register_node("scifi_nodes:ladder", {
 	walkable = false,
 	climbable = true,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 })
 
 minetest.register_node("scifi_nodes:lightbars", {
@@ -567,7 +553,6 @@ minetest.register_node("scifi_nodes:lightbars", {
 		}
 	},
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -590,7 +575,6 @@ minetest.register_node("scifi_nodes:liquid_pipe", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -612,7 +596,6 @@ minetest.register_node("scifi_nodes:liquid_pipe2", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -643,7 +626,6 @@ minetest.register_node("scifi_nodes:powered_stand", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	on_rightclick = function(pos, node, clicker, item, _)
 		local wield_item_stack = clicker:get_wielded_item()
 		local wield_item = wield_item_stack:get_name()
@@ -674,8 +656,6 @@ minetest.register_node("scifi_nodes:cover", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	paramtype2 = "facedir",
-	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -685,8 +665,7 @@ minetest.register_node("scifi_nodes:cover", {
 		}
 	},
 	sounds = scifi_nodes.node_sound_metal_defaults(),
-	groups = {cracky=1, oddly_breakable_by_hand=1},
+	groups = {cracky=1, oddly_breakable_by_hand=1}
-	is_ground_content = false,
 })
 
 minetest.register_node("scifi_nodes:computer", {
@@ -710,7 +689,6 @@ minetest.register_node("scifi_nodes:computer", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
@@ -738,7 +716,6 @@ minetest.register_node("scifi_nodes:keysmonitor", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_defaults(),
 })
 
@@ -767,7 +744,6 @@ minetest.register_node("scifi_nodes:microscope", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_defaults(),
 })
 
@@ -797,8 +773,7 @@ minetest.register_node("scifi_nodes:table", {
 		}
 	},
 	sounds = scifi_nodes.node_sound_metal_defaults(),
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1, dig_generic = 3}
-	is_ground_content = false,
 })
 
 minetest.register_node("scifi_nodes:laptop_open", {
@@ -823,7 +798,6 @@ minetest.register_node("scifi_nodes:laptop_open", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	is_ground_content = false,
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:laptop_closed", param2=node.param2})
 	end,
@@ -851,7 +825,6 @@ minetest.register_node("scifi_nodes:laptop_closed", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:laptop_open", param2=node.param2})
 	end,
@@ -886,7 +859,6 @@ minetest.register_node("scifi_nodes:pipen", {
 		}
 	},
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	on_place = minetest.rotate_node,
 	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
@@ -918,7 +890,6 @@ minetest.register_node("scifi_nodes:windowcorner", {
 		}
 	},
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	on_place = minetest.rotate_node,
 	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
@@ -946,7 +917,6 @@ minetest.register_node("scifi_nodes:windowstraight", {
 		}
 	},
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	on_place = minetest.rotate_node,
 	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
@@ -978,7 +948,6 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 		}
 	},
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	on_place = minetest.rotate_node,
 	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
@@ -1006,7 +975,6 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 		}
 	},
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	on_place = minetest.rotate_node,
 	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
@@ -1037,7 +1005,6 @@ minetest.register_node("scifi_nodes:capsule", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule2", param2=node.param2})
@@ -1068,7 +1035,6 @@ minetest.register_node("scifi_nodes:capsule3", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule", param2=node.param2})
@@ -1099,7 +1065,6 @@ minetest.register_node("scifi_nodes:capsule2", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_rightclick = function(pos, node, clicker, item, _)
 			minetest.set_node(pos, {name="scifi_nodes:capsule3", param2=node.param2})
@@ -1130,7 +1095,6 @@ minetest.register_node("scifi_nodes:itemholder", {
 		}
 	},
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
@@ -1190,7 +1154,6 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
@@ -1223,7 +1186,6 @@ minetest.register_node("scifi_nodes:widescreen", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_defaults(),
 })
 
@@ -1255,7 +1217,6 @@ minetest.register_node("scifi_nodes:tallscreen", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_defaults(),
 })
 
@@ -1277,7 +1238,6 @@ minetest.register_node("scifi_nodes:windowpanel", {
         }
     },
     groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
     on_place = minetest.rotate_node,
     sounds = scifi_nodes.node_sound_glass_defaults(),
 })

nodenames.txt

@@ -1,246 +0,0 @@
-scifi_nodes:liquid_pipe
-scifi_nodes:light
-scifi_nodes:blackdmg
-scifi_nodes:bluemetal
-scifi_nodes:blackpipe
-scifi_nodes:white_pad
-scifi_nodes:green_light
-scifi_nodes:glass
-scifi_nodes:pad
-scifi_nodes:rough
-scifi_nodes:protected_switch_on
-scifi_nodes:rock
-scifi_nodes:greentubes
-scifi_nodes:slope_gblock
-scifi_nodes:greytile
-scifi_nodes:dent
-scifi_nodes:screen2
-scifi_nodes:octbl_pane_offset
-scifi_nodes:octppl_pane_offset
-scifi_nodes:grnpipe
-scifi_nodes:doomengine
-scifi_nodes:egg
-scifi_nodes:ultra_white
-scifi_nodes:octppl_pane_double
-scifi_nodes:cover
-scifi_nodes:laptop_closed
-scifi_nodes:discs
-scifi_nodes:switch_on
-scifi_nodes:Doom_door_closed
-scifi_nodes:glass_pane
-scifi_nodes:disc
-scifi_nodes:whtlightbnd
-scifi_nodes:light_dynamic
-scifi_nodes:slope_wallpipe
-scifi_nodes:greenbar
-scifi_nodes:blue_square
-scifi_nodes:blumetlight
-scifi_nodes:white_door_opened
-scifi_nodes:blue_door_closed
-scifi_nodes:pipeside
-scifi_nodes:keysmonitor
-scifi_nodes:slope_pipe
-scifi_nodes:grass
-scifi_nodes:slope_alien
-scifi_nodes:doomwall3
-scifi_nodes:blumetstr
-scifi_nodes:doomwall42
-scifi_nodes:blue
-scifi_nodes:greenlights2
-scifi_nodes:slope_black
-scifi_nodes:plant10
-scifi_nodes:plant2
-scifi_nodes:blklt2
-scifi_nodes:plant9
-scifi_nodes:screen
-scifi_nodes:purple
-scifi_nodes:white_door_closed
-scifi_nodes:lightstp
-scifi_nodes:slope_stripes
-scifi_nodes:pplwndw
-scifi_nodes:crate
-scifi_nodes:octrng_pane_double
-scifi_nodes:widescreen
-scifi_nodes:blue_door_closed_top
-scifi_nodes:slope_white2
-scifi_nodes:table
-scifi_nodes:green_door_opened
-scifi_nodes:flower1
-scifi_nodes:grnpipe2
-scifi_nodes:slope_mesh
-scifi_nodes:rock2
-scifi_nodes:blackdmgstripe
-scifi_nodes:ppllght
-scifi_nodes:grey_square
-scifi_nodes:plant6
-scifi_nodes:powered_stand
-scifi_nodes:pot
-scifi_nodes:wall
-scifi_nodes:greygreenbar
-scifi_nodes:greenmetal
-scifi_nodes:blacktile2
-scifi_nodes:blackoct
-scifi_nodes:black
-scifi_nodes:slope_ultra_white
-scifi_nodes:lighttop
-scifi_nodes:blackplate
-scifi_nodes:doomwall43
-scifi_nodes:green_square
-scifi_nodes:Doom_door_closed_top
-scifi_nodes:box
-scifi_nodes:green
-scifi_nodes:plant8
-scifi_nodes:whiteoct
-scifi_nodes:wallpipe
-scifi_nodes:flower4
-scifi_nodes:slope_bluebars
-scifi_nodes:engine
-scifi_nodes:glass_pane_double
-scifi_nodes:blacktile
-scifi_nodes:glassscreen
-scifi_nodes:octrng
-scifi_nodes:plant1
-scifi_nodes:computer
-scifi_nodes:grassblk
-scifi_nodes:tower
-scifi_nodes:builder
-scifi_nodes:pplwll2
-scifi_nodes:doomwall431
-scifi_nodes:black_screen
-scifi_nodes:doomwall44
-scifi_nodes:windowstraight2
-scifi_nodes:gblock3
-scifi_nodes:octgrn_pane_offset
-scifi_nodes:glass_pane_offset
-scifi_nodes:octppl_pane
-scifi_nodes:octbl_pane_double
-scifi_nodes:octgrn_pane_double
-scifi_nodes:octgrn_pane
-scifi_nodes:octrng_pane_offset
-scifi_nodes:octrng_pane
-scifi_nodes:digicode_off
-scifi_nodes:octppl
-scifi_nodes:digicode_on
-scifi_nodes:palm_scanner_checking
-scifi_nodes:palm_scanner_off
-scifi_nodes:windowpanel
-scifi_nodes:slope_vent
-scifi_nodes:tallscreen
-scifi_nodes:itemholder
-scifi_nodes:capsule2
-scifi_nodes:capsule3
-scifi_nodes:slope_wall
-scifi_nodes:slope_blklt2
-scifi_nodes:plant5
-scifi_nodes:slope_screen
-scifi_nodes:windowcorner2
-scifi_nodes:windowstraight
-scifi_nodes:windowcorner
-scifi_nodes:pipen
-scifi_nodes:laptop_open
-scifi_nodes:mesh2
-scifi_nodes:microscope
-scifi_nodes:liquid_pipe2
-scifi_nodes:lightbars
-scifi_nodes:doomwall4
-scifi_nodes:lightbar
-scifi_nodes:plant_trap
-scifi_nodes:slope_purple
-scifi_nodes:gloshroom
-scifi_nodes:blue_door_opened_top
-scifi_nodes:greenbar_animated
-scifi_nodes:blue_door_opened
-scifi_nodes:tile
-scifi_nodes:flower3
-scifi_nodes:green_door_opened_top
-scifi_nodes:green_door_closed_top
-scifi_nodes:blackvent
-scifi_nodes:white_door_opened_top
-scifi_nodes:white_door_closed_top
-scifi_nodes:black_door_opened_top
-scifi_nodes:black_door_opened
-scifi_nodes:white_base
-scifi_nodes:black_door_closed_top
-scifi_nodes:black_door_closed
-scifi_nodes:Doom_door_opened_top
-scifi_nodes:stripes
-scifi_nodes:Doom_door_opened
-scifi_nodes:bluebars
-scifi_nodes:doomwall41
-scifi_nodes:green2
-scifi_nodes:whitetile
-scifi_nodes:rust
-scifi_nodes:slope_glight
-scifi_nodes:fan
-scifi_nodes:red_square
-scifi_nodes:greydots
-scifi_nodes:green_door_closed
-scifi_nodes:greenlights
-scifi_nodes:mesh
-scifi_nodes:black_mesh
-scifi_nodes:gblock2
-scifi_nodes:stripes2top
-scifi_nodes:greybolts
-scifi_nodes:octofloor
-scifi_nodes:pplwll3
-scifi_nodes:red
-scifi_nodes:greenmetal2
-scifi_nodes:junk
-scifi_nodes:red_light
-scifi_nodes:pplblk
-scifi_nodes:super_white
-scifi_nodes:bluwllight
-scifi_nodes:blackvnt
-scifi_nodes:pplwll4
-scifi_nodes:slope_holes
-scifi_nodes:vent2
-scifi_nodes:bluetile
-scifi_nodes:eyetree
-scifi_nodes:octgrn
-scifi_nodes:capsule
-scifi_nodes:slope_bluemetal
-scifi_nodes:slope_super_white
-scifi_nodes:switch_off
-scifi_nodes:octbl
-scifi_nodes:doomlight
-scifi_nodes:white2
-scifi_nodes:forcefield
-scifi_nodes:alienslope
-scifi_nodes:slope_white
-scifi_nodes:plant3
-scifi_nodes:slope_mesh2
-scifi_nodes:screen3
-scifi_nodes:pipe
-scifi_nodes:black_detail
-scifi_nodes:slope_lightstripe
-scifi_nodes:slope_blight
-scifi_nodes:ladder
-scifi_nodes:protected_switch_off
-scifi_nodes:rfloor
-scifi_nodes:white
-scifi_nodes:gblock
-scifi_nodes:octofloor2
-scifi_nodes:slope_rough
-scifi_nodes:octbl_pane
-scifi_nodes:bluegrid
-scifi_nodes:pot_lid
-scifi_nodes:slope_rlight
-scifi_nodes:bfloor
-scifi_nodes:plant4
-scifi_nodes:pot2
-scifi_nodes:greybars
-scifi_nodes:doomwall1
-scifi_nodes:holes
-scifi_nodes:black_lights
-scifi_nodes:palm_scanner_on
-scifi_nodes:plant7
-scifi_nodes:flower2
-scifi_nodes:slope_greenmetal
-scifi_nodes:blink
-scifi_nodes:slope_grey
-scifi_nodes:grey
-scifi_nodes:pplwll
-scifi_nodes:stripes2
-scifi_nodes:slope_blight2
-scifi_nodes:monitorwall
-scifi_nodes:doomwall2

nodes.json

@@ -8,21 +8,17 @@
     "white2": {
         "description": "plastic",
         "colorable": true,
-        "sounds": "stone",
+        "sounds": "stone"
-        "signs_banner": true,
-        "signs_banner_color": "#000"
     },
     "super_white": {
         "description": "Super Plastic",
         "light": 11,
-        "sounds": "stone",
+        "sounds": "stone"
-        "texture_name": "white2"
     },
     "ultra_white": {
         "description": "Ultra Plastic",
         "light": 14,
-        "sounds": "stone",
+        "sounds": "stone"
-        "texture_name": "white2"
     },
     "engine": {
         "description": "Engine"
@@ -42,8 +38,7 @@
         "description": "rough metal"
     },
     "lighttop": {
-        "description": "metal block",
+        "description": "metal block"
-        "slat": true
     },
     "red": {
         "description": "red lines"
@@ -54,16 +49,8 @@
     "vent2": {
         "description": "vent"
     },
-    "vent3": {
-        "description": "transparent vent",
-        "texture_name": "vent2",
-        "texture_modifier": "^[makealpha:33,33,33",
-        "drawtype": "glasslike"
-    },
     "stripes": {
-        "description": "hazard stripes",
+        "description": "hazard stripes"
-        "slat": true,
-        "advtrains_platform": true
     },
     "rust": {
         "description": "rusty metal"
@@ -72,8 +59,7 @@
         "description": "metal mesh"
     },
     "black": {
-        "description": "black wall",
+        "description": "black wall"
-        "signs_banner": true
     },
     "blackoct": {
         "description": "black octagon"
@@ -94,12 +80,10 @@
         "description": "blue bars"
     },
     "bluemetal": {
-        "description": "blue metal",
+        "description": "blue metal"
-        "signs_banner": true
     },
     "bluetile": {
-        "description": "blue tile",
+        "description": "blue tile"
-        "slat": true
     },
     "greytile": {
         "description": "grey tile"
@@ -107,12 +91,6 @@
     "mesh2": {
         "description": "metal floormesh"
     },
-    "mesh3": {
-        "description": "transparent metal floormesh",
-        "texture_name": "mesh",
-        "texture_modifier": "^[contrast:10:-50^[makealpha:0,0,0",
-        "drawtype": "glasslike"
-    },
     "pipe": {
         "description": "wall pipe"
     },
@@ -128,8 +106,7 @@
     },
     "whitetile": {
         "description": "white tile 2",
-        "colorable": true,
+        "colorable": true
-        "slat": true
     },
     "black_detail": {
         "description": "black detail"
@@ -154,8 +131,7 @@
         "colorable": true
     },
     "greenmetal": {
-        "description": "green metal wall",
+        "description": "green metal wall"
-        "signs_banner": true
     },
     "greenmetal2": {
         "description": "green metal wall2"
@@ -179,8 +155,7 @@
         "description": "green pipes"
     },
     "grey": {
-        "description": "grey wall",
+        "description": "grey wall"
-        "signs_banner": true
     },
     "greybolts": {
         "description": "grey wall bolts"
@@ -197,13 +172,11 @@
     },
     "octofloor": {
         "description": "Doom floor",
-        "sounds": "stone",
+        "sounds": "stone"
-        "paramtype2": "none"
     },
     "octofloor2": {
         "description": "Brown Doom floor",
-        "sounds": "stone",
+        "sounds": "stone"
-        "paramtype2": "none"
     },
     "doomwall1": {
         "description": "Doom wall 1"
@@ -233,8 +206,7 @@
         "description": "Doom wall 4.4"
     },
     "blackdmg": {
-        "description": "Damaged black wall",
+        "description": "Damaged black wall"
-        "slat": true
     },
     "blackdmgstripe": {
         "description": "Damaged black wall(stripes)"
@@ -280,12 +252,10 @@
         "description": "Purple wall 4"
     },
     "pplblk": {
-        "description": "Purple tile",
+        "description": "Purple tile"
-        "slat": true
     },
     "purple": {
-        "description": "Purple node",
+        "description": "Purple node"
-        "signs_banner": true
     },
     "rock": {
         "description": "Moonstone",
@@ -302,12 +272,5 @@
     },
     "blackplate": {
         "description": "Black plate"
-    },
-    "plastcrete": {
-        "description": "Plastcrete",
-        "sounds": "stone",
-        "colorable": true,
-        "moreblocks": false,
-        "paramtype2": "none"
     }
 }

nodes.lua

@@ -1,19 +1,15 @@
 local has_unifieddyes_mod = minetest.get_modpath("unifieddyes")
 local has_moreblocks_mod = minetest.get_modpath("moreblocks")
-local has_slats_mod = minetest.get_modpath("slats")
-local has_advtrains_mod = minetest.get_modpath("advtrains")
-local has_signs_api_mod = minetest.get_modpath("signs_api")
 
 --nodes
 
 minetest.register_node("scifi_nodes:grassblk", {
 	description = "Dirt With Alien Grass",
-	tiles = {"scifi_nodes_grass_top.png^[colorize:cyan:80", "scifi_nodes_dirt.png",
+	tiles = {"scifi_nodes_grass.png^[colorize:cyan:80", "scifi_nodes_dirt.png",
 		{name = "scifi_nodes_dirt.png^(scifi_nodes_grass_side.png^[colorize:cyan:80)",
 			tileable_vertical = false}},
 	light_source = 2,
 	groups = {crumbly=1, oddly_breakable_by_hand=1, soil=1},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_dirt_defaults({
 		footstep = scifi_nodes.node_sound_plant_defaults().footstep,
 	})
@@ -33,7 +29,6 @@ minetest.register_node("scifi_nodes:light", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
@@ -46,7 +41,6 @@ minetest.register_node("scifi_nodes:rfloor", {
 	paramtype2 = "facedir",
 	light_source = 10,
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -59,7 +53,6 @@ minetest.register_node("scifi_nodes:bfloor", {
 	paramtype2 = "facedir",
 	light_source = 10,
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -77,7 +70,6 @@ minetest.register_node("scifi_nodes:stripes2", {
 	},
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -93,8 +85,7 @@ minetest.register_node("scifi_nodes:gblock", {
 		"scifi_nodes_gblock.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1, dig_generic = 3};
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -112,7 +103,6 @@ minetest.register_node("scifi_nodes:gblock2", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -130,7 +120,6 @@ minetest.register_node("scifi_nodes:gblock3", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -150,7 +139,6 @@ minetest.register_node("scifi_nodes:green_light", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -168,7 +156,6 @@ minetest.register_node("scifi_nodes:red_light", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -185,7 +172,6 @@ minetest.register_node("scifi_nodes:discs", {
 	},
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -200,7 +186,6 @@ minetest.register_node("scifi_nodes:disc", {
 	wield_image = "scifi_nodes_disc.png",
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_defaults(),
 })
 
@@ -217,7 +202,6 @@ minetest.register_node("scifi_nodes:greenbar_animated", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	light_source = 10,
 	sounds = scifi_nodes.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
@@ -232,7 +216,6 @@ minetest.register_node("scifi_nodes:blink", {
 	}},
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	light_source = 5,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
@@ -246,7 +229,6 @@ minetest.register_node("scifi_nodes:black_lights", {
 	}},
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -259,7 +241,6 @@ minetest.register_node("scifi_nodes:black_screen", {
 	}},
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	light_source = 1,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
@@ -273,7 +254,6 @@ minetest.register_node("scifi_nodes:screen", {
 	}},
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	light_source = 5,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
@@ -287,7 +267,6 @@ minetest.register_node("scifi_nodes:screen2", {
 	}},
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	light_source = 5,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
@@ -308,7 +287,6 @@ minetest.register_node("scifi_nodes:white_pad", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -326,7 +304,6 @@ minetest.register_node("scifi_nodes:white_base", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -344,7 +321,6 @@ minetest.register_node("scifi_nodes:grnpipe", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
@@ -364,11 +340,94 @@ minetest.register_node("scifi_nodes:grnpipe2", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
 
+minetest.register_node("scifi_nodes:octrng", {
+	description = "Orange Octagon Glass",
+	sunlight_propagates = false,
+	drawtype = "glasslike",
+	tiles = {
+		"scifi_nodes_octrng.png",
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	use_texture_alpha = "blend",
+	light_source = 10,
+	groups = {cracky=2, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults(),
+})
+
+minetest.register_node("scifi_nodes:octgrn", {
+	description = "Green Octagon Glass",
+	sunlight_propagates = false,
+	drawtype = "glasslike",
+	tiles = {
+		"scifi_nodes_octgrn.png",
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	use_texture_alpha = "blend",
+	light_source = 10,
+	groups = {cracky=2, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults(),
+})
+
+minetest.register_node("scifi_nodes:octbl", {
+	description = "Blue Octagon Glass",
+	sunlight_propagates = false,
+	drawtype = "glasslike",
+	tiles = {
+		"scifi_nodes_octbl.png",
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	use_texture_alpha = "blend",
+	light_source = 10,
+	groups = {cracky=2, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults(),
+})
+
+minetest.register_node("scifi_nodes:octppl", {
+	description = "Purple Octagon Glass",
+	sunlight_propagates = false,
+	drawtype = "glasslike",
+	tiles = {
+		"scifi_nodes_octppl.png",
+	},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	use_texture_alpha = "blend",
+	light_source = 10,
+	groups = {cracky=2, dig_generic = 3},
+	sounds = scifi_nodes.node_sound_glass_defaults(),
+})
+
+if has_unifieddyes_mod then
+	minetest.register_node("scifi_nodes:octwht", {
+		description = "Octagon Glass",
+		sunlight_propagates = false,
+		drawtype = "glasslike",
+		tiles = {
+			"scifi_nodes_octwht.png",
+		},
+		palette = "unifieddyes_palette_extended.png",
+		paramtype = "light",
+		paramtype2 = "color",
+		use_texture_alpha = "blend",
+		light_source = 10,
+		groups = {
+			cracky = 2,
+			dig_generic = 3,
+			ud_param2_colorable = 1
+		},
+		sounds = scifi_nodes.node_sound_glass_defaults(),
+		on_construct = unifieddyes.on_construct,
+		on_dig = unifieddyes.on_dig
+	})
+end
+
 minetest.register_node("scifi_nodes:tower", {
 	description = "Wind tower",
 	sunlight_propagates = false,
@@ -381,7 +440,6 @@ minetest.register_node("scifi_nodes:tower", {
 	inventory_image = "scifi_nodes_tower.png",
 	paramtype = "light",
 	groups = {cracky=2, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -400,7 +458,6 @@ minetest.register_node("scifi_nodes:junk", {
 		"scifi_nodes_junk.png"
 	},
 	groups = {snappy=1, oddly_breakable_by_hand=1, liquid=3, dig_immediate=1},
-	is_ground_content = false,
 })
 
 
@@ -418,7 +475,6 @@ minetest.register_node("scifi_nodes:blumetlight", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -432,7 +488,6 @@ minetest.register_node("scifi_nodes:lightstp", {
 	light_source = minetest.LIGHT_MAX,
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -445,7 +500,6 @@ minetest.register_node("scifi_nodes:blklt2", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -458,7 +512,6 @@ minetest.register_node("scifi_nodes:blumetstr", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -472,7 +525,6 @@ minetest.register_node("scifi_nodes:glass", {
 	use_texture_alpha = "blend",
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
@@ -485,7 +537,6 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 	light_source = 10,
 	paramtype = "light",
 	groups = {cracky=1, dig_generic = 3},
-	is_ground_content = false,
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
@@ -511,20 +562,13 @@ for name, def in pairs(nodes) do
 		tiles = {"scifi_nodes_" .. def.texture_name .. ".png"}
 	end
 
-	-- optional texture modifier
-	if def.texture_modifier then
-		tiles[1] = tiles[1] .. def.texture_modifier
-	end
-
 	-- Node Definition
 	local node_def = {
 		description = def.description,
-		drawtype = def.drawtype or "normal",
 		tiles = tiles,
 		groups = {cracky=1, dig_generic = 3},
-		is_ground_content = false,
 		paramtype = "light",
-		paramtype2 = def.paramtype2 or "facedir",
+		paramtype2 = "facedir",
 		light_source = def.light,
 		sounds = sounds,
 	}
@@ -549,7 +593,6 @@ for name, def in pairs(nodes) do
 				ud_param2_colorable = 1,
 				not_in_creative_inventory = 1
 			},
-			is_ground_content = false,
 			palette = "unifieddyes_palette_extended.png",
 			paramtype = "light",
 			paramtype2 = "color",
@@ -573,39 +616,4 @@ for name, def in pairs(nodes) do
 			sounds = sounds,
 		})
 	end
-
-	-- advtrains platform registration
-	if has_advtrains_mod and def.advtrains_platform then
-		advtrains.register_platform("scifi_nodes", "scifi_nodes:" .. name)
-	end
-
-	if has_signs_api_mod and def.signs_banner then
-		signs_api.register_sign("scifi_nodes", name .. "_banner", {
-			depth = 1/16,
-			width = 5,
-			height = 1,
-			entity_fields = {
-				maxlines = 1,
-				color = def.signs_banner_color or "#fff",
-			},
-			node_fields = {
-				visual_scale = 1,
-				description = name .. " banner",
-				tiles = tiles,
-				inventory_image = "scifi_nodes_" .. name .. ".png",
-				use_texture_alpha = "clip",
-			},
-		})
-	end
-
-	if has_slats_mod and def.slat then
-		slats.register_slat(
-			name,
-			"scifi_nodes:" .. name,
-			table.copy(node_def.groups),
-			"scifi_nodes_" .. name .. ".png^slats_slat_overlay.png^[makealpha:255,126,126",
-			def.description .. " Slat",
-			sounds
-		)
-	end
 end

octagon_glass.lua

@@ -1,53 +0,0 @@
-local has_unifieddyes_mod = minetest.get_modpath("unifieddyes")
-
-local function register_glass(key, name)
-    local tiles = {"scifi_nodes_" .. key .. ".png"}
-
-    minetest.register_node("scifi_nodes:" .. key, {
-        description = name .. " Octagon Glass",
-        sunlight_propagates = true,
-        drawtype = "glasslike",
-        tiles = tiles,
-        paramtype = "light",
-        paramtype2 = "facedir",
-        use_texture_alpha = "blend",
-        light_source = 10,
-        groups = {
-            cracky = 2,
-            dig_generic = 3
-        },
-        is_ground_content = false,
-        sounds = scifi_nodes.node_sound_glass_defaults(),
-    })
-end
-
-register_glass("octppl", "Purple")
-register_glass("octbl", "Blue")
-register_glass("octgrn", "Green")
-register_glass("octrng", "Orange")
-register_glass("octwht", "White")
-
-if has_unifieddyes_mod then
-	minetest.register_node("scifi_nodes:octwht", {
-		description = "Octagon Glass",
-		sunlight_propagates = true,
-		drawtype = "glasslike",
-		tiles = {
-			"scifi_nodes_octwht.png",
-		},
-		palette = "unifieddyes_palette_extended.png",
-		paramtype = "light",
-		paramtype2 = "color",
-		use_texture_alpha = "blend",
-		light_source = 10,
-		groups = {
-			cracky = 2,
-			dig_generic = 3,
-			ud_param2_colorable = 1
-		},
-		is_ground_content = false,
-		sounds = scifi_nodes.node_sound_glass_defaults(),
-		on_construct = unifieddyes.on_construct,
-		on_dig = unifieddyes.on_dig
-	})
-end

octagon_panes.lua

@@ -1,15 +1,13 @@
 
-local function register(basename, color, texture)
+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 nodename_slope = "scifi_nodes:" .. basename .. "_slope"
   local recipe_ingredient = "scifi_nodes:" .. basename
-  local base_decription = color ..  " octagon glass"
 
   -- single height
   minetest.register_node(nodename_single, {
-    description = base_decription .. " pane",
+    description = description,
     drawtype = "nodebox",
     tiles = {
       texture
@@ -27,17 +25,14 @@ local function register(basename, color, texture)
       type = "fixed",
       fixed = {{-0.5, -0.5, -0.25, 0.5, 0.5, 0.25}},
     },
-    groups = {
+    groups = {cracky = 3, oddly_breakable_by_hand = 3},
-      cracky = 3,
-      oddly_breakable_by_hand = 3
-    },
     use_texture_alpha = "blend",
     sounds = scifi_nodes.node_sound_glass_defaults()
   })
 
   -- double height
   minetest.register_node(nodename_double, {
-    description = base_decription .. " pane (double)",
+    description = description,
     drawtype = "nodebox",
     tiles = {
       texture
@@ -55,17 +50,14 @@ local function register(basename, color, texture)
       type = "fixed",
       fixed = {{-0.5, -0.5, -0.25, 0.5, 1.5, 0.25}},
     },
-    groups = {
+    groups = {cracky = 3, oddly_breakable_by_hand = 3},
-      cracky = 3,
-      oddly_breakable_by_hand = 3
-    },
     use_texture_alpha = "blend",
     sounds = scifi_nodes.node_sound_glass_defaults()
   })
 
   -- single height with offset
   minetest.register_node(nodename_offset, {
-    description = base_decription .. " pane (offset)",
+    description = description,
     drawtype = "nodebox",
     tiles = {
       texture
@@ -83,37 +75,11 @@ local function register(basename, color, texture)
       type = "fixed",
       fixed = {{-0.5, -0.5, 0.75, 0.5, 0.5, 1.25}},
     },
-    groups = {
+    groups = {cracky = 3, oddly_breakable_by_hand = 3},
-      cracky = 3,
-      oddly_breakable_by_hand = 3,
-      not_blocking_trains = 1
-    },
     use_texture_alpha = "blend",
     sounds = scifi_nodes.node_sound_glass_defaults()
   })
 
-  -- slope pane
-  minetest.register_node(nodename_slope, {
-    description = base_decription .. " pane (slope)",
-		sunlight_propagates = true,
-		drawtype = "mesh",
-		mesh = "scifi_nodes_slope_simple.obj",
-		tiles = {
-      texture
-    },
-    paramtype = "light",
-		paramtype2 = "facedir",
-		use_texture_alpha = "blend",
-		light_source = 10,
-		groups = {
-			cracky = 2,
-			dig_generic = 3
-		},
-		selection_box = scifi_nodes.slope_box_simple,
-		collision_box = scifi_nodes.slope_box_simple,
-		is_ground_content = false,
-		sounds = scifi_nodes.node_sound_glass_defaults()
-	})
   -- register recipes
 
   minetest.register_craft({
@@ -123,15 +89,6 @@ local function register(basename, color, texture)
     },
   })
 
-  minetest.register_craft({
-    output = nodename_slope .. " 16",
-    recipe = {
-      {"", "", recipe_ingredient},
-      {"", recipe_ingredient, ""},
-      {recipe_ingredient, "", ""}
-    },
-  })
-
   minetest.register_craft({
     output = nodename_double .. " 16",
     recipe = {
@@ -147,9 +104,8 @@ local function register(basename, color, texture)
   })
 end
 
-register("octrng", "Orange", "scifi_nodes_octrng.png")
+register("octrng", "Orange Octagon Glass pane", "scifi_nodes_octrng.png")
-register("octgrn", "Green", "scifi_nodes_octgrn.png")
+register("octgrn", "Green Octagon Glass pane", "scifi_nodes_octgrn.png")
-register("octbl", "Blue", "scifi_nodes_octbl.png")
+register("octbl", "Blue Octagon Glass pane", "scifi_nodes_octbl.png")
-register("octppl", "Purple", "scifi_nodes_octppl.png")
+register("octppl", "Purple Octagon Glass pane", "scifi_nodes_octppl.png")
-register("octwht", "White", "scifi_nodes_octwht.png")
 register("glass", "Dark Glass pane", "scifi_nodes_glass.png")

palm_scanner.lua

@@ -59,7 +59,6 @@ minetest.register_node("scifi_nodes:palm_scanner_off", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	groups = {cracky=1, oddly_breakable_by_hand=1, mesecon_needs_receiver = 1},
-	is_ground_content = false,
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.off)
@@ -83,7 +82,6 @@ minetest.register_node("scifi_nodes:palm_scanner_checking", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
-	is_ground_content = false,
 	drop = "scifi_nodes:palm_scanner_off",
 	sounds = scifi_nodes.node_sound_metal_defaults()
 })
@@ -102,7 +100,6 @@ minetest.register_node("scifi_nodes:palm_scanner_on", {
 	paramtype2 = "wallmounted",
 	light_source = 5,
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1, mesecon_needs_receiver = 1},
-	is_ground_content = false,
 	drop = "scifi_nodes:palm_scanner_off",
 	mesecons = {
 		receptor = {

protected_switch.lua

@@ -46,7 +46,6 @@ minetest.register_node("scifi_nodes:protected_switch_on", {
 		not_in_creative_inventory = 1,
 		mesecon_needs_receiver = 1
 	},
-	is_ground_content = false,
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)
@@ -74,7 +73,6 @@ minetest.register_node("scifi_nodes:protected_switch_off", {
 		oddly_breakable_by_hand = 1,
 		mesecon_needs_receiver = 1
 	},
-	is_ground_content = false,
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.off)

switch.lua

@@ -39,7 +39,6 @@ minetest.register_node("scifi_nodes:switch_on", {
 		not_in_creative_inventory = 1,
 		mesecon_needs_receiver = 1
 	},
-	is_ground_content = false,
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)
@@ -67,7 +66,6 @@ minetest.register_node("scifi_nodes:switch_off", {
 		oddly_breakable_by_hand = 1,
 		mesecon_needs_receiver = 1
 	},
-	is_ground_content = false,
 	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