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,5 +1,3 @@
-std = "min+minetest"
-
 unused_args = false
 
 globals = {
@@ -7,18 +5,21 @@ globals = {
 }
 
 read_globals = {
+	-- Stdlib
+	string = {fields = {"split"}},
+	table = {fields = {"copy", "getn"}},
+
+	-- Minetest
+	"vector", "ItemStack",
+	"dump",
+
 	-- optional deps
-	"advtrains",
 	"default",
 	"stairsplus",
 	"xpanes",
 	"screwdriver",
 	"minetest",
 	"mesecon",
-	"unifieddyes",
+	"unifieddyes"
-	"letters",
+
-	"signs_api",
-	"stealthnode",
-	"slats",
-	"mtt"
 }

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/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.
 
-Lua api: see [api.md](./api.md)
-
 # Changelog
 
 * Added support for unifieddyes
@@ -41,17 +38,9 @@ CC BY 3.0
 * scifi_nodes_palm_scanner.ogg https://freesound.org/people/THE_bizniss/sounds/39313/
 * scifi_nodes_access_granted https://freesound.org/people/TheBuilder15/sounds/415762/
 * scifi_nodes_access_refused https://freesound.org/people/RICHERlandTV/sounds/216090/
-* 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_side.png https://github.com/minetest/minetest_game
-* scifi_nodes_wood.png https://github.com/minetest/minetest_game
 
 CC0
 * scifi_nodes_digicode.ogg https://freesound.org/people/benjaminharveydesign/sounds/315921/
-* scifi_nodes_ambience_fan.ogg https://freesound.org/people/itinerantmonk108/sounds/554430/
-* scifi_nodes_ambience_vent.ogg https://freesound.org/people/kentspublicdomain/sounds/324665/
-* scifi_nodes_ambience_engine.ogg https://freesound.org/people/firestorm185/sounds/423221/
 
 
 # Contributors:
@@ -66,4 +55,3 @@ CC0
 * OgelGames https://github.com/OgelGames
 * leftshift https://github.com/leftshift
 * fluxionary https://github.com/fluxionary
-* Niles Corder https://github.com/ncorder

access_card.lua

@@ -1,259 +0,0 @@
-local FORMSPEC_NAME = "scifi_nodes:access_card_configure"
-
-local function create_id()
-    local template = "xxxxxx"
-    return string.gsub(template, '[x]', function ()
-            return string.format('%x', math.random(0, 0xf))
-    end)
-end
-
-local function get_door_access_table(meta)
-    local str = meta:get_string("access")
-    if str == "" then
-        -- no config
-        return {}
-    else
-        return minetest.deserialize(str) or {}
-    end
-end
-
-local function set_door_access_table(meta, at)
-    if next(at) then
-        meta:set_string("access", minetest.serialize(at))
-    else
-        meta:set_string("access", "")
-    end
-end
-
-function scifi_nodes.door_check_access_card(node_pos, itemstack, player)
-    local node_meta = minetest.get_meta(node_pos)
-    local access_table = get_door_access_table(node_meta)
-    if not next(access_table) then
-        -- access not restricted
-        return true
-    end
-
-    if not minetest.is_player(player) then
-        -- not a player, restrict access
-        return false
-    end
-
-    local playername = player:get_player_name()
-
-    if itemstack:get_name() ~= "scifi_nodes:access_card" then
-        minetest.chat_send_player(playername, minetest.colorize("#ff0000", "Access denied: no access card detected!"))
-        minetest.sound_play("scifi_nodes_scanner_refused", { pos = node_pos, max_hear_distance = 10 })
-        return false
-    end
-
-    local item_meta = itemstack:get_meta()
-    local id = item_meta:get_string("id")
-    if id == "" then
-        minetest.chat_send_player(playername, minetest.colorize("#ff0000", "Access denied: unconfigured access card"))
-        minetest.sound_play("scifi_nodes_scanner_refused", { pos = node_pos, max_hear_distance = 10 })
-        return false
-    end
-
-    if not access_table[id] then
-        minetest.chat_send_player(playername, minetest.colorize("#ff0000", "Access denied: invalid access card"))
-        minetest.sound_play("scifi_nodes_scanner_refused", { pos = node_pos, max_hear_distance = 10 })
-        return false
-    end
-
-    minetest.sound_play("scifi_nodes_scanner_granted", { pos = node_pos, max_hear_distance = 10 })
-    return true
-end
-
--- using a card against a door toggles the access to it
-local function on_use(itemstack, player, pointed_thing)
-    local playername = player:get_player_name()
-    local pos = pointed_thing.under
-
-    if not pos then
-        -- nothing selected
-        return
-    end
-
-    if minetest.is_protected(pos, playername) then
-        -- protected
-        return
-    end
-
-    local node = minetest.get_node(pos)
-    local node_def = minetest.registered_nodes[node.name]
-    if not node_def.groups or not node_def.groups.scifi_nodes_door then
-        -- incompatible node
-        return
-    end
-
-    local item_meta = itemstack:get_meta()
-    local card_id = item_meta:get_string("id")
-    if card_id == "" then
-        minetest.chat_send_player(playername, "Access card is unconfigured")
-        return
-    end
-    local card_name = item_meta:get_string("name")
-
-    local node_meta = minetest.get_meta(pos)
-    local access_table = get_door_access_table(node_meta)
-
-    if access_table[card_id] then
-        -- remove access
-        access_table[card_id] = nil
-        minetest.chat_send_player(playername, "Revoked access to card-id '" .. card_id .. "'")
-        minetest.sound_play("scifi_nodes_scanner_refused", { pos = pos, max_hear_distance = 10 })
-    else
-        -- grant access
-        access_table[card_id] = card_name
-        minetest.chat_send_player(playername, "Granted access to card-id '" .. card_id .. "'")
-        minetest.sound_play("scifi_nodes_scanner_granted", { pos = pos, max_hear_distance = 10 })
-    end
-
-    local msg = ""
-    if next(access_table) then
-        msg = msg .. "Current registered cards: "
-        for id, name in pairs(access_table) do
-            msg = msg .. "Name: '" .. name .. "' ID: '" .. id .. "' / "
-        end
-    else
-        -- access table is empty
-        msg = "No access-card left in access-table, door is free to use"
-    end
-    minetest.chat_send_player(playername, msg)
-
-    -- set new access table
-    set_door_access_table(node_meta, access_table)
-end
-
-local function configure_access_card(meta, name)
-    local id = meta:get_string("id")
-    if id == "" then
-        -- set new id
-        id = create_id()
-        meta:set_string("id", id)
-    end
-
-    meta:set_string("name", name)
-    meta:set_string("description", "Access card '" .. name .. "' (id: '" .. id .. "')")
-end
-
--- right-click with a card for rename/configuration
-local function on_secondary_use(itemstack, player, pointed_thing)
-    local meta = itemstack:get_meta()
-    if meta:get_string("id") == "" then
-        -- initial configuration
-        configure_access_card(meta, "")
-    end
-    local name = meta:get_string("name")
-
-    minetest.show_formspec(player:get_player_name(), FORMSPEC_NAME, [[
-        size[10,1.4]
-        real_coordinates[true]
-        field[0.1,0.4;7,0.8;name;Name;]] .. minetest.formspec_escape(name) .. [[]
-        button_exit[7.3,0.4;2.5,0.8;save;Save]
-    ]])
-
-    return itemstack
-end
-
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-    if formname ~= FORMSPEC_NAME then
-        -- wrong formspec
-        return false
-    end
-
-    if not fields.save and not fields.key_enter_field then
-        -- quit
-        return true
-    end
-
-    local itemstack = player:get_wielded_item()
-    if itemstack:get_name() ~= "scifi_nodes:access_card" then
-        -- invalid item
-        return true
-    end
-
-    local meta = itemstack:get_meta()
-    configure_access_card(meta, fields.name or "")
-    player:set_wielded_item(itemstack)
-end)
-
-minetest.register_craftitem("scifi_nodes:access_card", {
-    description = "Access card (unconfigured)",
-    inventory_image = "scifi_nodes_access_card.png",
-    palette = "unifieddyes_palette_extended.png",
-    stack_max = 1,
-    paramtype2 = "color",
-    on_use = on_use,
-    on_secondary_use = on_secondary_use,
-    groups = {
-        ud_param2_colorable = 1
-    }
-})
-
--- initial recipe
-minetest.register_craft({
-    output = "scifi_nodes:access_card",
-    recipe = {
-        {"scifi_nodes:white2", "", ""},
-        {"scifi_nodes:white_pad", "", ""},
-        {"scifi_nodes:white2", "", ""}
-    }
-})
-
--- copy recipe
-minetest.register_craft({
-    output = "scifi_nodes:access_card",
-    recipe = {
-        {"scifi_nodes:access_card", "scifi_nodes:white_pad", ""},
-        {"", "", ""},
-        {"", "", ""}
-    }
-})
-
-minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv)
-    if itemstack:get_name() ~= "scifi_nodes:access_card" then
-        return
-    end
-
-    local original
-    local index
-    for i = 1, #old_craft_grid do
-        if old_craft_grid[i]:get_name() == "scifi_nodes:access_card" then
-            original = old_craft_grid[i]
-            index = i
-            break
-        end
-    end
-    if not original then
-        return
-    end
-
-    -- copy metadata
-    local src_meta = original:get_meta()
-    local dst_meta = itemstack:get_meta()
-    local copy_fields = {"id", "name", "description"}
-    for _, fieldname in ipairs(copy_fields) do
-        dst_meta:set_string(fieldname, src_meta:get_string(fieldname))
-    end
-
-    if old_craft_grid[2]:get_name() == "scifi_nodes:white_pad" then
-        -- keep original item if the copy-recipe is used
-        craft_inv:set_stack("craft", index, original)
-    end
-end)
-
-if minetest.get_modpath("unifieddyes") then
-    -- add colored crafts
-    unifieddyes.register_color_craft({
-        output = "scifi_nodes:access_card",
-        palette = "extended",
-        neutral_node = "scifi_nodes:access_card",
-        recipe = {
-            "NEUTRAL_NODE",
-            "MAIN_DYE"
-        },
-        type = "shapeless"
-    })
-
-end

ambience.lua

@@ -1,73 +0,0 @@
-
--- currently playing sounds per mapblock
--- mapblock_pos[number]
-local currently_playing = {}
-
--- clear the currently playing tracker every few seconds
-local function clear_currently_playing()
-    currently_playing = {}
-    minetest.after(5, clear_currently_playing)
-end
-minetest.after(5, clear_currently_playing)
-
--- mapblock resolution
-local function get_key(pos)
-    return minetest.pos_to_string(vector.round(vector.divide(pos, 16)))
-end
-
-local function add_currently_playing(pos, value)
-    local key = get_key(pos)
-    local count = currently_playing[key]
-    if not count then
-        -- new entry
-        count = value
-    else
-        -- update entry
-        count = count + value
-    end
-    currently_playing[key] = count
-end
-
--- limit plaing sounds per mapblock
-local function can_play(pos)
-    local count = currently_playing[get_key(pos)]
-    return not count or count < 25
-end
-
--- register ambience sounds with node-timer
-function scifi_nodes.register_ambience(nodename, soundname, opts)
-    assert(opts)
-    opts.interval = opts.interval or 60
-
-    local function play(pos)
-        minetest.sound_play(soundname ,{
-            max_hear_distance = opts.max_hear_distance or 16,
-            pos = pos,
-            gain = opts.gain or 0.7
-        })
-    end
-
-    minetest.override_item(nodename, {
-        on_timer = function(pos)
-            local timer = minetest.get_node_timer(pos)
-
-            if not can_play(pos) then
-                -- too many sounds playing, recheck again soon
-                timer:start(1)
-                return
-            end
-
-            -- increment usage count
-            add_currently_playing(pos, 1)
-            play(pos)
-
-            -- restart timer
-            timer:start(opts.interval)
-        end,
-        on_construct = function(pos)
-            play(pos)
-            local timer = minetest.get_node_timer(pos)
-            timer:start(opts.interval)
-        end
-    })
-end

