Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate sound_api submodule, and make recipes configurable per game, but fallback to Minetest Game items otherwise. #7

Closed
wants to merge 2 commits into from
Closed

Integrate sound_api submodule, and make recipes configurable per game, but fallback to Minetest Game items otherwise. #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0155af
Integrate sound_api submodule, and make recipes configurable per game…
MysticTempest Feb 26, 2022
1290e13
Fix luacheck errors.
MysticTempest Feb 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "sound_api_core"]
path = sound_api_core
url = https://github.com/mt-mods/sound_api_core.git
6 changes: 3 additions & 3 deletions .luacheckrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
globals = {
"minetest", "basic_materials",
"minetest", "basic_materials", "bm",
}

read_globals = {
"default",
}
"default", "bm", "ks_sounds","mcl_sounds","nodes_nature","fl_topsoil","fl_stone","fl_trees",
}
8 changes: 0 additions & 8 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,3 @@ mod that adds basic material nodes and items
### Option 3: use git

* `git clone https://github.com/mt-mods/basic_materials.git`
* `cd basic_materials`
* `git submodule init`
* `git submodule update`

to update please use the following commands starting inside the mod directory

* `git submodule sync`
* `git submodule update`
163 changes: 81 additions & 82 deletions crafts.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ minetest.register_craft({
})

