More basic_materials support

2018-12-12 15:46:19 +02:00 · 2018-12-12 15:46:19 +02:00 · c734b34e53
parent 482ed1b93c
commit c734b34e53
8 changed files with 68 additions and 51 deletions
--- a/elepower_dynamics/compat/basic_materials.lua
+++ b/elepower_dynamics/compat/basic_materials.lua
@ -1,4 +1,9 @@
 if minetest.get_modpath("basic_materials") == nil then
+
+	--------------
+	-- PLASTICS --
+	--------------
+
 	minetest.register_craftitem(":basic_materials:oil_extract", {
 		    description = "Oil Extract",
 		    inventory_image = "elepower_oil_extract.png",
@ -58,4 +63,52 @@ if minetest.get_modpath("basic_materials") == nil then
 		    recipe = "basic_materials:plastic_sheet",
 		    burntime = 30,
 	})
+
+	-----------------
+	-- COPPER WIRE --
+	-----------------
+
+	minetest.register_craftitem(":basic_materials:copper_wire", {
+		description = "Copper Wire",
+		inventory_image = "elepower_copper_wire.png",
+		groups = {copper = 1, wire = 1, component = 1}
+	})
+
+	minetest.register_craft({
+		output = "basic_materials:copper_wire 8",
+		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"}
+		}
+	})
+
+	-----------
+	-- MOTOR --
+	-----------
+
+	minetest.register_craftitem(":basic_materials:motor", {
+		description = "Motor",
+		inventory_image = "elepower_motor.png",
+		groups = {motor = 1, component = 1}
+	})
+
+	minetest.register_craft({
+		output = "basic_materials:motor 3",
+		recipe = {
+			{"default:steel_ingot", "elepower_dynamics:wound_copper_coil", "default:steel_ingot"},
+			{"basic_materials:copper_wire", "elepower_dynamics:wound_copper_coil", "basic_materials:copper_wire"},
+			{"default:steel_ingot", "elepower_dynamics:capacitor", "default:steel_ingot"},
+		}
+	})
+
+	-------------
+	-- SILICON --
+	-------------
+
+	minetest.register_craftitem(":basic_materials:silicon", {
+		description = "Silicon",
+		inventory_image = "elepower_silicon.png",
+		groups = {silicon = 1, lump = 1}
+	})
 end
--- a/elepower_dynamics/compat/init.lua
+++ b/elepower_dynamics/compat/init.lua
@ -1,3 +1,3 @@
 -- Elepower Compatibility registrations

-dofile(elepd.modpath.."/compat/plastic.lua")
+dofile(elepd.modpath.."/compat/basic_materials.lua")
--- a/elepower_dynamics/crafting.lua
+++ b/elepower_dynamics/crafting.lua
@ -120,7 +120,7 @@ minetest.register_craft({
 	output = "elepower_dynamics:conduit 8",
 	recipe = {
 		{"elepower_dynamics:lead_ingot",  "elepower_dynamics:lead_ingot",  "elepower_dynamics:lead_ingot"},
-		{"elepower_dynamics:copper_wire", "elepower_dynamics:copper_wire", "elepower_dynamics:copper_wire"},
+		{"basic_materials:copper_wire", "basic_materials:copper_wire", "basic_materials:copper_wire"},
 		{"elepower_dynamics:lead_ingot",  "elepower_dynamics:lead_ingot",  "elepower_dynamics:lead_ingot"},
 	}
 })
@ -167,15 +167,6 @@ minetest.register_craft({
 	}
 })