api.md

@@ -1,12 +0,0 @@
-
-scifi_nodes api
-
-# Doors
-
-Open scifi_nodes door at given position
-
-```lua
-scifi_nodes.open_door(pos)
-```
-
-returns `true` on success, `false` otherwise

builder.lua

@@ -86,26 +86,24 @@ minetest.register_node("scifi_nodes:builder", {
     on_metadata_inventory_take = function(pos, listname, index, stack, player)
 		local meta = minetest.get_meta(pos)
 		local inv = meta:get_inventory()
-		local istack = inv:get_stack("input", 1)
+			local istack = inv:get_stack("input", 1)
-		local stack_name = istack:get_name()
+			local stack_name = istack:get_name()
-		inv:remove_item("input", stack_name.." 1")
+			inv:remove_item("input", stack_name.." 1")
 
-		inv:set_stack("output", 1, "")
+			inv:set_stack("output", 1, "")
-		inv:set_stack("output", 2, "")
+			inv:set_stack("output", 2, "")
-		inv:set_stack("output", 3, "")
+			inv:set_stack("output", 3, "")
-		inv:set_stack("output", 4, "")
+			inv:set_stack("output", 4, "")
-		inv:set_stack("output", 5, "")
+			inv:set_stack("output", 5, "")
-		inv:set_stack("output", 6, "")
+			inv:set_stack("output", 6, "")
-		inv:set_stack("output", 7, "")
+			inv:set_stack("output", 7, "")
-		inv:set_stack("output", 8, "")
+			inv:set_stack("output", 8, "")
-		inv:set_stack("output", 9, "")
+			inv:set_stack("output", 9, "")
-		inv:set_stack("output", 10, "")
+			inv:set_stack("output", 10, "")
-		inv:set_stack("output", 11, "")
+			inv:set_stack("output", 11, "")
-		inv:set_stack("output", 12, "")
+			inv:set_stack("output", 12, "")
 	end,
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, oddly_breakable_by_hand=1},
+	groups = {cracky=1, oddly_breakable_by_hand=1}
-	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })

chest.lua

@@ -1,21 +1,24 @@
-local has_default = minetest.get_modpath("default")
 
 --chest code from default(Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>)
+
 local chest_formspec =
 	"size[8,9]" ..
-	(has_default and default.gui_bg or "") ..
+	default.gui_bg ..
-	(has_default and default.gui_bg_img or "") ..
+	default.gui_bg_img ..
-	(has_default and default.gui_slots or "") ..
+	default.gui_slots ..
 	"list[current_name;main;0,0.3;8,4;]" ..
 	"list[current_player;main;0,4.85;8,1;]" ..
 	"list[current_player;main;0,6.08;8,3;8]" ..
 	"listring[current_name;main]" ..
 	"listring[current_player;main]" ..
-	(has_default and default.get_hotbar_bg(0,4.85) or "")
+	default.get_hotbar_bg(0,4.85)
+
+
 
 -- 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()
@@ -32,57 +35,40 @@ local function drop_chest_stuff()
 	end
 end
 
-local function register_chest(name, custom_def)
+--chest code Copyright (C) 2011-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
-	assert(custom_def.description)
+minetest.register_node("scifi_nodes:crate", {
-	assert(custom_def.tiles)
-
-	local def = {
-		paramtype2 = "facedir",
-		legacy_facedir_simple = true,
-		is_ground_content = false,
-		sounds = scifi_nodes.node_sound_wood_defaults(),
-		after_dig_node = drop_chest_stuff(),
-		on_construct = function(pos)
-			local meta = minetest.get_meta(pos)
-			meta:set_string("formspec", chest_formspec)
-			meta:set_string("infotext", custom_def.description)
-			local inv = meta:get_inventory()
-			inv:set_size("main", 8 * 4)
-		end,
-		on_metadata_inventory_move = function(pos, from_list, from_index,
-				to_list, to_index, count, player)
-			minetest.log("action", player:get_player_name() ..
-				" moves stuff in chest at " .. minetest.pos_to_string(pos))
-		end,
-		on_metadata_inventory_put = function(pos, listname, index, stack, player)
-			minetest.log("action", player:get_player_name() ..
-				" moves stuff to chest at " .. minetest.pos_to_string(pos))
-		end,
-		on_metadata_inventory_take = function(pos, listname, index, stack, player)
-			minetest.log("action", player:get_player_name() ..
-				" takes stuff from chest at " .. minetest.pos_to_string(pos))
-		end
-	}
-
-	for k, v in pairs(custom_def) do
-		def[k] = v
-	end
-
-	minetest.register_node(name, def)
-end
-
-
-register_chest("scifi_nodes:crate", {
 	description = "Crate",
 	tiles = {"scifi_nodes_crate.png"},
-	groups = {
+	paramtype2 = "facedir",
-		cracky = 1,
+	groups = {cracky = 1, oddly_breakable_by_hand = 2, fuel = 8},
-		oddly_breakable_by_hand = 2,
+	legacy_facedir_simple = true,
-		fuel = 8
+	is_ground_content = false,
-	}
+	sounds = default.node_sound_wood_defaults(),
+
+	after_dig_node = drop_chest_stuff(),
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("formspec", chest_formspec)
+		meta:set_string("infotext", "Crate")
+		local inv = meta:get_inventory()
+		inv:set_size("main", 8 * 4)
+	end,
+	on_metadata_inventory_move = function(pos, from_list, from_index,
+			to_list, to_index, count, player)
+		minetest.log("action", player:get_player_name() ..
+			" moves stuff in chest at " .. minetest.pos_to_string(pos))
+	end,
+    on_metadata_inventory_put = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name() ..
+			" moves stuff to chest at " .. minetest.pos_to_string(pos))
+	end,
+    on_metadata_inventory_take = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name() ..
+			" takes stuff from chest at " .. minetest.pos_to_string(pos))
+	end,
 })
 
