1
0
mirror of https://github.com/mt-mods/basic_materials.git synced 2025-06-29 14:40:41 +02:00

7 Commits

Author SHA1 Message Date
e4b766cd5c formatting fixes 2022-03-02 16:56:03 +11:00
f7039e09f3 Merge branch 'master' into hades 2022-03-02 16:33:13 +11:00
aa60caa261 Better compatibility with Hades Revisited. (#11)
* add hades revisted crafts and update sound api for sounds (#10)

* add hades revisted crafts and update sound api for sounds

* fix https://github.com/mt-mods/basic_materials/issues/9

* fix https://github.com/mt-mods/basic_materials/issues/9 part 2

* Add hades_bucket to crafts. Fix some bugs.

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

* Remove unused dependence.

* Clear original recipe for palstic base from hades_materials. Prevent dual plastic cook recipe.

* Use register_alias_force.

* Fix spaces vs tabs.

Co-authored-by: wsor4035 <24964441+wsor4035@users.noreply.github.com>
2022-03-01 19:03:35 -05:00
0837b7d766 refactor if statment 2022-02-27 11:30:27 -05:00
6e41b10e5f add missing optional dep 2022-02-27 11:28:43 -05:00
d14a1b4e52 if statement bugfix 2022-02-27 11:27:49 -05:00
29ade1253a add hades revisted crafts and update sound api for sounds 2022-02-27 11:24:35 -05:00
12 changed files with 21 additions and 189 deletions

View File

@ -85,18 +85,6 @@ minetest.register_craftitem("basic_materials:gold_wire", {
inventory_image = "basic_materials_gold_wire.png" inventory_image = "basic_materials_gold_wire.png"
}) })
minetest.register_craftitem("basic_materials:stainless_steel_wire", {
description = S("Spool of stainless steel wire"),
groups = { wire = 1 },
inventory_image = "basic_materials_stainless_steel_wire.png"
})
minetest.register_craftitem("basic_materials:aluminum_wire", {
description = S("Spool of aluminum wire"),
groups = { wire = 1 },
inventory_image = "basic_materials_aluminum_wire.png"
})
minetest.register_craftitem("basic_materials:steel_strip", { minetest.register_craftitem("basic_materials:steel_strip", {
description = S("Steel Strip"), description = S("Steel Strip"),
groups = { strip = 1 }, groups = { strip = 1 },
@ -109,50 +97,11 @@ minetest.register_craftitem("basic_materials:copper_strip", {
inventory_image = "basic_materials_copper_strip.png" inventory_image = "basic_materials_copper_strip.png"
}) })
minetest.register_craftitem("basic_materials:lead_strip", {
description = S("Lead Strip"),
groups = { strip = 1 },
inventory_image = "basic_materials_lead_strip.png"
})
minetest.register_craftitem("basic_materials:gold_strip", {
description = S("Gold Strip"),
groups = { strip = 1 },
inventory_image = "basic_materials_gold_strip.png"
})
minetest.register_craftitem("basic_materials:stainless_steel_strip", {
description = S("Stainless Steel Strip"),
groups = { strip = 1 },
inventory_image = "basic_materials_stainless_steel_strip.png"
})
minetest.register_craftitem("basic_materials:aluminum_strip", {
description = S("Aluminum Strip"),
groups = { strip = 1 },
inventory_image = "basic_materials_aluminum_strip.png"
})
minetest.register_craftitem("basic_materials:steel_bar", { minetest.register_craftitem("basic_materials:steel_bar", {
description = S("Steel Bar"), description = S("Steel Bar"),
inventory_image = "basic_materials_steel_bar.png", inventory_image = "basic_materials_steel_bar.png",
}) })
minetest.register_craftitem("basic_materials:carbon_steel_bar", {
description = S("Carbon Steel Bar"),
inventory_image = "basic_materials_carbon_steel_bar.png",
})
minetest.register_craftitem("basic_materials:stainless_steel_bar", {
description = S("Stainless Steel Bar"),
inventory_image = "basic_materials_stainless_steel_bar.png",
})
minetest.register_craftitem("basic_materials:aluminum_bar", {
description = S("Aluminum Bar"),
inventory_image = "basic_materials_aluminum_bar.png",
})
minetest.register_craftitem("basic_materials:chainlink_brass", { minetest.register_craftitem("basic_materials:chainlink_brass", {
description = S("Chainlinks (brass)"), description = S("Chainlinks (brass)"),
groups = { chainlinks = 1 }, groups = { chainlinks = 1 },
@ -183,6 +132,6 @@ minetest.register_craftitem("basic_materials:padlock", {
if minetest.get_modpath("hades_materials") then if minetest.get_modpath("hades_materials") then
minetest.register_alias_force("basic_materials:plastic_sheet", "hades_materials:plastic_sheeting") minetest.register_alias_force("basic_materials:plastic_sheet", "hades_materials:plastic_sheeting")
minetest.register_alias_force("basic_materials:paraffin", "hades_materials:plastic_base") minetest.register_alias_force("basic_materials:paraffin", "hades_materials:plastic_base")
minetest.register_alias_force("basic_materials:silicon", "hades_materials:silicon") minetest.register_alias_force("hades_extramaterials:silicon", "hades_materials:silicon")
end end

View File

@ -16,20 +16,6 @@ local materials = {
silicon = "mesecons_materials:silicon", silicon = "mesecons_materials:silicon",
} }
if minetest.get_modpath("moreores") then
materials.silver_ingot = "moreores:silver_ingot"
end
if minetest.get_modpath("technic") then
materials.lead_ingot = "technic:lead_ingot"
materials.carbon_steel_ingot = "technic:carbon_steel_ingot"
materials.stainless_steel_ingot = "technic:stainless_steel_ingot"
end
if minetest.get_modpath("aloz") then
materials["aluminum_ingot"] = "aloz:aluminum_ingot"
end
if minetest.get_modpath("mcl_core") then if minetest.get_modpath("mcl_core") then
materials = { materials = {
dirt = "mcl_core:dirt", dirt = "mcl_core:dirt",
@ -80,7 +66,7 @@ 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 = "hades_dye:dark_grey", 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",
--[[ --[[
@ -100,12 +86,6 @@ elseif minetest.get_modpath("hades_core") then
end end
if minetest.get_modpath("hades_extraores") then if minetest.get_modpath("hades_extraores") then
materials["silver_ingot"] = "hades_extraores:silver_ingot" materials["silver_ingot"] = "hades_extraores:silver_ingot"
materials["aluminum_ingot"] = "hades_extraores:aluminum_ingot"
end
if minetest.get_modpath("hades_technic") then
materials.lead_ingot = "hades_technic:lead_ingot"
materials.carbon_steel_ingot = "hades_technic:carbon_steel_ingot"
materials.stainless_steel_ingot = "hades_technic:stainless_steel_ingot"
end end
end end
@ -292,30 +272,6 @@ minetest.register_craft( {
}, },
}) })
if materials.stainless_steel_ingot then
minetest.register_craft( {
output = "basic_materials:stainless_steel_wire 2",
type = "shapeless",
recipe = {
materials.stainless_steel_ingot,
"basic_materials:empty_spool",
"basic_materials:empty_spool",
},
})
end
if materials.aluminum_ingot then
minetest.register_craft( {
output = "basic_materials:aluminum_wire 2",
type = "shapeless",
recipe = {
materials.aluminum_ingot,
"basic_materials:empty_spool",
"basic_materials:empty_spool",
},
})
end
minetest.register_craft( { minetest.register_craft( {
output = "basic_materials:steel_strip 12", output = "basic_materials:steel_strip 12",
recipe = { recipe = {
@ -332,44 +288,6 @@ minetest.register_craft( {
}, },
}) })
minetest.register_craft( {
output = "basic_materials:gold_strip 12",
recipe = {
{"", materials.gold_ingot, ""},
{materials.gold_ingot, "", ""},
},
})
if materials.lead_ingot then
minetest.register_craft( {
output = "basic_materials:lead_strip 12",
recipe = {
{"", materials.lead_ingot, ""},
{materials.lead_ingot, "", ""},
},
})
end
if materials.stainless_steel_ingot then
minetest.register_craft( {
output = "basic_materials:stainless_steel_strip 12",
recipe = {
{"", materials.stainless_steel_ingot, ""},
{materials.stainless_steel_ingot, "", ""},
},
})
end
if materials.aluminum_ingot then
minetest.register_craft( {
output = "basic_materials:aluminum_strip 12",
recipe = {
{"", materials.aluminum_ingot, ""},
{materials.aluminum_ingot, "", ""},
},
})
end
minetest.register_craft( { minetest.register_craft( {
output = "basic_materials:steel_bar 6", output = "basic_materials:steel_bar 6",
recipe = { recipe = {
@ -379,39 +297,6 @@ minetest.register_craft( {
}, },
}) })
if materials.carbon_steel_ingot then
minetest.register_craft( {
output = "basic_materials:carbon_steel_bar 6",
recipe = {
{"", "", materials.carbon_steel_ingot},
{"", materials.carbon_steel_ingot, ""},
{materials.carbon_steel_ingot, "", ""},
},
})
end
if materials.stainless_steel_ingot then
minetest.register_craft( {
output = "basic_materials:stainless_steel_bar 6",
recipe = {
{"", "", materials.stainless_steel_ingot},
{"", materials.stainless_steel_ingot, ""},
{materials.stainless_steel_ingot, "", ""},
},
})
end
if materials.aluminum_ingot then
minetest.register_craft( {
output = "basic_materials:aluminum_bar 6",
recipe = {
{"", "", materials.aluminum_ingot},
{"", materials.aluminum_ingot, ""},
{materials.aluminum_ingot, "", ""},
},
})
end
minetest.register_craft( { minetest.register_craft( {
output = "basic_materials:padlock 2", output = "basic_materials:padlock 2",
recipe = { recipe = {
@ -491,24 +376,22 @@ minetest.register_craft( {
}, },
}) })
if materials.silver_ingot then minetest.register_craft( {
minetest.register_craft( { output = "basic_materials:silver_wire 2",
output = "basic_materials:silver_wire 2", type = "shapeless",
type = "shapeless", recipe = {
recipe = { materials.silver_ingot,
materials.silver_ingot, "basic_materials:empty_spool",
"basic_materials:empty_spool", "basic_materials:empty_spool",
"basic_materials:empty_spool", },
}, })
})
minetest.register_craft( { minetest.register_craft( {
type = "shapeless", type = "shapeless",
output = "basic_materials:brass_ingot 3", output = "basic_materials:brass_ingot 3",
recipe = { recipe = {
materials.copper_ingot, materials.copper_ingot,
materials.copper_ingot, materials.copper_ingot,
materials.silver_ingot, materials.silver_ingot,
}, },
}) })
end

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_core, hades_sounds, hades_materials, hades_dye, hades_bucket, hades_extraores, hades_mesecons_materials, aloz optional_depends = moreores, default, mesecons_materials, dye, bucket, fl_stone, fl_trees, mcl_sounds, hades_sounds, hades_materials, hades_bucket, hades_extraores
min_minetest_version = 5.2.0 min_minetest_version = 5.2.0

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 383 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 292 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 358 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 382 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 280 B