elepower lighting initial and elepower inventory update

Breaking Update:
~ elepower lighting added
  ~ light bulbs
  ~ flood lights
  ~ led panels
  ~ decorative shades
  ~ added to tome
~ improvements to dynamics inventory images
~ improvements to machine recipe storage
~ tome support for new recipes
~ additional elepower conduit types added with lighting and base
~ changes to compressing from 1 recipe slot to 2 slots (potential breaking change)

elepower_dynamics/compat/basic_materials.lua

@@ -6,23 +6,53 @@ if minetest.get_modpath("basic_materials") == nil then
 
 	minetest.register_craftitem(":basic_materials:oil_extract", {
 		    description = "Oil Extract",
-		    inventory_image = "elepower_oil_extract.png",
+		    inventory_image = "elepower_bm_oil_extract.png",
 	})
 
 	minetest.register_craftitem(":basic_materials:paraffin", {
 		    description = "Unprocessed Paraffin",
-		    inventory_image = "elepower_paraffin.png",
+		    inventory_image = "elepower_bm_paraffin.png",
 	})
 
 	minetest.register_alias("basic_materials:plastic_base", "basic_materials:paraffin")
 	minetest.register_alias("homedecor:plastic_base", "basic_materials:paraffin")
 	minetest.register_alias("homedecor:paraffin", "basic_materials:paraffin")
-	minetest.register_alias("homedecor:plastic_sheeting", "basic_materials:plastic_sheet")
 	minetest.register_alias("homedecor:oil_extract", "basic_materials:oil_extract")