-register_chest("scifi_nodes:box", {
+minetest.register_node("scifi_nodes:box", {
 	description = "Storage box",
 	tiles = {
 		"scifi_nodes_box_top.png",
@@ -92,7 +78,32 @@ register_chest("scifi_nodes:box", {
 		"scifi_nodes_box.png",
 		"scifi_nodes_box.png"
 	},
-	groups = {
+	paramtype2 = "facedir",
-		cracky = 1
+	groups = {cracky = 1},
-	}
+	legacy_facedir_simple = true,
+	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults(),
+
+	after_dig_node = drop_chest_stuff(),
+	on_construct = function(pos)
+		local meta = minetest.get_meta(pos)
+		meta:set_string("formspec", chest_formspec)
+		meta:set_string("infotext", "Box")
+		local inv = meta:get_inventory()
+		inv:set_size("main", 8 * 4)
+	end,
+	on_metadata_inventory_move = function(pos, from_list, from_index,
+			to_list, to_index, count, player)
+		minetest.log("action", player:get_player_name() ..
+			" moves stuff in chest at " .. minetest.pos_to_string(pos))
+	end,
+    on_metadata_inventory_put = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name() ..
+			" moves stuff to chest at " .. minetest.pos_to_string(pos))
+	end,
+    on_metadata_inventory_take = function(pos, listname, index, stack, player)
+		minetest.log("action", player:get_player_name() ..
+			" takes stuff from chest at " .. minetest.pos_to_string(pos))
+	end,
 })
+--end of chest code

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},
@@ -8,7 +10,7 @@ function scifi_nodes.get_switch_rules(param2)
 		{x=0, y=-1, z=1},
 	}
 
-	-- Left and right when looking to +y ?
+-- Left and right when looking to +y ?
 	if param2 == 3 then
 		rules = mesecon.rotate_rules_right(mesecon.rotate_rules_right (rules))
 	elseif param2 == 4 then
@@ -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

@@ -1,38 +1,14 @@
 -- CRAFTING RECIPES FOR SCIFI NODES
 
-if minetest.get_modpath("basic_materials") then
+-- 6 basic plastic from 9 homedecor plastic sheet
-    -- 6 basic plastic from 9 homedecor plastic sheet
+minetest.register_craft({
-    minetest.register_craft({
+	output = "scifi_nodes:white2 6",
-        output = "scifi_nodes:white2 6",
+	recipe = {
-        recipe = {
+		{"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"},
-            {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"},
+		{"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"},
-            {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"},
+		{"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}
-            {"homedecor:plastic_sheeting", "homedecor:plastic_sheeting", "homedecor:plastic_sheeting"}
+	}
-        }
+})
-    })
-
-    if minetest.settings:get_bool("scifi_nodes.teleporter_enable_crafting", false) then
-        -- enable the teleporter pad crafting recipe only if the setting is enabled
-        minetest.register_craft({
-            output = "scifi_nodes:pad",
-            recipe = {
-                {"homedecor:plastic_sheeting", "quartz:block", "homedecor:plastic_sheeting"},
-                {"default:mese_crystal", "quartz:block", "default:mese_crystal"},
-                {"homedecor:plastic_sheeting", "quartz:block", "homedecor:plastic_sheeting"}
-            }
-        })
-    end
-
-end
-
-
-if not minetest.get_modpath("default") or not minetest.get_modpath("dye") then
-    -- the default and dye mod are required for most of the recipes
-    -- if either of them is missing (because we are not in the default game)
-    -- then just skip the recipes entirely
-    -- TODO: potentially switch recipes depending on current game
-    return
-end
 
 minetest.register_craft({
 	output = "scifi_nodes:super_white",
@@ -234,7 +210,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",
@@ -245,7 +221,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",
@@ -256,18 +232,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",
@@ -343,16 +307,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",
@@ -497,15 +451,6 @@ minetest.register_craft({
     }
 })
 
-minetest.register_craft({
-    output = "scifi_nodes:crate",
-    recipe = {
-        {"scifi_nodes:grey", "scifi_nodes:grey", "scifi_nodes:grey"},
-        {"scifi_nodes:grey", "", "scifi_nodes:grey"},
-        {"scifi_nodes:grey", "scifi_nodes:grey", "scifi_nodes:grey"}
-    }
-})
-
 -- 6 blue metal from 6 plastic, 2 blue dye, 1 dented metal block
 minetest.register_craft({
     output = "scifi_nodes:bluemetal 6",
@@ -755,16 +700,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",
@@ -928,16 +863,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",
@@ -987,15 +912,6 @@ minetest.register_craft({
     }
 })
 
-minetest.register_craft({
-    output = "scifi_nodes:octwht 4",
-    recipe = {
-        {"dye:white", "scifi_nodes:glass", ""},
-        {"scifi_nodes:glass", "scifi_nodes:lightbar", "scifi_nodes:glass"},
-        {"", "scifi_nodes:glass", "dye:white"}
-    }
-})
-
 -- 1 purple node from 1 plastic, 1 blue dye and 1 red dye
 minetest.register_craft({
     output = "scifi_nodes:purple",
@@ -1183,22 +1099,6 @@ minetest.register_craft({
     }
 })
 
--- wet metal plant pot from dry metal plant pot
-minetest.register_craft({
-    output = "scifi_nodes:pot2",
-    recipe = {
-        {"scifi_nodes:pot", "bucket:bucket_water"}
-    },
-    replacements = {{"bucket:bucket_water", "bucket:bucket_empty"}}
-})
-
--- dry metal plant pot from wet metal plant pot
-minetest.register_craft({
-	type = "cooking",
-	output = "scifi_nodes:pot",
-	recipe = "scifi_nodes:pot2",
-})
-
 -- 6 itemholder from 2 dented metal block and 1 plastic
 minetest.register_craft({
     output = "scifi_nodes:itemholder 6",
@@ -1546,9 +1446,9 @@ minetest.register_craft({
 minetest.register_craft({
     output = "scifi_nodes:plant8",
     recipe = {
-        {"flowers:viola","default:junglegrass", "default:grass_1"},
+        {"flowers:viola","default:junglegrass"},
-        {"default:dirt","",""},
+        {"default:dirt",""},
-        {"scifi_nodes:greybolts","",""}
+        {"scifi_nodes:greybolts",""}
     }
 })
 
@@ -1677,25 +1577,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 = {
@@ -1714,6 +1595,15 @@ minetest.register_craft({
     }
 })
 
+minetest.register_craft({
+    output = 'scifi_nodes:doomwall43 6',
+    recipe = {
+        {"scifi_nodes:white","dye:black","scifi_nodes:white"},
+        {"scifi_nodes:black","dye:dark_green","scifi_nodes:black"},
+        {"scifi_nodes:white","dye:yellow","scifi_nodes:white"}
+    }
+})
+
 minetest.register_craft({
     output = 'scifi_nodes:doomwall43 6',
     recipe = {
@@ -1815,48 +1705,3 @@ minetest.register_craft({
         {"scifi_nodes:stripes"}
     }
 })
-
-minetest.register_craft({
-	output = "scifi_nodes:fan",
-	recipe = {
-        {"scifi_nodes:grey", 	"", 					"scifi_nodes:grey"},
-        {"", 					"scifi_nodes:vent2", 	""},
-        {"scifi_nodes:grey", 	"", 					"scifi_nodes:grey"}
-    }
-})
-
-minetest.register_craft({
-	output = "scifi_nodes:engine",
-	recipe = {
-        {"scifi_nodes:bluwllight", 	"", 					"scifi_nodes:bluwllight"},
-        {"scifi_nodes:screen",		"scifi_nodes:fan", 	    "scifi_nodes:screen3"},
-        {"scifi_nodes:bluwllight", 	"", 					"scifi_nodes:bluwllight"}
-    }
-})
-
-minetest.register_craft({
-	output = "scifi_nodes:forcefield 4",
-	recipe = {
-        {"scifi_nodes:octbl", 	"", 					"scifi_nodes:octbl"},
-        {"", 					"scifi_nodes:engine", 	""},
-        {"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"}
-    }
-})

depends.txt

@@ -0,0 +1,10 @@
+default
+basic_materials
+mesecons
+xpanes?
+moreblocks?
+mesecons_microcontroller?
+mesecons_button?
+mesecons_torch?
+mesecons_receiver?
+dye?

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")
@@ -102,7 +102,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 	end
     -- play sound at context position
 	minetest.sound_play(sounds[sound_index], {
-		pos = context.pos,
+	pos = context.pos,
 		max_hear_distance = 10
     })
 	context[player:get_player_name()] = nil -- we don't need it anymore
@@ -122,15 +122,14 @@ 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 = {items = {"scifi_nodes:digicode_off"}},
-	drop = "scifi_nodes:digicode_off",
 	mesecons = {
 		receptor = {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
 	on_timer = toggle_digicode,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:digicode_off", {
@@ -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)
@@ -154,7 +152,7 @@ minetest.register_node("scifi_nodes:digicode_off", {
 	},
 	after_place_node = set_owner,
 	on_rightclick = show_digicode_formspec,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_craft({

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
 
@@ -148,18 +148,14 @@ for _, current_door in ipairs(doors) do
 
 			local adjacent = minetest.get_node({x=x, y=y, z=z})
 			if adjacent.name == target_opposite then
-				minetest.swap_node({x=x, y=y, z=z}, {name=target, param2 = adjacent.param2})
+				minetest.set_node({x=x, y=y, z=z}, {name=target, param2 = adjacent.param2})
-				minetest.swap_node({x=x, y=y+1, z=z}, {name=target_top, param2 = adjacent.param2})
+				minetest.set_node({x=x, y=y+1, z=z}, {name=target_top, param2 = adjacent.param2})
 			end
 		end
 
 	end
 
-	local function open_door(pos, node, player, itemstack)
+	local function open_door(pos, node, player, itemstack, pointed_thing)
-		if not scifi_nodes.door_check_access_card(pos, itemstack, player) then
-			return
-		end
-
 		-- play sound
 		minetest.sound_play(sound,{
 			max_hear_distance = 16,
@@ -169,20 +165,20 @@ for _, current_door in ipairs(doors) do
 
 		local timer = minetest.get_node_timer(pos)
 
-		minetest.swap_node(pos, {name=opened, param2=node.param2})
+		minetest.set_node(pos, {name=opened, param2=node.param2})
-		minetest.swap_node({x=pos.x,y=pos.y+1,z=pos.z}, {name=opened_top, param2=node.param2})
+		minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z}, {name=opened_top, param2=node.param2})
 
 		change_adjacent(opened, pos, node)
 
 		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,
@@ -192,8 +188,8 @@ for _, current_door in ipairs(doors) do
 
 		local node = minetest.get_node(pos)
 
-		minetest.swap_node(pos, {name=closed, param2=node.param2})
+		minetest.set_node(pos, {name=closed, param2=node.param2})
-		minetest.swap_node({x=pos.x,y=pos.y+1,z=pos.z}, {name=closed_top, param2=node.param2})
+		minetest.set_node({x=pos.x,y=pos.y+1,z=pos.z}, {name=closed_top, param2=node.param2})
 
 		change_adjacent(closed, pos, node)
 	end
@@ -222,7 +218,7 @@ for _, current_door in ipairs(doors) do
 		},
 	}
 
-	local function nodig()
+	local function nodig(pos, digger)
 		return false
 	end
 
@@ -244,13 +240,7 @@ for _, current_door in ipairs(doors) do
 		drawtype = "nodebox",
 		paramtype = "light",
 		paramtype2 = "facedir",
-		groups = {
+		groups = {cracky = 3, oddly_breakable_by_hand = 1},
-			cracky = 3,
-			dig_generic = 3,
-			scifi_nodes_door = 1,
-			door = 1
-		},
-		is_ground_content = false,
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -263,12 +253,10 @@ for _, current_door in ipairs(doors) do
 				{-0.5, -0.5, -0.0625, 0.5, 1.5, 0.0625}
 			}
 		},
-		_open = open_door,
 		mesecons = mesecons_doors_def,
 		on_place = onplace,
 		after_destruct = afterdestruct,
 		on_rightclick = doors_rightclick,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 
 	minetest.register_node(closed_top, {
@@ -283,8 +271,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},
-		is_ground_content = false,
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -298,7 +285,6 @@ for _, current_door in ipairs(doors) do
 			}
 		},
 		can_dig = nodig,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 
 	minetest.register_node(opened, {
@@ -314,8 +300,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},
-		is_ground_content = false,
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -331,7 +316,6 @@ for _, current_door in ipairs(doors) do
 		after_place_node = afterplace,
 		after_destruct = afterdestruct,
 		on_timer = ontimer,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 
 	minetest.register_node(opened_top, {
@@ -346,8 +330,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},
-		is_ground_content = false,
 		node_box = {
 			type = "fixed",
 			fixed = {
@@ -361,30 +344,5 @@ for _, current_door in ipairs(doors) do
 			}
 		},
 		can_dig = nodig,
-		sounds = scifi_nodes.node_sound_metal_defaults(),
 	})
 end     -- end of doors table browsing
-
--- opens the scifi-door at the given position
-function scifi_nodes.open_door(pos)
-	local node = minetest.get_node_or_nil(pos)
-	if not node then
-		-- area not loaded
-		return false
-	end
-
-	local def = minetest.registered_nodes[node.name]
-	if type(def._open) ~= "function" then
-		-- open function not found
-		return false
-	end
-
-	if not def.groups or not def.groups.scifi_nodes_door then
-		-- not a scifi_nodes door
-		return false
-	end
-
-	-- call open function
-	def._open(pos, node)
-	return true
-end

forcefield.lua

@@ -1,22 +0,0 @@
-minetest.register_node("scifi_nodes:forcefield", {
-	description = "Forcefield",
-	sunlight_propagates = true,
-	drawtype = "glasslike",
-	groups = {
-		cracky = 1,
-		level = 3
-	},
-	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
-	paramtype = "light",
-	light_source = minetest.LIGHT_MAX,
-	tiles = {{
-		name = "scifi_nodes_forcefield.png",
-		animation = {
-			type = "vertical_frames",
-			aspect_w = 16,
-			aspect_h = 16,
-			length = 1.0,
-		}
-	}}
-})

init.lua

@@ -4,48 +4,22 @@ scifi_nodes = {}
 
 local MP = minetest.get_modpath("scifi_nodes")
 
-
-dofile(MP.."/sounds.lua")
-
 if minetest.get_modpath("xpanes") then
 	dofile(MP.."/panes.lua")
 end
 
 dofile(MP.."/common.lua")
-
+dofile(MP.."/builder.lua")
-if minetest.get_modpath("default") then
-	-- only load builder if the default mod is available
-	-- the formspecs depend on it
-	dofile(MP.."/builder.lua")
-end
-
-dofile(MP.."/ambience.lua")
 dofile(MP.."/chest.lua")
 dofile(MP.."/plants.lua")
-dofile(MP.."/models.lua")
 dofile(MP.."/nodes.lua")
-dofile(MP.."/access_card.lua")
 dofile(MP.."/doors.lua")
 dofile(MP.."/switch.lua")
 dofile(MP.."/protected_switch.lua")
 dofile(MP.."/nodeboxes.lua")
 dofile(MP.."/palm_scanner.lua")
 dofile(MP.."/digicode.lua")
+dofile(MP.."/models.lua")
 dofile(MP.."/octagon_panes.lua")
-dofile(MP.."/octagon_glass.lua")
-dofile(MP.."/forcefield.lua")
 dofile(MP.."/crafts.lua")
-
+minetest.log("action", "[scifi_nodes] loaded.")
-if minetest.get_modpath("letters") then
-	-- register letter nodes
-	dofile(MP.."/letters.lua")
-end
-
-if minetest.get_modpath("mesecons_stealthnode") then
-	-- register stealthnodes
-	dofile(MP.."/stealthnodes.lua")
-end
-
-if minetest.get_modpath("mtt") and mtt.enabled then
-	dofile(MP .. "/mtt.lua")
-end

letters.lua

@@ -1,11 +0,0 @@
-letters.register_letters("scifi_nodes", "white2", "scifi_nodes:white2", "Plastic", "scifi_nodes_white2.png", {
-    paramtype2 = "colorwallmounted",
-    palette = "unifieddyes_palette_colorwallmounted.png",
-    groups = {
-        ud_param2_colorable = 1,
-        not_in_creative_inventory = 1,
-        not_in_craft_guide = 1,
-        oddly_breakable_by_hand = 1,
-        attached_node = 1
-    }
-})

mod.conf

@@ -1,21 +1,4 @@
 name = scifi_nodes
 description = Minetest mod that adds scifi themed blocks, doors, materials, plants and other assets.
-optional_depends = """
+depends = default,dye
-advtrains,
+optional_depends = xpanes,mesecons,moreblocks,mesecons_microcontroller,mesecons_button,mesecons_torch,mesecons_receiver,basic_materials,unifieddyes
-default,
-xpanes,
-mesecons,
-moreblocks,
-mesecons_microcontroller,
-mesecons_button,
-mesecons_torch,
-mesecons_receiver,
-basic_materials,
-dye,
-unifieddyes,
-letters,
-mesecons_stealthnode,
-mtt,
-slats,
-signs_api
-"""

models.lua

@@ -2,37 +2,44 @@
 --Copyright (c) 2011-2015 Calinou and contributors.
 --Licensed under the zlib license.
 
-function scifi_nodes.register_slope(name, desc, texture, light, soundtype)
+function scifi_nodes.register_slope(name, desc, texture, light)
-	local sounds
+minetest.register_node("scifi_nodes:slope_"..name, {
-	if soundtype == "stone" then
+	description = desc.." Slope",
-		sounds = scifi_nodes.node_sound_stone_defaults()
+	sunlight_propagates = false,
-	else
+	drawtype = "mesh",
-		sounds = scifi_nodes.node_sound_metal_defaults()
+	mesh = "scifi_nodes_slope.obj",
-	end
+	tiles = texture,
-
+		selection_box = {
-	minetest.register_node("scifi_nodes:slope_"..name, {
+			type = "fixed",
-		description = desc.." Slope",
+	fixed = {
-		sunlight_propagates = false,
+		{-0.5,  -0.5,  -0.5, 0.5, -0.25, 0.5},
-		drawtype = "mesh",
+		{-0.5, -0.25, -0.25, 0.5,     0, 0.5},
-		mesh = "scifi_nodes_slope.obj",
+		{-0.5,     0,     0, 0.5,  0.25, 0.5},
-		tiles = texture,
+		{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
-		selection_box = scifi_nodes.slope_box,
+	}
-		collision_box = scifi_nodes.slope_box,
+		},
-		paramtype = "light",
+		collision_box = {
-		paramtype2 = "facedir",
+			type = "fixed",
-		use_texture_alpha = "clip",
+	fixed = {
-		light_source = light,
+		{-0.5,  -0.5,  -0.5, 0.5, -0.25, 0.5},
-		groups = {cracky=1, dig_generic = 3},
+		{-0.5, -0.25, -0.25, 0.5,     0, 0.5},
-		is_ground_content = false,
+		{-0.5,     0,     0, 0.5,  0.25, 0.5},
-		on_place = minetest.rotate_node,
+		{-0.5,  0.25,  0.25, 0.5,   0.5, 0.5}
-		sounds = sounds,
+	}
-	})
+		},
+	paramtype = "light",
+	paramtype2 = "facedir",
+	use_texture_alpha = "clip",
+	light_source = light,
+	groups = {cracky=1},
+	on_place = minetest.rotate_node
+})
 end
 
 -- register some blocks in stairsplus if available (part of moreblocks)
-scifi_nodes.register_slope("white2", "Plastic", {"scifi_nodes_white2.png",}, 0, "stone")
+scifi_nodes.register_slope("white2", "Plastic", {"scifi_nodes_white2.png",}, 0)
-scifi_nodes.register_slope("super_white", "Super Plastic", {"scifi_nodes_white2.png",}, 11, "stone")
+scifi_nodes.register_slope("super_white", "Super Plastic", {"scifi_nodes_super_white.png",}, 11)
-scifi_nodes.register_slope("ultra_white", "Super Plastic", {"scifi_nodes_white2.png",},minetest.LIGHT_MAX, "stone")
+scifi_nodes.register_slope("ultra_white", "Super Plastic", {"scifi_nodes_ultra_white.png",}, default.LIGHT_MAX)
 scifi_nodes.register_slope("black", "Black", {"scifi_nodes_black.png",}, 0)
 scifi_nodes.register_slope("white", "White", {"scifi_nodes_white.png",}, 0)
 scifi_nodes.register_slope("grey", "Grey", {"scifi_nodes_grey.png",}, 0)
@@ -47,8 +54,8 @@ scifi_nodes.register_slope("holes", "Holes", {"scifi_nodes_holes.png",}, 0)
 scifi_nodes.register_slope("pipe", "Pipe", {"scifi_nodes_pipe.png",}, 0)
 scifi_nodes.register_slope("stripes", "Stripes", {"scifi_nodes_stripes.png",}, 0)
 scifi_nodes.register_slope("screen", "Screen", {"scifi_nodes_screen3.png",}, 5)
-scifi_nodes.register_slope("lightstripe", "Lightstripe", {"scifi_nodes_lightstripe.png",}, minetest.LIGHT_MAX)
+scifi_nodes.register_slope("lightstripe", "Lightstripe", {"scifi_nodes_lightstripe.png",}, default.LIGHT_MAX)
-scifi_nodes.register_slope("blight2", "Blue Light 2", {"scifi_nodes_capsule3.png",}, minetest.LIGHT_MAX)
+scifi_nodes.register_slope("blight2", "Blue Light 2", {"scifi_nodes_capsule3.png",}, default.LIGHT_MAX)
 scifi_nodes.register_slope("wallpipe", "Alien Pipe", {"scifi_nodes_wallpipe.png",}, 0)
 scifi_nodes.register_slope("alien", "Alien Wall", {"scifi_nodes_alnslp.png",}, 0)
 scifi_nodes.register_slope("purple", "Purple", {"scifi_nodes_purple.png",}, 0)
@@ -58,3 +65,109 @@ scifi_nodes.register_slope("bluemetal", "Blue metal", {"scifi_nodes_bluemetal.pn
 scifi_nodes.register_slope("wall", "Metal wall", {"scifi_nodes_wall.png",}, 0)
 scifi_nodes.register_slope("rough", "Rough metal", {"scifi_nodes_rough.png",}, 0)
 scifi_nodes.register_slope("blklt2", "Black stripe light", {"scifi_nodes_black_light2.png",}, 10)
+
+-- Register Nodes for Stairsplus
+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},
+--	{"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"},
+--	{"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"},
+}
+
+if minetest.global_exists("stairsplus") then
+	for _, row in ipairs(node.types) do
+		local name = row[1]
+
+		-- Node Definition
+		stairsplus:register_all("scifi_nodes", name, "scifi_nodes:"..name, {
+			description = row[2],
+			tiles = {"scifi_nodes_"..name..".png"},
+			use_texture_alpha = "clip",
+			groups = {cracky=1},
+			paramtype = "light",
+			paramtype2 = "facedir",
+			light_source = row[3],
+		})
+	end
+end

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

@@ -18,8 +18,7 @@ minetest.register_node("scifi_nodes:alienslope", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -33,7 +32,7 @@ minetest.register_node("scifi_nodes:alienslope", {
 			{-0.125, 0.375, -0.5, 0.5, 0.5, 0.5}, -- NodeBox17
 		}
 	},
-	sounds = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -50,8 +49,7 @@ minetest.register_node("scifi_nodes:wallpipe", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -64,7 +62,7 @@ minetest.register_node("scifi_nodes:wallpipe", {
 			{-0.5, -0.125, 0, 0.5, 0, 0.0625}, -- NodeBox24
 		}
 	},
-	sounds = scifi_nodes.node_sound_wood_defaults()
+	sounds = default.node_sound_wood_defaults()
 })
 
 minetest.register_node("scifi_nodes:plant_trap", {
@@ -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 = {
@@ -94,7 +91,7 @@ minetest.register_node("scifi_nodes:plant_trap", {
 			{-0.0625, -0.5, 0.3125, 0, 0.5, 0.375}, -- NodeBox28
 		}
 	},
-	sounds = scifi_nodes.node_sound_wood_defaults(),
+	sounds = default.node_sound_wood_defaults(),
 })
 
 minetest.register_node("scifi_nodes:egg", {
@@ -110,8 +107,7 @@ minetest.register_node("scifi_nodes:egg", {
 	sunlight_propagates = false,
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky=1, oddly_breakable_by_hand=1, dig_immediate=2, falling_node=1, dig_generic = 3},
+	groups = {cracky=1, oddly_breakable_by_hand=1, dig_immediate=2, falling_node=1},
-	is_ground_content = false,
 	light_source = 5,
 	node_box = {
 		type = "fixed",
@@ -126,19 +122,19 @@ minetest.register_node("scifi_nodes:egg", {
 			{-0.125, 0.75, -0.125, 0.125, 0.8125, 0.125}, -- NodeBox8
 			{-0.375, -0.3125, -0.4375, 0.375, 0.3125, 0.4375}, -- NodeBox9
 		},
-	},
+	sounds = default.node_sound_wood_defaults()
-	sounds = scifi_nodes.node_sound_wood_defaults(),
+	}
 })
 
 if minetest.get_modpath("scifi_mobs") then
-	minetest.register_abm({
+minetest.register_abm({
-		nodenames = {"scifi_nodes:egg"},
+	nodenames = {"scifi_nodes:egg"},
-		interval = 30, chance = 10,
+	interval = 30, chance = 10,
-		action = function(pos, node, _, _)
+	action = function(pos, node, _, _)
-			minetest.add_entity(pos, "scifi_mobs:xenomorph")
+		minetest.env:add_entity(pos, "scifi_mobs:xenomorph")
-			minetest.remove_node(pos)
+		minetest.env:remove_node(pos)
-		end
+	end
-	})
+})
 end
 
 minetest.register_node("scifi_nodes:pad", {
@@ -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()
@@ -173,93 +168,92 @@ minetest.register_node("scifi_nodes:pad", {
         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(
+		minetest.add_particlespawner(
-				25, --amount
+			25, --amount
-				1.5, --time
+			1.5, --time
-				{x=pos.x-0.9, y=pos.y-0.3, z=pos.z-0.9}, --minpos
+			{x=pos.x-0.9, y=pos.y-0.3, z=pos.z-0.9}, --minpos
-				{x=pos.x+0.9, y=pos.y-0.3, z=pos.z+0.9}, --maxpos
+			{x=pos.x+0.9, y=pos.y-0.3, z=pos.z+0.9}, --maxpos
-				{x=0, y=0, z=0}, --minvel
+			{x=0, y=0, z=0}, --minvel
-				{x=0, y=0, z=0}, --maxvel
+			{x=0, y=0, z=0}, --maxvel
-				{x=-0,y=1,z=-0}, --minacc
+			{x=-0,y=1,z=-0}, --minacc
-				{x=0,y=2,z=0}, --maxacc
+			{x=0,y=2,z=0}, --maxacc
-				0.5, --minexptime
+			0.5, --minexptime
-				1, --maxexptime
+			1, --maxexptime
-				2, --minsize
+			2, --minsize
-				5, --maxsize
+			5, --maxsize
-				false, --collisiondetection
+			false, --collisiondetection
-				"scifi_nodes_tp_part.png" --texture
+			"scifi_nodes_tp_part.png" --texture
-			)
+		)
-			minetest.after(1, function()
+		minetest.after(1, function()
-				local ppos = clicker:getpos()
+		local ppos = clicker:getpos()
-				if minetest.get_node({x=ppos.x, y=ppos.y, z=ppos.z}).name == "scifi_nodes:pad" then
+		if minetest.get_node({x=ppos.x, y=ppos.y, z=ppos.z}).name == "scifi_nodes:pad" then
-					clicker:setpos(position2)
+			clicker:setpos(position2)
-				end
+		end
-				local objs = minetest.get_objects_inside_radius(pos, 3)
+		local objs = minetest.env:get_objects_inside_radius(pos, 3)
-				for _, obj in pairs(objs) do
-					if obj:get_luaentity() and not obj:is_player() then
-						if obj:get_luaentity().name == "__builtin:item" then
-							local item1 = obj:get_luaentity().itemstring
-							local obj2 = minetest.add_entity(position2, "__builtin:item")
-							obj2:get_luaentity():set_item(item1)
-							obj:remove()
-						end
-					end
-				end
-			end)
-		elseif meta:get_int("type") == 2 and position1 ~= nil and position2 ~= nil then
-			minetest.add_particlespawner(
-				25, --amount
-				1.5, --time
-				{x=pos.x-0.9, y=pos.y-0.3, z=pos.z-0.9}, --minpos
-				{x=pos.x+0.9, y=pos.y-0.3, z=pos.z+0.9}, --maxpos
-				{x=0, y=0, z=0}, --minvel
-				{x=0, y=0, z=0}, --maxvel
-				{x=-0,y=1,z=-0}, --minacc
-				{x=0,y=2,z=0}, --maxacc
-				0.5, --minexptime
-				1, --maxexptime
-				2, --minsize
-				5, --maxsize
-				false, --collisiondetection
-				"scifi_nodes_tp_part.png" --texture
-			)
-			minetest.after(1, function()
-				local ppos = clicker:getpos()
-				if minetest.get_node({x=ppos.x, y=ppos.y, z=ppos.z}).name == "scifi_nodes:pad" then
-					clicker:setpos(position1)
-				end
-				local objs = minetest.get_objects_inside_radius(pos, 3)
                 for _, obj in pairs(objs) do
-					if obj:get_luaentity() and not obj:is_player() then
+				if obj:get_luaentity() and not obj:is_player() then
-						if obj:get_luaentity().name == "__builtin:item" then
+				if obj:get_luaentity().name == "__builtin:item" then
-							local item1 = obj:get_luaentity().itemstring
+				local item1 = obj:get_luaentity().itemstring
-							local obj2 = minetest.add_entity(position1, "__builtin:item")
+				local obj2 = minetest.env:add_entity(position2, "__builtin:item")
-							obj2:get_luaentity():set_item(item1)
+				obj2:get_luaentity():set_item(item1)
-							obj:remove()
+				obj:remove()
-						end
-					end
 				end
-			end)
+				end
+				end
+		end)
+		elseif meta:get_int("type") == 2 and position1 ~= nil and position2 ~= nil then
+		minetest.add_particlespawner(
+			25, --amount
+			1.5, --time
+			{x=pos.x-0.9, y=pos.y-0.3, z=pos.z-0.9}, --minpos
+			{x=pos.x+0.9, y=pos.y-0.3, z=pos.z+0.9}, --maxpos
+			{x=0, y=0, z=0}, --minvel
+			{x=0, y=0, z=0}, --maxvel
+			{x=-0,y=1,z=-0}, --minacc
+			{x=0,y=2,z=0}, --maxacc
+			0.5, --minexptime
+			1, --maxexptime
+			2, --minsize
+			5, --maxsize
+			false, --collisiondetection
+			"scifi_nodes_tp_part.png" --texture
+		)
+		minetest.after(1, function()
+        local ppos = clicker:getpos()
+		if minetest.get_node({x=ppos.x, y=ppos.y, z=ppos.z}).name == "scifi_nodes:pad" then
+			clicker:setpos(position1)
+		end
+		local objs = minetest.env:get_objects_inside_radius(pos, 3)
+                for _, obj in pairs(objs) do
+				if obj:get_luaentity() and not obj:is_player() then
+				if obj:get_luaentity().name == "__builtin:item" then
+				local item1 = obj:get_luaentity().itemstring
+				local obj2 = minetest.env:add_entity(position1, "__builtin:item")
+				obj2:get_luaentity():set_item(item1)
+				obj:remove()
+				end
+				end
+				end
+		end)
 		elseif position1 == nil and meta:get_int("type") ~= 2 then
-			position1 = pos
+		position1 = pos
-			meta:set_int("type", 1)
+        meta:set_int("type", 1)
-			minetest.chat_send_player(clicker_name, "Teleporter 1 connected at "..minetest.pos_to_string(pos))
+		minetest.chat_send_player(clicker_name, "Teleporter 1 connected at "..minetest.pos_to_string(pos))
 		elseif position2 == nil and meta:get_int("type") ~= 1 then
-			position2 = pos
+		position2 = pos
-			meta:set_int("type", 2)
+		meta:set_int("type", 2)
-			minetest.chat_send_player(clicker_name, "Teleporter 2 connected at "..minetest.pos_to_string(pos))
+		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)
 		local meta = minetest.get_meta(pos)
 		if meta:get_int("type") == 1 then
-			position1 = nil
+		position1 = nil
-			meta:set_int("type", 0)
+		meta:set_int("type", 0)
 		elseif meta:get_int("type") == 2 then
-			position2 = nil
+		position2 = nil
-			meta:set_int("type", 0)
+		meta:set_int("type", 0)
 		end
 	end,
 	node_box = {
@@ -270,8 +264,8 @@ minetest.register_node("scifi_nodes:pad", {
 			{-0.875, -0.5, -0.8125, 0.8125, -0.375, 0.8125}, -- NodeBox3
 			{-0.8125, -0.5, -0.75, 0.75, -0.3125, 0.75}, -- NodeBox4
 		},
-	},
+	sounds = default.node_sound_wood_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	}
 })
 
 minetest.register_node("scifi_nodes:pplwndw", {
@@ -288,9 +282,8 @@ minetest.register_node("scifi_nodes:pplwndw", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
-	groups = {cracky=3, dig_generic = 4},
+	groups = {cracky=3},
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
-	is_ground_content = false,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -311,13 +304,12 @@ minetest.register_node("scifi_nodes:gloshroom", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	walkable = false,
 	buildable_to = true,
 	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 = {
@@ -328,13 +320,17 @@ minetest.register_node("scifi_nodes:gloshroom", {
 			{-0.1875, 0.125, -0.1875, 0.1875, 0.1875, 0.1875}, -- NodeBox5
 			{-0.375, -0.0625, -0.4375, 0.375, 0, 0.4375}, -- NodeBox6
 		}
-	},
+	}
-	sounds = scifi_nodes.node_sound_plant_defaults(),
 })
 
 minetest.register_node("scifi_nodes:pot_lid", {
-	description = "Plant Pot Lid",
+	description = "plant pot lid(place above plant)",
 	tiles = {
+		"scifi_nodes_glass2.png",
+		"scifi_nodes_glass2.png",
+		"scifi_nodes_glass2.png",
+		"scifi_nodes_glass2.png",
+		"scifi_nodes_glass2.png",
 		"scifi_nodes_glass2.png"
 	},
 	inventory_image = "scifi_nodes_pod_inv.png",
@@ -342,56 +338,36 @@ minetest.register_node("scifi_nodes:pot_lid", {
 	use_texture_alpha = "blend",
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {not_in_creative_inventory = 1},
+	groups = {cracky=1, not_in_creative_inventory=1},
-	is_ground_content = false,
 	sunlight_propagates = true,
-	diggable = false,
-	drop = "",
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -1.5, -0.5, 0.5, -0.25, 0.5}
+		fixed = {0, 0, 0, 0, 0, 0}
+	},
+	collision_box = {
+		type = "fixed",
+		fixed = {-0.5, -1.5, -0.5, 0.5, -0.5, 0.5}
 	},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.4375, -1.5, -0.4375, 0.4375, -0.5, -0.375},
+			{-0.1875, -0.5625, -0.1875, 0.1875, -0.5, 0.1875}, -- NodeBox13
-			{-0.4375, -1.5, 0.375, 0.4375, -0.5, 0.4375},
+			{-0.25, -0.625, -0.25, 0.25, -0.5625, 0.25}, -- NodeBox14
-			{-0.4375, -1.5, -0.375, -0.375, -0.5, 0.375},
+			{-0.3125, -0.6875, -0.3125, 0.3125, -0.625, 0.3125}, -- NodeBox15
-			{0.375, -1.5, -0.375, 0.4375, -0.5, 0.375},
+			{-0.375, -0.75, -0.375, 0.375, -0.6875, 0.375}, -- NodeBox16
-			{-0.375, -0.5, -0.375, 0.375, -0.4375, 0.375},
+			{-0.4375, -0.75, 0.375, 0.4375, -1.5, 0.4375}, -- NodeBox17
-			{-0.3125, -0.4375, -0.3125, 0.3125, -0.375, 0.3125},
+			{-0.4375, -0.75, -0.4375, 0.4375, -1.5, -0.375}, -- NodeBox18
-			{-0.25, -0.375, -0.25, 0.25, -0.3125, 0.25},
+			{0.375, -0.75, -0.4375, 0.4375, -1.5, 0.4375}, -- NodeBox19
-			{-0.1875, -0.3125, -0.1875, 0.1875, -0.25, 0.1875}
+			{-0.4375, -0.75, -0.4375, -0.375, -1.5, 0.4375}, -- NodeBox20
 		}
 	},
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
-local function toggle_lid(pos, node, player, itemstack)
-	if not player or minetest.is_protected(pos, player:get_player_name()) then
-		return
-	end
-	local lid_pos = {x = pos.x, y = pos.y+2 , z = pos.z}
-	local lid_node = minetest.get_node(lid_pos)
-	if lid_node.name == "scifi_nodes:pot_lid" then
-		minetest.set_node(lid_pos, {name = "air"})
-	elseif lid_node.name == "air" then
-		minetest.set_node(lid_pos, {name = "scifi_nodes:pot_lid"})
-	end
-end
-
-local function remove_lid(pos)
-	local lid_pos = {x = pos.x, y = pos.y+2 , z = pos.z}
-	local lid_node = minetest.get_node(lid_pos)
-	if lid_node.name == "scifi_nodes:pot_lid" then
-		minetest.set_node(lid_pos, {name = "air"})
-	end
-end
-
 minetest.register_node("scifi_nodes:pot", {
-	description = "Metal Plant Pot (right-click for lid, sneak + right-click to plant)",
+	description = "metal plant pot (right click for lid, shift+rightclick to plant)",
 	tiles = {
-		"scifi_nodes_dirt.png^scifi_nodes_pot.png",
+		"scifi_nodes_pot.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@@ -400,33 +376,34 @@ minetest.register_node("scifi_nodes:pot", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky = 1, soil = 1, sand = 1, dig_generic = 3},
+	groups = {cracky=1, soil=1, sand=1},
-	is_ground_content = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
-	},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
+			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5}, -- NodeBox1
-			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
+			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5}, -- NodeBox2
-			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
+			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875}, -- NodeBox3
-			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
+			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5}, -- NodeBox4
-			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
+			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
 		}
 	},
-	on_rightclick = toggle_lid,
+	on_rightclick = function(pos, node, clicker, item, _)
-	on_destruct = remove_lid,
+		local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
-	sounds = scifi_nodes.node_sound_metal_defaults({
+		if lid_node.name == "scifi_nodes:pot_lid" then
-		footstep = scifi_nodes.node_sound_dirt_defaults().footstep,
+			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="air", param2=lid_node.param2})
-	}),
+		elseif lid_node.name ~= "scifi_nodes:pot_lid" and node.name == "air" then
+			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="scifi_nodes:pot_lid", param2=lid_node.param2})
+		end
+	end,
+	on_destruct = function(pos, node, _)
+		minetest.remove_node({x=pos.x, y=pos.y+2, z=pos.z})
+	end
 })
 
 minetest.register_node("scifi_nodes:pot2", {
-	description = "Metal Plant Pot Wet (right-click for lid, sneak + right-click to plant)",
+	description = "metal wet plant pot(right click for lid, shift+rightclick to plant)",
 	tiles = {
-		"scifi_nodes_dirt.png^scifi_nodes_pot2.png",
+		"scifi_nodes_pot.png^[colorize:black:100",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
 		"scifi_nodes_greybolts.png",
@@ -435,27 +412,28 @@ minetest.register_node("scifi_nodes:pot2", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	groups = {cracky = 1, soil = 3, wet = 1, dig_generic = 3},
+	groups = {cracky=1, soil=3, wet=1},
-	is_ground_content = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, 0.5, 0.5}
-	},
 	node_box = {
 		type = "fixed",
 		fixed = {
-			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5},
+			{-0.5, -0.25, -0.5, 0.5, 0.5, 0.5}, -- NodeBox1
-			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5},
+			{0.1875, -0.5, 0.1875, 0.5, -0.25, 0.5}, -- NodeBox2
-			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875},
+			{-0.5, -0.5, -0.5, -0.1875, -0.25, -0.1875}, -- NodeBox3
-			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5},
+			{-0.5, -0.5, 0.1875, -0.1875, -0.25, 0.5}, -- NodeBox4
-			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}
+			{0.1875, -0.5, -0.5, 0.5, -0.25, -0.1875}, -- NodeBox5
 		}
 	},
-	on_rightclick = toggle_lid,
+	on_rightclick = function(pos, node, clicker, item, _)
-	on_destruct = remove_lid,
+		local lid_node = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z})
-	sounds = scifi_nodes.node_sound_metal_defaults({
+		if lid_node.name == "scifi_nodes:pot_lid" then
-		footstep = scifi_nodes.node_sound_dirt_defaults().footstep,
+			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="air", param2=lid_node.param2})
-	}),
+		elseif lid_node.name ~= "scifi_nodes:pot_lid" and node.name == "air" then
+			minetest.set_node({x=pos.x, y=pos.y+2, z=pos.z}, {name="scifi_nodes:pot_lid", param2=lid_node.param2})
+		end
+	end,
+	on_destruct = function(pos, node, _)
+		minetest.remove_node({x=pos.x, y=pos.y+2, z=pos.z})
+	end
 })
 
 minetest.register_node("scifi_nodes:lightbar", {
@@ -467,7 +445,7 @@ minetest.register_node("scifi_nodes:lightbar", {
 	paramtype = "light",
 	paramtype2 = "wallmounted",
 	sunlight_propagates = true,
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -480,9 +458,8 @@ minetest.register_node("scifi_nodes:lightbar", {
 			{-0.125, -0.5, -0.5, 0.125, -0.375, 0.5}, -- NodeBox1
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:light_dynamic", {
@@ -505,10 +482,9 @@ minetest.register_node("scifi_nodes:light_dynamic", {
 		}
 	},
 	paramtype2 = "wallmounted",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:ladder", {
@@ -538,13 +514,12 @@ minetest.register_node("scifi_nodes:ladder", {
 			{0.3125, -0.5, 0.0625, 0.4375, -0.375, 0.1875}, -- NodeBox25
 			{0.3125, -0.5, -0.1875, 0.4375, -0.375, -0.0625}, -- NodeBox26
 		},
+	sounds = default.node_sound_metal_defaults()
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 	paramtype2 = "wallmounted",
 	walkable = false,
 	climbable = true,
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
 })
 
 minetest.register_node("scifi_nodes:lightbars", {
@@ -554,9 +529,8 @@ minetest.register_node("scifi_nodes:lightbars", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -566,45 +540,21 @@ minetest.register_node("scifi_nodes:lightbars", {
 			{0.125, -0.5, -0.375, 0.375, 0.5, -0.125}, -- NodeBox4
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:liquid_pipe", {
 	description = "Liquid pipe",
-	tiles = {{
+tiles = {{
 		name = "scifi_nodes_liquid.png",
 		animation = {type = "vertical_frames", aspect_w = 16, aspect_h = 16, length = 1.00},
 	}},
 	use_texture_alpha = "blend",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
-	paramtype2 = "facedir",
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.375, -0.5, -0.375, 0.375, 0.5, 0.375}, -- NodeBox1
-		}
-	},
-	groups = {cracky=1, oddly_breakable_by_hand=1, dig_generic = 3},
-	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_glass_defaults()
-})
-
-minetest.register_node("scifi_nodes:liquid_pipe2", {
-	description = "Liquid pipe 2",
-	tiles = {
-		"scifi_nodes_orange.png",
-	},
-	use_texture_alpha = "blend",
-	light_source = minetest.LIGHT_MAX,
-	drawtype = "nodebox",
-	sunlight_propagates = true,
-	paramtype = "light",
-	paramtype2 = "facedir",
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -612,8 +562,27 @@ minetest.register_node("scifi_nodes:liquid_pipe2", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_glass_defaults()
+})
+
+minetest.register_node("scifi_nodes:liquid_pipe2", {
+	description = "Liquid pipe 2",
+tiles = {
+		"scifi_nodes_orange.png",
+	},
+	use_texture_alpha = "blend",
+	light_source = default.LIGHT_MAX,
+	drawtype = "nodebox",
+	sunlight_propagates = true,
+	paramtype = "light",
+	node_box = {
+		type = "fixed",
+		fixed = {
+			{-0.375, -0.5, -0.375, 0.375, 0.5, 0.375}, -- NodeBox1
+		}
+	},
+	groups = {cracky=1, oddly_breakable_by_hand=1},
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:powered_stand", {
@@ -643,7 +612,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()
@@ -659,7 +627,6 @@ minetest.register_node("scifi_nodes:powered_stand", {
 			return item
 		end
 	end,
-	sounds = scifi_nodes.node_sound_wood_defaults()
 })
 
 minetest.register_node("scifi_nodes:cover", {
@@ -674,8 +641,6 @@ minetest.register_node("scifi_nodes:cover", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	paramtype2 = "facedir",
-	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -684,9 +649,8 @@ minetest.register_node("scifi_nodes:cover", {
 			{-0.3125, -0.375, -0.3125, 0.3125, -0.3125, 0.3125}, -- NodeBox6
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_wood_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", {
@@ -709,9 +673,7 @@ minetest.register_node("scifi_nodes:computer", {
 			{-0.4375, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox1
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
+	groups = {cracky=1, oddly_breakable_by_hand=1}
-	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:keysmonitor", {
@@ -737,9 +699,7 @@ minetest.register_node("scifi_nodes:keysmonitor", {
 			{-0.5, -0.3125, 0.25, 0.5, 0.5, 0.375}, -- NodeBox4
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
+	groups = {cracky=1, oddly_breakable_by_hand=1}
-	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_defaults(),
 })
 
 minetest.register_node("scifi_nodes:microscope", {
@@ -766,9 +726,7 @@ minetest.register_node("scifi_nodes:microscope", {
 			{-0.125, -0.25, -0.125, 0.125, -0.1875, 0.1875}, -- NodeBox5
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
+	groups = {cracky=1, oddly_breakable_by_hand=1}
-	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_defaults(),
 })
 
 minetest.register_node("scifi_nodes:table", {
@@ -796,9 +754,8 @@ minetest.register_node("scifi_nodes:table", {
 			{-0.0625, 0.25, -0.125, 0.0625, 0.4375, -0.0625}, -- NodeBox7
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_metal_defaults(),
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1}
-	is_ground_content = false,
 })
 
 minetest.register_node("scifi_nodes:laptop_open", {
@@ -823,11 +780,9 @@ 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,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:laptop_closed", {
@@ -851,11 +806,9 @@ 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,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:pipen", {
@@ -885,10 +838,8 @@ minetest.register_node("scifi_nodes:pipen", {
 			{-0.5, -0.4375, -0.5, 0.5, -0.375, 0.5}, -- NodeBox9
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	on_place = minetest.rotate_node
-	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowcorner", {
@@ -917,10 +868,9 @@ minetest.register_node("scifi_nodes:windowcorner", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowstraight", {
@@ -945,10 +895,9 @@ minetest.register_node("scifi_nodes:windowstraight", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowcorner2", {
@@ -977,10 +926,9 @@ minetest.register_node("scifi_nodes:windowcorner2", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:windowstraight2", {
@@ -1005,10 +953,9 @@ minetest.register_node("scifi_nodes:windowstraight2", {
 			{-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	on_place = minetest.rotate_node,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 
@@ -1036,9 +983,8 @@ minetest.register_node("scifi_nodes:capsule", {
 			{-0.3125, -0.4375, -0.1875, 0.3125, -0.0625, 0.1875}, -- NodeBox3
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1, dig_generic = 3},
+	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults(),
-	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})
 	end,
@@ -1068,8 +1014,7 @@ minetest.register_node("scifi_nodes:capsule3", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults(),
-	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})
 	end,
@@ -1099,8 +1044,7 @@ minetest.register_node("scifi_nodes:capsule2", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1, not_in_creative_inventory=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults(),
-	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})
 	end,
@@ -1129,9 +1073,8 @@ minetest.register_node("scifi_nodes:itemholder", {
 			{-0.25, -0.5, -0.0625, -0.1875, -0.0625, 0.0625}, -- NodeBox5
 		}
 	},
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	on_rotate = screwdriver.disallow,
-	on_rotate = minetest.get_modpath("screwdriver") and screwdriver.disallow,
 	after_place_node = function(pos, placer, itemstack)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("owner",placer:get_player_name())
@@ -1163,7 +1106,6 @@ minetest.register_node("scifi_nodes:itemholder", {
 			minetest.add_item(pos, meta:get_string("item"))
 		end
 	end,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:glassscreen", {
@@ -1180,7 +1122,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 	drawtype = "nodebox",
 	paramtype = "light",
 	paramtype2 = "facedir",
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	sunlight_propagates = true,
 	node_box = {
 		type = "fixed",
@@ -1190,8 +1132,7 @@ minetest.register_node("scifi_nodes:glassscreen", {
 		}
 	},
 	groups = {cracky=1, oddly_breakable_by_hand=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults(),
-	sounds = scifi_nodes.node_sound_glass_defaults(),
 })
 
 
@@ -1222,9 +1163,7 @@ minetest.register_node("scifi_nodes:widescreen", {
 			{-0.5, 0.25, 0.375, 0.5, 0.3125, 0.5},         -- NodeBox7
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
+	groups = {cracky=1, oddly_breakable_by_hand=1}
-	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_defaults(),
 })
 
 minetest.register_node("scifi_nodes:tallscreen", {
@@ -1254,9 +1193,7 @@ minetest.register_node("scifi_nodes:tallscreen", {
 			{0.25, -0.5, 0.375, 0.3125, 0.5, 0.5}, -- NodeBox7
 		}
 	},
-	groups = {cracky=1, oddly_breakable_by_hand=1},
+	groups = {cracky=1, oddly_breakable_by_hand=1}
-	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_defaults(),
 })
 
 -- https://forum.minetest.net/viewtopic.php?f=10&t=13125&p=261481#p261481
@@ -1276,8 +1213,7 @@ minetest.register_node("scifi_nodes:windowpanel", {
             {-0.0625, -0.5, -0.5, 0.0625, 0.5, 0.5}, -- NodeBox11
         }
     },
-    groups = {cracky=1, dig_generic = 3},
+    groups = {cracky=1},
-	is_ground_content = false,
     on_place = minetest.rotate_node,
-    sounds = scifi_nodes.node_sound_glass_defaults(),
+    sounds = default.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

@@ -1,328 +0,0 @@
-{
-    "blue": {
-        "description": "Blue lines"
-    },
-    "holes": {
-        "description": "Metal with holes"
-    },
-    "white2": {
-        "description": "plastic",
-        "colorable": true,
-        "sounds": "stone",
-        "signs_banner": true,
-        "signs_banner_color": "#000"
-    },
-    "super_white": {
-        "description": "Super Plastic",
-        "colorable": true,
-        "light": 11,
-        "sounds": "stone",
-        "texture_name": "white2"
-    },
-    "ultra_white": {
-        "description": "Ultra Plastic",
-        "colorable": true,
-        "light": 14,
-        "sounds": "stone",
-        "texture_name": "white2"
-    },
-    "engine": {
-        "description": "Engine",
-        "ambience": {
-            "scifi_nodes_ambience_engine": {
-                "interval": 16.1
-            }
-        }
-    },
-    "wall": {
-        "description": "metal wall"
-    },
-    "white": {
-        "description": "plastic wall",
-        "colorable": true,
-        "sounds": "stone"
-    },
-    "stripes2top": {
-        "description": "Dirty metal block"
-    },
-    "rough": {
-        "description": "rough metal"
-    },
-    "lighttop": {
-        "description": "metal block",
-        "slat": true
-    },
-    "red": {
-        "description": "red lines"
-    },
-    "green": {
-        "description": "green lines"
-    },
-    "vent2": {
-        "description": "vent"
-    },
-    "vent3": {
-        "description": "transparent vent",
-        "texture_name": "vent2",
-        "texture_modifier": "^[makealpha:33,33,33",
-        "drawtype": "glasslike",
-        "ambience": {
-            "scifi_nodes_ambience_vent": {
-                "interval": 4.2
-            }
-        }
-    },
-    "stripes": {
-        "description": "hazard stripes",
-        "slat": true,
-        "advtrains_platform": true
-    },
-    "rust": {
-        "description": "rusty metal"
-    },
-    "mesh": {
-        "description": "metal mesh"
-    },
-    "black": {
-        "description": "black wall",
-        "signs_banner": true
-    },
-    "blackoct": {
-        "description": "black octagon"
-    },
-    "blackpipe": {
-        "description": "black pipe"
-    },
-    "blacktile": {
-        "description": "black tile"
-    },
-    "blacktile2": {
-        "description": "black tile 2",
-        "paramtype2": "none"
-    },
-    "blackvent": {
-        "description": "black vent"
-    },
-    "bluebars": {
-        "description": "blue bars"
-    },
-    "bluemetal": {
-        "description": "blue metal",
-        "signs_banner": true
-    },
-    "bluetile": {
-        "description": "blue tile",
-        "slat": true
-    },
-    "greytile": {
-        "description": "grey tile"
-    },
-    "mesh2": {
-        "description": "metal floormesh"
-    },
-    "mesh3": {
-        "description": "transparent metal floormesh",
-        "texture_name": "mesh",
-        "texture_modifier": "^[contrast:10:-50^[makealpha:0,0,0",
-        "drawtype": "glasslike",
-        "sunlight_propagates": true
-    },
-    "pipe": {
-        "description": "wall pipe"
-    },
-    "pipeside": {
-        "description": "side pipe"
-    },
-    "tile": {
-        "description": "white tile"
-    },
-    "whiteoct": {
-        "description": "white octagon",
-        "colorable": true
-    },
-    "whitetile": {
-        "description": "white tile 2",
-        "colorable": true,
-        "slat": true
-    },
-    "black_detail": {
-        "description": "black detail"
-    },
-    "green_square": {
-        "description": "green metal block"
-    },
-    "red_square": {
-        "description": "red metal block"
-    },
-    "grey_square": {
-        "description": "grey metal block",
-        "paramtype2": "none"
-    },
-    "blue_square": {
-        "description": "blue metal block"
-    },
-    "black_mesh": {
-        "description": "black vent block"
-    },
-    "dent": {
-        "description": "dented metal block",
-        "colorable": true
-    },
-    "greenmetal": {
-        "description": "green metal wall",
-        "signs_banner": true
-    },
-    "greenmetal2": {
-        "description": "green metal wall2"
-    },
-    "greenlights": {
-        "description": "green wall lights",
-        "light": 10
-    },
-    "greenlights2": {
-        "description": "green wall lights2",
-        "light": 10
-    },
-    "greenbar": {
-        "description": "green light bar",
-        "light": 10
-    },
-    "green2": {
-        "description": "green wall panel"
-    },
-    "greentubes": {
-        "description": "green pipes"
-    },
-    "grey": {
-        "description": "grey wall",
-        "signs_banner": true
-    },
-    "greybolts": {
-        "description": "grey wall bolts"
-    },
-    "greybars": {
-        "description": "grey bars"
-    },
-    "greydots": {
-        "description": "grey wall dots"
-    },
-    "greygreenbar": {
-        "description": "gray power pipe",
-        "light": 10
-    },
-    "octofloor": {
-        "description": "Doom floor",
-        "sounds": "stone",
-        "paramtype2": "none"
-    },
-    "octofloor2": {
-        "description": "Brown Doom floor",
-        "sounds": "stone",
-        "paramtype2": "none"
-    },
-    "doomwall1": {
-        "description": "Doom wall 1"
-    },
-    "doomwall2": {
-        "description": "Doom wall 2"
-    },
-    "doomwall3": {
-        "description": "Doom wall 3"
-    },
-    "doomwall4": {
-        "description": "Doom wall 4"
-    },
-    "doomwall41": {
-        "description": "Doom wall 4.1"
-    },
-    "doomwall42": {
-        "description": "Doom wall 4.2"
-    },
-    "doomwall43": {
-        "description": "Doom wall 4.3"
-    },
-    "doomwall431": {
-        "description": "Doom wall 4.3.1"
-    },
-    "doomwall44": {
-        "description": "Doom wall 4.4"
-    },
-    "blackdmg": {
-        "description": "Damaged black wall",
-        "slat": true,
-        "paramtype2": "none"
-    },
-    "blackdmgstripe": {
-        "description": "Damaged black wall(stripes)"
-    },
-    "doomengine": {
-        "description": "Doom engine wall"
-    },
-    "monitorwall": {
-        "description": "Wall monitors"
-    },
-    "screen3": {
-        "description": "Wall monitor"
-    },
-    "doomlight": {
-        "description": "Doom light",
-        "light": 12
-    },
-    "bluwllight": {
-        "description": "Blue wall light",
-        "light": 14
-    },
-    "bluegrid": {
-        "description": "Blue Grid",
-        "light": 5
-    },
-    "fan": {
-        "description": "Fan",
-        "ambience": {
-            "scifi_nodes_ambience_fan": {
-                "interval": 7
-            }
-        }
-    },
-    "ppllght": {
-        "description": "Purple wall light",
-        "light": 14
-    },
-    "pplwll": {
-        "description": "Purple wall"
-    },
-    "pplwll2": {
-        "description": "Purple wall 2"
-    },
-    "pplwll3": {
-        "description": "Purple wall 3"
-    },
-    "pplwll4": {
-        "description": "Purple wall 4"
-    },
-    "pplblk": {
-        "description": "Purple tile",
-        "slat": true
-    },
-    "purple": {
-        "description": "Purple node",
-        "signs_banner": true
-    },
-    "rock": {
-        "description": "Moonstone",
-        "sounds": "stone",
-        "colorable": true
-    },
-    "rock2": {
-        "description": "Moonstone 2",
-        "sounds": "stone",
-        "colorable": true
-    },
-    "blackvnt": {
-        "description": "Black vent"
-    },
-    "blackplate": {
-        "description": "Black plate",
-        "paramtype2": "none"
-    }
-}

nodes.lua

@@ -1,22 +1,13 @@
-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 = {"default_grass.png^[colorize:cyan:80", "default_dirt.png",
-		{name = "scifi_nodes_dirt.png^(scifi_nodes_grass_side.png^[colorize:cyan:80)",
+		{name = "default_dirt.png^(default_grass_side.png^[colorize:cyan:80)",
 			tileable_vertical = false}},
 	light_source = 2,
-	groups = {crumbly=1, oddly_breakable_by_hand=1, soil=1},
+	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,
-	})
 })
 
 minetest.register_node("scifi_nodes:light", {
@@ -32,9 +23,7 @@ minetest.register_node("scifi_nodes:light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1}
-	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 })
 
 minetest.register_node("scifi_nodes:rfloor", {
@@ -45,9 +34,8 @@ minetest.register_node("scifi_nodes:rfloor", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	light_source = 10,
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:bfloor", {
@@ -58,9 +46,8 @@ minetest.register_node("scifi_nodes:bfloor", {
 	paramtype = "light",
 	paramtype2 = "facedir",
 	light_source = 10,
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 
@@ -76,9 +63,8 @@ minetest.register_node("scifi_nodes:stripes2", {
 		"scifi_nodes_stripes2.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock", {
@@ -93,9 +79,8 @@ minetest.register_node("scifi_nodes:gblock", {
 		"scifi_nodes_gblock.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1};
-	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock2", {
@@ -111,9 +96,8 @@ minetest.register_node("scifi_nodes:gblock2", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:gblock3", {
@@ -129,9 +113,8 @@ minetest.register_node("scifi_nodes:gblock3", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 
@@ -149,9 +132,8 @@ minetest.register_node("scifi_nodes:green_light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:red_light", {
@@ -167,9 +149,8 @@ minetest.register_node("scifi_nodes:red_light", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:discs", {
@@ -184,9 +165,8 @@ minetest.register_node("scifi_nodes:discs", {
 		"scifi_nodes_discs.png"
 	},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:disc", {
@@ -199,9 +179,7 @@ minetest.register_node("scifi_nodes:disc", {
 	inventory_image = "scifi_nodes_disc.png",
 	wield_image = "scifi_nodes_disc.png",
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1}
-	is_ground_content = false,
-	sounds = scifi_nodes.node_sound_defaults(),
 })
 
 minetest.register_node("scifi_nodes:greenbar_animated", {
@@ -216,10 +194,9 @@ minetest.register_node("scifi_nodes:greenbar_animated", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	light_source = 10,
-	sounds = scifi_nodes.node_sound_glass_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -231,10 +208,9 @@ minetest.register_node("scifi_nodes:blink", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.00},
 	}},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	light_source = 5,
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:black_lights", {
@@ -245,9 +221,8 @@ minetest.register_node("scifi_nodes:black_lights", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.50},
 	}},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:black_screen", {
@@ -258,10 +233,9 @@ minetest.register_node("scifi_nodes:black_screen", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=2.00},
 	}},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	light_source = 1,
-	sounds = scifi_nodes.node_sound_metal_defaults()
+	sounds = default.node_sound_stone_defaults()
 })
 
 minetest.register_node("scifi_nodes:screen", {
@@ -272,10 +246,9 @@ minetest.register_node("scifi_nodes:screen", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.50},
 	}},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	light_source = 5,
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:screen2", {
@@ -286,10 +259,9 @@ minetest.register_node("scifi_nodes:screen2", {
 		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=0.50},
 	}},
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
 	light_source = 5,
-	sounds = scifi_nodes.node_sound_glass_defaults()
+	sounds = default.node_sound_glass_defaults()
 })
 
 
@@ -307,9 +279,8 @@ minetest.register_node("scifi_nodes:white_pad", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:white_base", {
@@ -325,9 +296,8 @@ minetest.register_node("scifi_nodes:white_base", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:grnpipe", {
@@ -343,9 +313,8 @@ minetest.register_node("scifi_nodes:grnpipe", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults(),
-	sounds = scifi_nodes.node_sound_metal_defaults(),
 	on_place = minetest.rotate_node
 })
 
@@ -363,12 +332,71 @@ minetest.register_node("scifi_nodes:grnpipe2", {
 	},
 	paramtype = "light",
 	paramtype2 = "facedir",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults(),
-	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},
+	sounds = default.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},
+	sounds = default.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},
+	sounds = default.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},
+	sounds = default.node_sound_glass_defaults(),
+})
+
 minetest.register_node("scifi_nodes:tower", {
 	description = "Wind tower",
 	sunlight_propagates = false,
@@ -380,9 +408,8 @@ minetest.register_node("scifi_nodes:tower", {
 	visual_scale = 2,
 	inventory_image = "scifi_nodes_tower.png",
 	paramtype = "light",
-	groups = {cracky=2, dig_generic = 3},
+	groups = {cracky=2},
-	is_ground_content = false,
+	sounds = default.node_sound_metal_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:junk", {
@@ -399,8 +426,7 @@ minetest.register_node("scifi_nodes:junk", {
 	tiles = {
 		"scifi_nodes_junk.png"
 	},
-	groups = {snappy=1, oddly_breakable_by_hand=1, liquid=3, dig_immediate=1},
+	groups = {snappy=1, oddly_breakable_by_hand=1, liquid=3, dig_immediate=1}
-	is_ground_content = false,
 })
 
 
@@ -417,9 +443,8 @@ minetest.register_node("scifi_nodes:blumetlight", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 
@@ -429,11 +454,10 @@ minetest.register_node("scifi_nodes:lightstp", {
 	tiles = {
 		"scifi_nodes_lightstripe.png"
 	},
-	light_source = minetest.LIGHT_MAX,
+	light_source = default.LIGHT_MAX,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:blklt2", {
@@ -444,9 +468,8 @@ minetest.register_node("scifi_nodes:blklt2", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:blumetstr", {
@@ -457,9 +480,8 @@ minetest.register_node("scifi_nodes:blumetstr", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
 minetest.register_node("scifi_nodes:glass", {
@@ -471,9 +493,8 @@ minetest.register_node("scifi_nodes:glass", {
 	},
 	use_texture_alpha = "blend",
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:whtlightbnd", {
@@ -484,53 +505,124 @@ minetest.register_node("scifi_nodes:whtlightbnd", {
 	},
 	light_source = 10,
 	paramtype = "light",
-	groups = {cracky=1, dig_generic = 3},
+	groups = {cracky=1},
-	is_ground_content = false,
+	sounds = default.node_sound_glass_defaults()
-	sounds = scifi_nodes.node_sound_metal_defaults()
 })
 
--- read "nodes.json"
+--edited wool code (Copyright (C) 2012 celeron55, Perttu Ahola <celeron55@gmail.com>)
-local f = assert(io.open(minetest.get_modpath("scifi_nodes") .. "/nodes.json", "rb"))
-local nodes = assert(minetest.parse_json(f:read("*all")))
-f:close()
 
--- register all nodes
-for name, def in pairs(nodes) do
 
-	-- default to "metal" sounds if not specified
+-- This uses a trick: you can first define the recipes using all of the base
-	local sounds
+-- colors, and then some recipes using more specific colors for a few non-base
-	if def.sounds == "stone" then
+-- colors available. When crafting, the last recipes will be checked first.
-		sounds = scifi_nodes.node_sound_stone_defaults()
+--add new block using texture name(without "scifi_nodes_" prefix) then the description, and then the name of the block
-	else
+local nodetypes = {
-		sounds = scifi_nodes.node_sound_metal_defaults()
+	-- { name, description, shortname?, light, colorable }
-	end
+	{"blue",      "blue lines",        "blue"},
+	{"holes",       "metal with holes","holes"},
+	{"white2",      "plastic",         "white2", 0, true},
+    {"super_white",      "Super Plastic",         "super_white", 11},
+    {"ultra_white",      "Ultra Plastic",         "ultra_white", default.LIGHT_MAX},
+	{"engine",      "engine",          "engine"},
+	{"wall",      "metal wall",        "wall"},
+	{"white",      "plastic wall",     "white", 0, true},
+	{"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"},
+	{"pipe",      "wall pipe",       "pipe2"},
+	{"pipeside",      "side pipe",       "pipe3"},
+	{"tile",      "white tile",       "tile"},
+	{"whiteoct",      "white octagon",       "whiteoct", 0, true},
+	{"whitetile",      "white tile2",       "whttl", 0, true},
+	{"black_detail",      "black detail",       "blckdtl"},
+	{"green_square",      "green metal block",       "grnblck"},
+	{"red_square",      "red metal block",       "redblck"},
+	{"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",       "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},
+}
 
-	-- tiles (default to nodename as texture-name)
+local has_unifieddyes_mod = minetest.get_modpath("unifieddyes")
-	local tiles = {"scifi_nodes_" .. name .. ".png"}
-	if def.texture_name then
-		tiles = {"scifi_nodes_" .. def.texture_name .. ".png"}
-	end
 
-	-- optional texture modifier
+for _, row in ipairs(nodetypes) do
-	if def.texture_modifier then
+	local name = row[1]
-		tiles[1] = tiles[1] .. def.texture_modifier
+	local desc = row[2]
-	end
+	local light = row[4]
+	local is_colorable = row[5]
 
 	-- Node Definition
 	local node_def = {
-		description = def.description,
+		description = desc,
-		drawtype = def.drawtype or "normal",
+		tiles = {"scifi_nodes_"..name..".png"},
-		sunlight_propagates = def.sunlight_propagates,
+		groups = {cracky=1},
-		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,
+		light_source = light,
-		sounds = sounds,
+		sounds = default.node_sound_glass_defaults()
 	}
 
-	if def.colorable and has_unifieddyes_mod then
+	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
@@ -538,82 +630,25 @@ for name, def in pairs(nodes) do
 	end
 
 	-- register node
-	local nodename = "scifi_nodes:" .. name
+	minetest.register_node("scifi_nodes:"..name, node_def)
-	minetest.register_node(nodename , node_def)
 
-	-- unified dyes registration
+	if is_colorable and has_unifieddyes_mod then
-	if def.colorable and has_unifieddyes_mod then
+		-- register colored node
 		minetest.register_node("scifi_nodes:"..name.."_colored", {
-			description = def.description,
+			description = desc,
-			tiles = tiles,
+			tiles = {"scifi_nodes_"..name..".png"},
 			groups = {
 				cracky = 1,
 				ud_param2_colorable = 1,
 				not_in_creative_inventory = 1
 			},
-			is_ground_content = false,
 			palette = "unifieddyes_palette_extended.png",
 			paramtype = "light",
 			paramtype2 = "color",
-			light_source = def.light,
+			light_source = light,
-			sounds = scifi_nodes.node_sound_glass_defaults(),
+			sounds = default.node_sound_glass_defaults(),
 			on_construct = unifieddyes.on_construct,
 			on_dig = unifieddyes.on_dig
 		})
 	end
-
-	-- moreblocks registration (default to register all except if "false" encountered)
-	if has_moreblocks_mod and def.moreblocks ~= false then
-		stairsplus:register_all("scifi_nodes", name, "scifi_nodes:"..name, {
-			description = def.description,
-			tiles = tiles,
-			use_texture_alpha = "clip",
-			groups = {cracky=1, dig_generic = 3},
-			paramtype = "light",
-			paramtype2 = "facedir",
-			light_source = def.light,
-			sounds = sounds,
-		})
-	end
-
-	if def.ambience then
-		for soundname, opts in pairs(def.ambience) do
-			scifi_nodes.register_ambience(nodename, soundname, opts)
-		end
-	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()
+    sounds = default.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()
+    sounds = default.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()
+    sounds = default.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

@@ -22,8 +22,6 @@ local function activate_palm_scanner(pos, node, player)
 
 	-- check protection
 	minetest.after(2, function()
-		if minetest.get_node(pos).name ~= node.name then return end
-
 		if minetest.is_protected(pos, name or "") then
 			-- clicker has no access to area
 			minetest.chat_send_player(name, "Access denied !")
@@ -38,7 +36,6 @@ local function activate_palm_scanner(pos, node, player)
 
 		-- reset state
 		minetest.after(1, function()
-			if minetest.get_node(pos).name ~= node.name then return end
 			node.name = "scifi_nodes:palm_scanner_off"
 			minetest.swap_node(pos, node)
 			mesecon.receptor_off(pos, scifi_nodes.get_switch_rules(node.param2))
@@ -59,14 +56,13 @@ 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)
 		}
 	},
 	on_rightclick = (has_mesecons and activate_palm_scanner),
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_node("scifi_nodes:palm_scanner_checking", {
@@ -83,9 +79,8 @@ 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()
+	sounds = default.node_sound_glass_defaults()
 })
 
 minetest.register_node("scifi_nodes:palm_scanner_on", {
@@ -102,14 +97,13 @@ 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 = {
 			state = (has_mesecons and mesecon.state.on)
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 })
 
 minetest.register_craft({

panes.lua

@@ -10,7 +10,7 @@ xpanes.register_pane("doompane", {
 	diggable = false,
 	buildable_to = true,
 	air_equivalent = true,
-	textures = {"scifi_nodes_doompane.png","scifi_nodes_doompane.png","scifi_nodes_wood.png"},
+	textures = {"scifi_nodes_doompane.png","scifi_nodes_doompane.png","default_wood.png"},
 	inventory_image = "scifi_nodes_doompane.png",
 	wield_image = "scifi_nodes_doompane.png",
 	groups = {cracky=1, pane=1},

plants.lua

@@ -1,11 +1,11 @@
 
 local plants = {
-	{"flower1", "Glow Flower", 1,0, minetest.LIGHT_MAX},
+	{"flower1", "Glow Flower", 1,0, default.LIGHT_MAX},
 	{"flower2", "Pink Flower", 1.5,0, 10},
 	{"flower3", "Triffid", 2,5, 0},
 	{"flower4", "Weeping flower", 1.5,0, 0},
 	{"plant1", "Bulb Plant", 1,0, 0},
-	{"plant2", "Trap Plant", 1.5,0, minetest.LIGHT_MAX},
+	{"plant2", "Trap Plant", 1.5,0, default.LIGHT_MAX},
 	{"plant3", "Blue Jelly Plant", 1.2,0, 10},
 	{"plant4", "Green Jelly Plant", 1.2,0, 10},
 	{"plant5", "Fern Plant", 1.7,0, 0},
@@ -33,6 +33,7 @@ for _, row in ipairs(plants) do
 		groups = {snappy=1, oddly_breakable_by_hand=1, dig_immediate=3, flora=1},
 		paramtype = "light",
 		visual_scale = size,
+		buildable_to = true,
 		walkable = false,
 		damage_per_second = dmg,
 		selection_box = {
@@ -43,6 +44,5 @@ for _, row in ipairs(plants) do
 		},
 		is_ground_content = false,
 		light_source = light,
-		sounds = scifi_nodes.node_sound_plant_defaults(),
 	})
 end

protected_switch.lua

@@ -46,13 +46,12 @@ 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)
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch),
 	on_timer = (has_mesecons and toggle_switch)
 })
@@ -74,13 +73,12 @@ 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)
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })
 

settingtypes.txt

@@ -1,5 +1,2 @@
-# Doors can only be opened by mesecon signal
+#    Doors can only be opened by mesecon signal
-scifi_nodes.doors_open_with_mesecon_only (disables right click on doors) bool false
+scifi_nodes.doors_open_with_mesecon_only (disables right click on doors) bool true
-
-# Teleporter recipe flag
-scifi_nodes.teleporter_enable_crafting (enables the teleporter recipe) bool false

sounds.lua

@@ -1,57 +0,0 @@
--- sound definitions with fallback to empty sound-table
-
-function scifi_nodes.node_sound_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_wood_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_wood_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_glass_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_glass_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_metal_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_metal_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_stone_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_stone_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_dirt_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_dirt_defaults(param)
-    end
-    return {}
-end
-
-function scifi_nodes.node_sound_plant_defaults(param)
-    if minetest.get_modpath("default") then
-        -- default game
-        return default.node_sound_leaves_defaults(param)
-    end
-    return {}
-end

stealthnodes.lua

@@ -1,3 +0,0 @@
-
-stealthnode.register_stealthnode("scifi_nodes", "forcefield")
-stealthnode.register_stealthnode("scifi_nodes", "wall")

switch.lua

@@ -39,13 +39,12 @@ 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)
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch),
 	on_timer = (has_mesecons and toggle_switch)
 })
@@ -67,13 +66,12 @@ 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)
 		}
 	},
-	sounds = scifi_nodes.node_sound_metal_defaults(),
+	sounds = default.node_sound_glass_defaults(),
 	on_rightclick = (has_mesecons and toggle_switch)
 })
 

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