-minetest.register_craft({
-	output = "elepower_dynamics:copper_wire 8",
-	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"}
-	}
-})
-
 minetest.register_craft({
 	output = "elepower_dynamics:servo_valve 3",
 	recipe = {
@ -277,15 +268,6 @@ minetest.register_craft({
 	}
 })

-minetest.register_craft({
-	output = "elepower_dynamics:motor 3",
-	recipe = {
-		{"default:steel_ingot", "elepower_dynamics:wound_copper_coil", "default:steel_ingot"},
-		{"elepower_dynamics:copper_wire", "elepower_dynamics:wound_copper_coil", "elepower_dynamics:copper_wire"},
-		{"default:steel_ingot", "elepower_dynamics:capacitor", "default:steel_ingot"},
-	}
-})
-
 minetest.register_craft({
 	output = "elepower_dynamics:tin_can 8",
 	recipe = {
--- a/elepower_dynamics/craftitems.lua
+++ b/elepower_dynamics/craftitems.lua
@ -99,12 +99,6 @@ minetest.register_craftitem("elepower_dynamics:carbon_sheet", {
 	groups = {carbon_fiber_sheet = 1, sheet = 1}
 })

-minetest.register_craftitem("elepower_dynamics:silicon", {
-	description = "Silicon",
-	inventory_image = "elepower_silicon.png",
-	groups = {silicon = 1, lump = 1}
-})
-
 minetest.register_craftitem("elepower_dynamics:silicon_wafer", {
 	description = "Silicon Wafer",
 	inventory_image = "elepower_silicon_wafer.png",
@ -176,12 +170,6 @@ minetest.register_craftitem("elepower_dynamics:wound_silver_coil", {
 	groups = {silver = 1, coil = 1, component = 1}
 })

-minetest.register_craftitem("elepower_dynamics:copper_wire", {
-	description = "Copper Wire",
-	inventory_image = "elepower_copper_wire.png",
-	groups = {copper = 1, wire = 1, component = 1}
-})
-
 minetest.register_craftitem("elepower_dynamics:induction_coil", {
 	description = "Induction Coil\nTier 3 Coil",
 	inventory_image = "elepower_induction_coil.png",
@ -220,12 +208,6 @@ minetest.register_craftitem("elepower_dynamics:capacitor", {

 -- Assembled Components

-minetest.register_craftitem("elepower_dynamics:motor", {
-	description = "Motor",
-	inventory_image = "elepower_motor.png",
-	groups = {motor = 1, component = 1}
-})
-
 minetest.register_craftitem("elepower_dynamics:battery", {
 	description = "Battery",
 	inventory_image = "elepower_battery.png",
--- a/elepower_farming/crafting.lua
+++ b/elepower_farming/crafting.lua
@ -19,7 +19,7 @@ minetest.register_craft({
 	recipe = {
 		{"elepower_dynamics:nickel_ingot", "elepower_dynamics:control_circuit", "elepower_dynamics:nickel_ingot"},
 		{"farming:hoe_steel", "elepower_farming:device_frame", "farming:hoe_steel"},
-		{"elepower_dynamics:wound_copper_coil", "elepower_dynamics:motor", "elepower_dynamics:wound_copper_coil"},
+		{"elepower_dynamics:wound_copper_coil", "basic_materials:motor", "elepower_dynamics:wound_copper_coil"},
 	}
 })

@ -29,7 +29,7 @@ minetest.register_craft({
 	recipe = {
 		{"elepower_dynamics:nickel_ingot", "elepower_dynamics:control_circuit", "elepower_dynamics:nickel_ingot"},
 		{"default:axe_steel", "elepower_farming:device_frame", "farming:hoe_steel"},
-		{"elepower_dynamics:motor", "elepower_dynamics:diamond_gear", "elepower_dynamics:motor"},
+		{"basic_materials:motor", "elepower_dynamics:diamond_gear", "basic_materials:motor"},
 	}
 })

@ -37,7 +37,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "elepower_farming:tree_extractor",
 	recipe = {
-		{"elepower_dynamics:motor", "bucket:bucket_empty", "elepower_dynamics:motor"},
+		{"basic_materials:motor", "bucket:bucket_empty", "basic_materials:motor"},
 		{"elepower_dynamics:tree_tap", "elepower_farming:device_frame", "elepower_dynamics:tree_tap"},
 		{"elepower_dynamics:copper_gear", "elepower_dynamics:servo_valve", "elepower_dynamics:copper_gear"},
 	}
@ -47,7 +47,7 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "elepower_farming:composter",
 	recipe = {
-		{"elepower_dynamics:motor", "bucket:bucket_empty", "elepower_dynamics:motor"},
+		{"basic_materials:motor", "bucket:bucket_empty", "basic_materials:motor"},
 		{"elepower_dynamics:electrum_gear", "elepower_farming:device_frame", "elepower_dynamics:electrum_gear"},
 		{"elepower_dynamics:copper_gear", "elepower_dynamics:servo_valve", "elepower_dynamics:copper_gear"},
 	}
--- a/elepower_machines/crafting.lua
+++ b/elepower_machines/crafting.lua
@ -26,7 +26,7 @@ local alloy_recipes = {
 		output = "elepower_dynamics:electrum_ingot 3",
 	},
 	{
-		recipe = { "elepower_dynamics:silicon", "elepower_dynamics:coal_dust 2" },
+		recipe = { "basic_materials:silicon", "elepower_dynamics:coal_dust 2" },
 		output = "elepower_dynamics:silicon_wafer",
 	},
 	{
@ -104,11 +104,11 @@ local grinding_recipes = {
 	},
 	{
 		recipe = { "default:desert_sand 4" },
-		output = "elepower_dynamics:silicon",
+		output = "basic_materials:silicon",
 	},
 	{
 		recipe = { "default:sand 4" },
-		output = "elepower_dynamics:silicon",
+		output = "basic_materials:silicon",
 	},
 	{
 		recipe = { "default:cobble" },
@ -288,12 +288,12 @@ local soldering_recipes = {
 		time   = 20,
 	},
 	{
-		recipe = { "elepower_dynamics:wound_copper_coil 4", "elepower_dynamics:wound_silver_coil 2", "elepower_dynamics:copper_wire" },
+		recipe = { "elepower_dynamics:wound_copper_coil 4", "elepower_dynamics:wound_silver_coil 2", "basic_materials:copper_wire" },
 		output = "elepower_dynamics:induction_coil",
 		time   = 16,
 	},
 	{
-		recipe = { "elepower_dynamics:induction_coil 4", "elepower_dynamics:copper_wire", "elepower_dynamics:zinc_dust 2" },
+		recipe = { "elepower_dynamics:induction_coil 4", "basic_materials:copper_wire", "elepower_dynamics:zinc_dust 2" },
 		output = "elepower_dynamics:induction_coil_advanced",
 		time   = 18,
 	}
@ -352,7 +352,7 @@ minetest.register_craft({
 	recipe = {
 		{"elepower_dynamics:electrum_ingot", "default:steel_ingot", "elepower_dynamics:electrum_ingot"},
 		{"default:steel_ingot", "default:mese_crystal", "default:steel_ingot"},
-		{"elepower_dynamics:electrum_ingot", "elepower_dynamics:motor", "elepower_dynamics:electrum_ingot"},
+		{"elepower_dynamics:electrum_ingot", "basic_materials:motor", "elepower_dynamics:electrum_ingot"},
 	}
 })

--- a/elepower_tools/crafting.lua
+++ b/elepower_tools/crafting.lua
@ -13,7 +13,7 @@ minetest.register_craft({
 	recipe = {
 		{"", "elepower_dynamics:wound_copper_coil", "elepower_tools:drill_bit"},
 		{"default:steel_ingot", "elepower_dynamics:battery", "default:steel_ingot"},
-		{"elepower_dynamics:motor", "elepower_dynamics:capacitor", ""},
+		{"basic_materials:motor", "elepower_dynamics:capacitor", ""},
 	}
 })

@ -32,7 +32,7 @@ minetest.register_craft({
 	recipe = {
 		{"", "elepower_dynamics:wound_copper_coil", "elepower_tools:chain"},
 		{"default:steel_ingot", "elepower_dynamics:battery", "default:steel_ingot"},
-		{"elepower_dynamics:motor", "elepower_dynamics:capacitor", ""},
+		{"basic_materials:motor", "elepower_dynamics:capacitor", ""},
 	}
 })

--- a/elepower_wireless/crafting.lua
+++ b/elepower_wireless/crafting.lua
@ -40,7 +40,7 @@ minetest.register_craft({
 	output = "elepower_wireless:wireless_porter",
 	recipe = {
 		{"elepower_dynamics:wound_silver_coil", "elepower_dynamics:xycrone_lump", "elepower_dynamics:wound_silver_coil"},
-		{"elepower_dynamics:xycrone_lump", "elepower_dynamics:copper_wire", "elepower_dynamics:xycrone_lump"},
+		{"elepower_dynamics:xycrone_lump", "basic_materials:copper_wire", "elepower_dynamics:xycrone_lump"},
 		{"elepower_dynamics:wound_silver_coil", "elepower_dynamics:battery", "elepower_dynamics:wound_silver_coil"},
 	}
 })