+	minetest.register_alias("homedecor:plastic_sheeting", "basic_materials:plastic_sheet")
+	minetest.register_alias("homedecor:plastic_strips",   "basic_materials:plastic_strip")
+	minetest.register_alias("homedecor:empty_spool",      "basic_materials:empty_spool")
 
 	minetest.register_craftitem(":basic_materials:plastic_sheet", {
 		    description = "Plastic Sheet",
-		    inventory_image = "elepower_plastic_sheet.png",
+		    inventory_image = "elepower_bm_plastic_sheet.png",
+	})
+
+	minetest.register_craftitem(":basic_materials:plastic_strip", {
+		description = "Plastic Strips",
+		groups = { strip = 1 },
+		inventory_image = "elepower_bm_strip.png^[colorize:#ffffff:200",
+	})
+
+	minetest.register_craftitem(":basic_materials:empty_spool", {
+		description = "Empty wire spool",
+		inventory_image = "elepower_bm_empty_spool.png"
+	})
+
+
+	minetest.register_craft( {
+		output = "basic_materials:plastic_strip 9",
+		recipe = {
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		},
+	})
+
+	minetest.register_craft( {
+		output = "basic_materials:empty_spool 3",
+		recipe = {
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" },
+			{ ""                             , "basic_materials:plastic_sheet",                              "" },
+			{ "basic_materials:plastic_sheet", "basic_materials:plastic_sheet", "basic_materials:plastic_sheet" }
+		},
 	})
 
 	minetest.register_craft({
@@ -74,17 +104,18 @@ if minetest.get_modpath("basic_materials") == nil then
 
 	minetest.register_craftitem(":basic_materials:copper_wire", {
 		description = "Copper Wire",
-		inventory_image = "elepower_copper_wire.png",
+		inventory_image = "elepower_bm_copper_wire.png",
 		groups = {copper = 1, wire = 1, component = 1}
 	})
 
-	minetest.register_craft({
-		output = "basic_materials:copper_wire 8",
+	minetest.register_craft( {
+		output = "basic_materials:copper_wire 2",
+		type = "shapeless",
 		recipe = {
-			{"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"},
-			{"default:copper_ingot", "",                     "default:copper_ingot"},
-			{"default:copper_ingot", "default:copper_ingot", "default:copper_ingot"}
-		}
+			"default:copper_ingot",
+			"basic_materials:empty_spool",
+			"basic_materials:empty_spool",
+		},
 	})
 
 	-----------
@@ -93,7 +124,7 @@ if minetest.get_modpath("basic_materials") == nil then
 
 	minetest.register_craftitem(":basic_materials:motor", {
 		description = "Motor",
-		inventory_image = "elepower_motor.png",
+		inventory_image = "elepower_bm_motor.png",
 		groups = {motor = 1, component = 1}
 	})
 
@@ -112,7 +143,7 @@ if minetest.get_modpath("basic_materials") == nil then
 
 	minetest.register_craftitem(":basic_materials:silicon", {
 		description = "Silicon",
-		inventory_image = "elepower_silicon.png",
+		inventory_image = "elepower_bm_silicon.png",
 		groups = {silicon = 1, lump = 1}
 	})
 
@@ -125,6 +156,54 @@ if minetest.get_modpath("basic_materials") == nil then
 		inventory_image = "elepower_brass_ingot.png",
 		groups = {brass = 1, ingot = 1}
 	})
+
+	-----------
+	-- STEEL --
+	-----------
+
+	minetest.register_craftitem(":basic_materials:steel_strip", {
+		description = "Steel Strip",
+		groups = { strip = 1 },
+		inventory_image = "elepower_bm_strip.png^[multiply:#ffffff"
+	})
+
+	minetest.register_craftitem(":basic_materials:steel_wire", {
+		description = "Spool of steel wire",
+		groups = { wire = 1 },
+		inventory_image = "elepower_bm_steel_wire.png"
+	})
+
+	minetest.register_craft( {
+		output = "basic_materials:steel_wire 2",
+		type = "shapeless",
+		recipe = {
+			"default:steel_ingot",
+			"basic_materials:empty_spool",
+			"basic_materials:empty_spool",
+		},
+	})
+
+	minetest.register_craft( {
+		output = "basic_materials:steel_strip 12",
+		recipe = {
+			{ "", "default:steel_ingot", "" },
+			{ "default:steel_ingot", "", "" },
+		},
+	})
+
 else
-	minetest.clear_craft({output = "basic_materials:brass_ingot"})
+	minetest.clear_craft({output = "basic_materials:brass_ingot"})	
+
+	local steel_strip_def = table.copy(minetest.registered_items["basic_materials:steel_strip"])	
+	steel_strip_def.inventory_image = "elepower_bm_strip.png^[multiply:#ffffff"
+	minetest.register_craftitem(":basic_materials:steel_strip", steel_strip_def)
+
+	local copper_strip_def = table.copy(minetest.registered_items["basic_materials:copper_strip"])	
+	copper_strip_def.inventory_image = "elepower_bm_strip.png^[multiply:#fcb15f"
+	minetest.register_craftitem(":basic_materials:copper_strip", copper_strip_def)
+
+	local plastic_strip_def = table.copy(minetest.registered_items["basic_materials:plastic_strip"])	
+	plastic_strip_def.inventory_image = "elepower_bm_strip.png^[colorize:#ffffff:200"
+	minetest.register_craftitem(":basic_materials:plastic_strip", plastic_strip_def)
+
 end

elepower_dynamics/components.lua

@@ -17,6 +17,7 @@ local list_def = {
 	{material = "viridisium", description = "Viridisium", color = "#5b9751", dust = true, plate = true, gear = true},
 	{material = "zinc",       description = "Zinc",       color = "#598a9e", dust = true, plate = true},
 	{material = "coal",       description = "Coal",       color = "#1f1f1f", dust = true},
+	{material = "mese",       description = "Mese",       color = "#fdff2d99", dust = true},
 	{material = "wood",       description = "Wood",       color = "#847454", dust = "Sawdust", gear = true}
 }
 
@@ -50,7 +51,12 @@ end
 function elepd.register_dust(mat, data)
 	local mod      = minetest.get_current_modname()
 	local itemname = mod..":"..mat.."_dust"
-
+	local image = "elepower_dust.png^[multiply:" .. data.color
+
+	if mat == "mese" then
+		image = "elepower_dust.png^[colorize:" .. data.color.."^[multiply:" .. data.color
+	end
+
 	data.item = itemname
 	elepd.registered_dusts[mat] = data
 
@@ -60,9 +66,11 @@ function elepd.register_dust(mat, data)
 		description = data.description
 	end
 
+
+
 	minetest.register_craftitem(itemname, {
 		description     = description,
-		inventory_image = "elepower_dust.png^[multiply:" .. data.color,
+		inventory_image = image,
 		groups          = {
 			["dust_" .. mat] = 1,
 			dust = 1

elepower_dynamics/conduits.lua

@@ -6,15 +6,67 @@ ele.register_conduit("elepower_dynamics:conduit", {
 	use_texture_alpha = "clip",
 	groups = {oddly_breakable_by_hand = 1, cracky = 1}
 })
---[[
+
 ele.register_conduit("elepower_dynamics:conduit_wall", {
 	description = "Power Conduit Wall Pass Through",
-	tiles = {"elepower_machine_side.png^elepower_power_port.png"},
+	tiles = {"elepower_conduit_wall.png"},
 	use_texture_alpha = "clip",
 	ele_conductor_density = 4/8,
-	groups = {oddly_breakable_by_hand = 1, cracky = 1}
+	groups = {cracky = 1}
+})
+
+ele.register_conduit("elepower_dynamics:conduit_dirt_with_grass", {
+	description = "Power Conduit Grass Outlet",
+	tiles = {"default_grass.png^elepower_conduit_node_socket.png",
+	         "default_dirt.png",
+			 "default_dirt.png^default_grass_side.png"
+			},
+	use_texture_alpha = "clip",
+	ele_conductor_density = 4/8,
+	groups = {crumbly = 3, soil = 1},
+	sounds = default.node_sound_dirt_defaults({
+			footstep = {name = "default_grass_footstep", gain = 0.25}
+	})
+})
+
+ele.register_conduit("elepower_dynamics:conduit_dirt_with_dry_grass", {
+	description = "Power Conduit Dry Grass Outlet",
+	tiles = {"default_dry_grass.png^elepower_conduit_node_socket.png",
+	         "default_dirt.png",
+			 "default_dirt.png^default_dry_grass_side.png"
+			},
+	use_texture_alpha = "clip",
+	ele_conductor_density = 4/8,
+	groups = {crumbly = 3, soil = 1},
+	sounds = default.node_sound_dirt_defaults({
+			footstep = {name = "default_grass_footstep", gain = 0.25}
+	})
 })
---]]
+
+ele.register_conduit("elepower_dynamics:conduit_stone_block", {
+	description = "Power Conduit Stone Block",
+	tiles = {"default_stone_block.png^elepower_conduit_node_socket.png",
+	         "default_stone_block.png^elepower_conduit_node_socket.png",
+			 "default_stone_block.png^elepower_conduit_node_socket.png"
+			},
+	use_texture_alpha = "clip",
+	ele_conductor_density = 4/8,
+	groups = {cracky = 2, stone = 1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
+ele.register_conduit("elepower_dynamics:conduit_stone_block_desert", {
+	description = "Power Conduit Desert Stone Block",
+	tiles = {"default_desert_stone_block.png^elepower_conduit_node_socket.png",
+	         "default_desert_stone_block.png^elepower_conduit_node_socket.png",
+			 "default_desert_stone_block.png^elepower_conduit_node_socket.png"
+			},
+	use_texture_alpha = "clip",
+	ele_conductor_density = 4/8,
+	groups = {cracky = 2, stone = 1},
+	sounds = default.node_sound_stone_defaults(),
+})
+
 -- Fluid
 fluid_lib.register_transfer_node("elepower_dynamics:opaque_duct", {
 	description = "Opaque Fluid Duct",

elepower_dynamics/crafting.lua

@@ -130,6 +130,53 @@ minetest.register_craft({
 	}
 })
 
+minetest.register_craft({
+	output = "elepower_dynamics:conduit_wall 1",
+	recipe = {
+		{""                            ,"elepower_dynamics:lead_plate",""},
+		{"elepower_dynamics:lead_plate","elepower_dynamics:conduit"   ,"elepower_dynamics:lead_plate"},
+		{""                            ,"elepower_dynamics:lead_plate",""}
+	}
+})
+
+minetest.register_craft({
+	output = "elepower_dynamics:conduit_dirt_with_grass 1",
+	recipe = {
+		{"","farming:seed_wheat",""},
+		{"","elepower_dynamics:conduit"   ,""},
+		{"","default:dirt"                ,""}
+	}
+})
+
+minetest.register_craft({
+	output = "elepower_dynamics:conduit_dirt_with_dry_grass 1",
+	recipe = {
+		{"","farming:wheat",""},
+		{"","elepower_dynamics:conduit"   ,""},
+		{"","default:dirt"                ,""}
+	}
+})
+
+minetest.register_craft({
+	output = "elepower_dynamics:conduit_stone_block 1",
+	recipe = {
+		{""                       ,"stairs:slab_stone_block"  ,""},
+		{"stairs:slab_stone_block","elepower_dynamics:conduit","stairs:slab_stone_block"},
+		{""                       ,"stairs:slab_stone_block"  ,""}
+	}
+})
+
+minetest.register_craft({
+	output = "elepower_dynamics:conduit_stone_block_desert 1",
+	recipe = {
+		{""                       ,"stairs:slab_desert_stone_block"  ,""},
+		{"stairs:slab_desert_stone_block","elepower_dynamics:conduit","stairs:slab_desert_stone_block"},
+		{""                       ,"stairs:slab_desert_stone_block"  ,""}
+	}
+})
+
+
+
 -- Opaque Fluid Duct
 minetest.register_craft({
 	output = "elepower_dynamics:opaque_duct 3",