minetest.register_craft({
output = 'basic_materials:chain_steel 2',
output = "basic_materials:chain_steel 2",
recipe = {
{"basic_materials:chainlink_steel"},
{"basic_materials:chainlink_steel"},
Expand All @@ -18,7 +18,7 @@ minetest.register_craft({
})

minetest.register_craft({
output = 'basic_materials:chain_brass 2',
output = "basic_materials:chain_brass 2",
recipe = {
{"basic_materials:chainlink_brass"},
{"basic_materials:chainlink_brass"},
Expand Down Expand Up @@ -102,22 +102,22 @@ minetest.register_craft({
burntime = 30,
})

if minetest.get_modpath("default") then

minetest.register_craft({
output = 'basic_materials:concrete_block 6',
output = "basic_materials:concrete_block 6",
recipe = {
{'group:sand', 'basic_materials:wet_cement', 'default:gravel'},
{'basic_materials:steel_bar', 'basic_materials:wet_cement', 'basic_materials:steel_bar'},
{'default:gravel', 'basic_materials:wet_cement', 'group:sand'},
{"group:sand", "basic_materials:wet_cement", bm.gameconfig_gravel},
{"basic_materials:steel_bar", "basic_materials:wet_cement", "basic_materials:steel_bar"},
{bm.gameconfig_gravel, "basic_materials:wet_cement", "group:sand"},
}
})

minetest.register_craft( {
output = "basic_materials:motor 2",
recipe = {
{ "default:mese_crystal_fragment", "basic_materials:copper_wire", "basic_materials:plastic_sheet" },
{ "default:copper_ingot", "default:steel_ingot", "default:steel_ingot" },
{ "default:mese_crystal_fragment", "basic_materials:copper_wire", "basic_materials:plastic_sheet" }
{ bm.gameconfig_mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet" },
{ bm.gameconfig_copper_ingot, bm.gameconfig_steel_ingot, bm.gameconfig_steel_ingot },
{ bm.gameconfig_mese_crystal_fragment, "basic_materials:copper_wire", "basic_materials:plastic_sheet" }
},
replacements = {
{ "basic_materials:copper_wire", "basic_materials:empty_spool" },
Expand All @@ -128,24 +128,24 @@ if minetest.get_modpath("default") then
minetest.register_craft( {
output = "basic_materials:heating_element 2",
recipe = {
{ "default:copper_ingot", "default:mese_crystal_fragment", "default:copper_ingot" }
{ bm.gameconfig_copper_ingot, bm.gameconfig_mese_crystal_fragment, bm.gameconfig_copper_ingot }
},
})

minetest.register_craft({
--type = "shapeless",
output = "basic_materials:energy_crystal_simple 2",
recipe = {
{ "default:mese_crystal_fragment", "default:torch", "default:mese_crystal_fragment" },
{ "default:diamond", "default:gold_ingot", "default:diamond" }
{ bm.gameconfig_mese_crystal_fragment, bm.gameconfig_torch, bm.gameconfig_mese_crystal_fragment },
{ bm.gameconfig_diamond, bm.gameconfig_gold_ingot, bm.gameconfig_diamond }
},
})

minetest.register_craft( {
output = "basic_materials:copper_wire 2",
type = "shapeless",
recipe = {
"default:copper_ingot",
bm.gameconfig_copper_ingot,
"basic_materials:empty_spool",
"basic_materials:empty_spool",
},
Expand All @@ -155,7 +155,7 @@ if minetest.get_modpath("default") then
output = "basic_materials:gold_wire 2",
type = "shapeless",
recipe = {
"default:gold_ingot",
bm.gameconfig_gold_ingot,
"basic_materials:empty_spool",
"basic_materials:empty_spool",
},
Expand All @@ -165,7 +165,7 @@ if minetest.get_modpath("default") then
output = "basic_materials:steel_wire 2",
type = "shapeless",
recipe = {
"default:steel_ingot",
bm.gameconfig_steel_ingot,
"basic_materials:empty_spool",
"basic_materials:empty_spool",
},
Expand All @@ -174,130 +174,129 @@ if minetest.get_modpath("default") then
minetest.register_craft( {
output = "basic_materials:steel_strip 12",
recipe = {
{ "", "default:steel_ingot", "" },
{ "default:steel_ingot", "", "" },
{ "", bm.gameconfig_steel_ingot, "" },
{ bm.gameconfig_steel_ingot, "", "" },
},
})

minetest.register_craft( {
output = "basic_materials:copper_strip 12",
recipe = {
{ "", "default:copper_ingot", "" },
{ "default:copper_ingot", "", "" },
{ "", bm.gameconfig_copper_ingot, "" },
{ bm.gameconfig_copper_ingot, "", "" },
},
})

minetest.register_craft( {
output = "basic_materials:steel_bar 6",
recipe = {
{ "", "", "default:steel_ingot" },
{ "", "default:steel_ingot", "" },
{ "default:steel_ingot", "", "" },
{ "", "", bm.gameconfig_steel_ingot },
{ "", bm.gameconfig_steel_ingot, "" },
{ bm.gameconfig_steel_ingot, "", "" },
},
})

minetest.register_craft( {
output = "basic_materials:padlock 2",
recipe = {
{ "basic_materials:steel_bar" },
{ "default:steel_ingot" },
{ "default:steel_ingot" },
{ bm.gameconfig_steel_ingot },
{ bm.gameconfig_steel_ingot },
},
})

minetest.register_craft({
output = "basic_materials:chainlink_steel 12",
recipe = {
{"", "default:steel_ingot", "default:steel_ingot"},
{ "default:steel_ingot", "", "default:steel_ingot" },
{ "default:steel_ingot", "default:steel_ingot", "" },
{"", bm.gameconfig_steel_ingot, bm.gameconfig_steel_ingot},
{ bm.gameconfig_steel_ingot, "", bm.gameconfig_steel_ingot },
{ bm.gameconfig_steel_ingot, bm.gameconfig_steel_ingot, "" },
},
})

minetest.register_craft( {
output = "basic_materials:gear_steel 6",
recipe = {
{ "", "default:steel_ingot", "" },
{ "default:steel_ingot","basic_materials:chainlink_steel", "default:steel_ingot" },
{ "", "default:steel_ingot", "" }
{ "", bm.gameconfig_steel_ingot, "" },
{ bm.gameconfig_steel_ingot,"basic_materials:chainlink_steel", bm.gameconfig_steel_ingot },
{ "", bm.gameconfig_steel_ingot, "" }
},
})

if minetest.get_modpath("bucket") then
minetest.register_craft( {
type = "shapeless",
output = "basic_materials:terracotta_base 8",
recipe = {
"bucket:bucket_water",
"default:clay_lump",
"default:gravel",
},
replacements = { {"bucket:bucket_water", "bucket:bucket_empty"}, },
})

if minetest.get_modpath("dye") then
minetest.register_craft({
type = "shapeless",
output = "basic_materials:wet_cement 3",
recipe = {
"default:dirt",
"dye:dark_grey",
"dye:dark_grey",
"dye:dark_grey",
"bucket:bucket_water"
},
replacements = {{'bucket:bucket_water', 'bucket:bucket_empty'},},
})
end
end
minetest.register_craft( {
type = "shapeless",
output = "basic_materials:terracotta_base 8",
recipe = {
bm.gameconfig_water_bucket,
bm.gameconfig_clay_lump,
bm.gameconfig_gravel,
},
replacements = { {bm.gameconfig_water_bucket, bm.gameconfig_empty_bucket}, },
})

if minetest.get_modpath("mesecons_materials") then
minetest.register_craft( {
output = "mesecons_materials:silicon 4",
recipe = {
{ "default:sand", "default:sand" },
{ "default:sand", "default:steel_ingot" },
},
})

minetest.register_craft( {
output = "basic_materials:ic 4",
recipe = {
{ "mesecons_materials:silicon", "mesecons_materials:silicon" },
{ "mesecons_materials:silicon", "default:copper_ingot" },
},
})
end
minetest.register_craft({
type = "shapeless",
output = "basic_materials:wet_cement 3",
recipe = {
bm.gameconfig_dirt,
bm.gameconfig_dye_dark_grey,
bm.gameconfig_dye_dark_grey,
bm.gameconfig_dye_dark_grey,
bm.gameconfig_water_bucket
},
replacements = {{bm.gameconfig_water_bucket, bm.gameconfig_empty_bucket},},
})


minetest.register_craft( {
output = "basic_materials:silicon 4",
recipe = {
{ bm.gameconfig_sand, bm.gameconfig_sand },
{ bm.gameconfig_sand, bm.gameconfig_steel_ingot },
},
})

minetest.register_craft( {
output = "basic_materials:ic 4",
recipe = {
{ "basic_materials:silicon", "basic_materials:silicon" },
{ "basic_materials:silicon", bm.gameconfig_copper_ingot },
},
})


if not minetest.get_modpath("moreores") then
-- Without moreores, there still should be a way to create brass.
minetest.register_craft( {
output = "basic_materials:brass_ingot 9",
recipe = {
{"default:copper_ingot", "default:tin_ingot", "default:copper_ingot"},
{"default:gold_ingot", "default:copper_ingot", "default:gold_ingot"},
{"default:copper_ingot", "default:tin_ingot", "default:copper_ingot"},
{bm.gameconfig_copper_ingot, bm.gameconfig_tin_ingot, bm.gameconfig_copper_ingot},
{bm.gameconfig_gold_ingot, bm.gameconfig_copper_ingot, bm.gameconfig_gold_ingot},
{bm.gameconfig_copper_ingot, bm.gameconfig_tin_ingot, bm.gameconfig_copper_ingot},
},
})
elseif minetest.get_modpath("moreores") then

minetest.register_craft( {
output = "basic_materials:silver_wire 2",
type = "shapeless",
recipe = {
"moreores:silver_ingot",
bm.gameconfig_silver_ingot,
"basic_materials:empty_spool",
"basic_materials:empty_spool",
},
})

elseif minetest.get_modpath("moreores") then
minetest.register_craft( {
type = "shapeless",
output = "basic_materials:brass_ingot 3",
recipe = {
"default:copper_ingot",
"default:copper_ingot",
bm.gameconfig_copper_ingot,
bm.gameconfig_copper_ingot,
"moreores:silver_ingot",
},
})
end
end


Loading