Fix dependencies and recipes. Disable silicon if hades_materials is aviable.

This commit is contained in:
SFENCE 2022-02-28 16:21:42 +01:00
parent fccf303b7d
commit 8dc927e1b7
3 changed files with 21 additions and 13 deletions

View File

@ -8,7 +8,7 @@ if not have_hades_materials then
inventory_image = "basic_materials_plastic_sheet.png", inventory_image = "basic_materials_plastic_sheet.png",
}) })
else else
minetest.register_alias("basic_materials:plastic_sheet", "hades_materials:plastic_sheeting"); minetest.register_alias("basic_materials:plastic_sheet", "hades_materials:plastic_sheeting")
end end
minetest.register_craftitem("basic_materials:plastic_strip", { minetest.register_craftitem("basic_materials:plastic_strip", {
@ -27,10 +27,14 @@ minetest.register_craftitem("basic_materials:oil_extract", {
inventory_image = "basic_materials_oil_extract.png", inventory_image = "basic_materials_oil_extract.png",
}) })
minetest.register_craftitem("basic_materials:paraffin", { if not have_hades_materials then
description = S("Unprocessed paraffin"), minetest.register_craftitem("basic_materials:paraffin", {
inventory_image = "basic_materials_paraffin.png", description = S("Unprocessed paraffin"),
}) inventory_image = "basic_materials_paraffin.png",
})
else
minetest.register_alias("basic_materials:paraffin", "hades_materials:plastic_base")
end
minetest.register_craftitem("basic_materials:terracotta_base", { minetest.register_craftitem("basic_materials:terracotta_base", {
description = S("Uncooked Terracotta Base"), description = S("Uncooked Terracotta Base"),
@ -48,7 +52,7 @@ if not have_hades_materials then
inventory_image = "basic_materials_silicon.png", inventory_image = "basic_materials_silicon.png",
}) })
else else
minetest.register_alias("hades_extramaterials:silicon", "hades_materials:silicon"); minetest.register_alias("hades_extramaterials:silicon", "hades_materials:silicon")
end end
minetest.register_craftitem("basic_materials:ic", { minetest.register_craftitem("basic_materials:ic", {

View File

@ -13,6 +13,7 @@ local materials = {
water_bucket = "bucket:bucket_water", water_bucket = "bucket:bucket_water",
empty_bucket = "bucket:bucket_empty", empty_bucket = "bucket:bucket_empty",
dye_dark_grey = "dye:dark_grey", dye_dark_grey = "dye:dark_grey",
silicon = "mesecons_materials:silicon",
} }
if minetest.get_modpath("mcl_core") then if minetest.get_modpath("mcl_core") then
@ -33,6 +34,7 @@ if minetest.get_modpath("mcl_core") then
copper_ingot = "mcl_core:iron_ingot", copper_ingot = "mcl_core:iron_ingot",
tin_ingot = "mcl_core:iron_ingot", tin_ingot = "mcl_core:iron_ingot",
silver_ingot = "mcl_core:iron_ingot", silver_ingot = "mcl_core:iron_ingot",
silicon = "mesecons_materials:silicon",
} }
elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
materials = { materials = {
@ -51,6 +53,7 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
copper_ingot = "fl_ores:copper_ingot", copper_ingot = "fl_ores:copper_ingot",
tin_ingot = "fl_ores:tin_ingot", tin_ingot = "fl_ores:tin_ingot",
silver_ingot = "fl_ores:iron_ingot", silver_ingot = "fl_ores:iron_ingot",
silicon = "mesecons_materials:silicon",
} }
elseif minetest.get_modpath("hades_core") then elseif minetest.get_modpath("hades_core") then
materials = { materials = {
@ -63,17 +66,18 @@ elseif minetest.get_modpath("hades_core") then
torch = "hades_torches:torch", torch = "hades_torches:torch",
diamond = "hades_core:diamond", diamond = "hades_core:diamond",
clay_lump = "hades_core:clay_lump", clay_lump = "hades_core:clay_lump",
dye_dark_grey = "dye:dark_grey_dye", dye_dark_grey = "dye:dark_grey",
copper_ingot = "hades_core:copper_ingot", copper_ingot = "hades_core:copper_ingot",
tin_ingot = "hades_core:tin_ingot", tin_ingot = "hades_core:tin_ingot",
--[[ --[[
since hades doesnt have buckets or water for the user, since hades doesnt have buckets or water for the user,
using dirt from near water to pull the water out using dirt from near water to pull the water out
]] ]]
water_bucket = "hades_core:fertile_sand", water_bucket = "hades_core:dirt",
empty_bucket = "hades_core:dirt", empty_bucket = "hades_core:fertile_sand",
--set this to steel unless hadesextraores is present --set this to steel unless hadesextraores is present
silver_ingot = "hades_core:steel_ingot", silver_ingot = "hades_core:steel_ingot",
silicon = "hades_materials:silicon",
} }
if minetest.get_modpath("hades_bucket") then if minetest.get_modpath("hades_bucket") then
@ -337,7 +341,7 @@ minetest.register_craft({
if not have_hades_materials then if not have_hades_materials then
minetest.register_craft( { minetest.register_craft( {
output = "mesecons_materials:silicon 4", output = materials.silicon.." 4",
recipe = { recipe = {
{ materials.sand, materials.sand }, { materials.sand, materials.sand },
{ materials.sand, materials.steel_ingot }, { materials.sand, materials.steel_ingot },
@ -348,8 +352,8 @@ end
minetest.register_craft( { minetest.register_craft( {
output = "basic_materials:ic 4", output = "basic_materials:ic 4",
recipe = { recipe = {
{ "mesecons_materials:silicon", "mesecons_materials:silicon" }, { materials.silicon, materials.silicon },
{ "mesecons_materials:silicon", materials.copper_ingot }, { materials.silicon, materials.copper_ingot },
}, },
}) })

View File

@ -1,3 +1,3 @@
name = basic_materials name = basic_materials
optional_depends = moreores, default, mesecons_materials, dye, bucket, fl_stone, fl_trees, mcl_sounds, hades_sounds optional_depends = moreores, default, mesecons_materials, dye, bucket, fl_stone, fl_trees, mcl_sounds, hades_sounds, hades_materials, hades_bucket, hades_extraores, hades_mesecons_materials
min_minetest_version = 5.2.0 min_minetest_version = 5.2.0