register some nodes to the letters mod

init.lua

@@ -33,11 +33,6 @@ dofile(MP.."/octagon_panes.lua")
 dofile(MP.."/forcefield.lua")
 dofile(MP.."/crafts.lua")
 
-if minetest.get_modpath("unifieddyes") then
-	-- register colored nodes
-	dofile(MP.."/nodes_colored.lua")
-end
-
 if minetest.get_modpath("letters") then
 	-- register letter nodes
 	dofile(MP.."/letters.lua")

letters.lua

@@ -1,11 +1,5 @@
-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
-    }
-})
+letters.register_letters("scifi_nodes", "black", "scifi_nodes:black", "Black wall", "scifi_nodes_black.png")
+letters.register_letters("scifi_nodes", "white2", "scifi_nodes:white2", "Plastic", "scifi_nodes_white2.png")
+letters.register_letters("scifi_nodes", "purple", "scifi_nodes:purple", "Purple node", "scifi_nodes_purple.png")
+letters.register_letters("scifi_nodes", "bluemetal", "scifi_nodes:bluemetal", "Blue metal", "scifi_nodes_bluemetal.png")
+letters.register_letters("scifi_nodes", "greenmetal", "scifi_nodes:greenmetal", "Green metal", "scifi_nodes_greenmetal.png")

nodeboxes.lua

@@ -543,7 +543,6 @@ minetest.register_node("scifi_nodes:lightbars", {
 	},
 	drawtype = "nodebox",
 	paramtype = "light",
-	paramtype2 = "facedir",
 	use_texture_alpha = "blend",
 	light_source = minetest.LIGHT_MAX,
 	node_box = {
@@ -570,7 +569,6 @@ tiles = {{
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
-	paramtype2 = "facedir",
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -591,7 +589,6 @@ tiles = {
 	drawtype = "nodebox",
 	sunlight_propagates = true,
 	paramtype = "light",
-	paramtype2 = "facedir",
 	node_box = {
 		type = "fixed",
 		fixed = {

nodes.lua

@@ -642,13 +642,28 @@ for _, row in ipairs(nodetypes) do
 		node_def.palette = "unifieddyes_palette_extended.png"
 		node_def.groups.ud_param2_colorable = 1
 		node_def.airbrush_replacement_node = "scifi_nodes:"..name.."_colored"
-		-- NOTE: about the "Node scifi_nodes:xxx has a palette, but not a suitable paramtype2" warning:
-		-- inserting "color" here (which would be the proper type) results in wrong
-		-- colored original nodes due to existing param2type = "facedir"
-		-- a migration lbm for those might be the proper solution but has to be thoroughly tested first
-		node_def.paramtype2 = nil
 	end
 
 	-- register node
 	minetest.register_node("scifi_nodes:"..name, node_def)
+
+	if is_colorable and has_unifieddyes_mod then
+		-- register colored node
+		minetest.register_node("scifi_nodes:"..name.."_colored", {
+			description = desc,
+			tiles = {"scifi_nodes_"..name..".png"},
+			groups = {
+				cracky = 1,
+				ud_param2_colorable = 1,
+				not_in_creative_inventory = 1
+			},
+			palette = "unifieddyes_palette_extended.png",
+			paramtype = "light",
+			paramtype2 = "color",
+			light_source = light,
+			sounds = scifi_nodes.node_sound_glass_defaults(),
+			on_construct = unifieddyes.on_construct,
+			on_dig = unifieddyes.on_dig
+		})
+	end
 end

nodes_colored.lua

@@ -1,68 +0,0 @@
-
-minetest.register_node("scifi_nodes:whiteoct_colored", {
-    description = "white octagon",
-    tiles = {"scifi_nodes_super_white.png"},
-    overlay_tiles = {{ name = "scifi_nodes_whiteoct_overlay.png", color = "white" }},
-    groups = {
-        cracky = 1,
-        ud_param2_colorable = 1,
-        not_in_creative_inventory = 1
-    },
-    palette = "unifieddyes_palette_extended.png",
-    paramtype = "light",
-    paramtype2 = "color",
-    sounds = scifi_nodes.node_sound_glass_defaults(),
-    on_construct = unifieddyes.on_construct,
-    on_dig = unifieddyes.on_dig
-})
-
-minetest.register_node("scifi_nodes:whitetile_colored", {
-    description = "white tile2",
-    tiles = {"scifi_nodes_whitetile.png"},
-    overlay_tiles = {{ name = "scifi_nodes_whitetile_overlay.png", color = "white" }},
-    groups = {
-        cracky = 1,
-        ud_param2_colorable = 1,
-        not_in_creative_inventory = 1
-    },
-    palette = "unifieddyes_palette_extended.png",
-    paramtype = "light",
-    paramtype2 = "color",
-    sounds = scifi_nodes.node_sound_glass_defaults(),
-    on_construct = unifieddyes.on_construct,
-    on_dig = unifieddyes.on_dig
-})
-
-minetest.register_node("scifi_nodes:white_colored", {
-    description = "plastic wall",
-    tiles = {"scifi_nodes_white.png"},
-    -- NOTE: colorless overlay not enabled for the plastic wall node, doesn't look that natural
-    -- overlay_tiles = {{ name = "scifi_nodes_white_overlay.png", color = "white" }},
-    groups = {
-        cracky = 1,
-        ud_param2_colorable = 1,
-        not_in_creative_inventory = 1
-    },
-    palette = "unifieddyes_palette_extended.png",
-    paramtype = "light",
-    paramtype2 = "color",
-    sounds = scifi_nodes.node_sound_glass_defaults(),
-    on_construct = unifieddyes.on_construct,
-    on_dig = unifieddyes.on_dig
-})
-
-minetest.register_node("scifi_nodes:white2_colored", {
-    description = "plastic",
-    tiles = {"scifi_nodes_white2.png"},
-    groups = {
-        cracky = 1,
-        ud_param2_colorable = 1,
-        not_in_creative_inventory = 1
-    },
-    palette = "unifieddyes_palette_extended.png",
-    paramtype = "light",
-    paramtype2 = "color",
-    sounds = scifi_nodes.node_sound_glass_defaults(),
-    on_construct = unifieddyes.on_construct,
-    on_dig = unifieddyes.on_dig
-})