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>
This commit is contained in:
sfence
GitHub
parent
0837b7d766
commit
aa60caa261
|
|
@ -128,3 +128,10 @@ minetest.register_craftitem("basic_materials:padlock", {
|
|||
description = S("Padlock"),
|
||||
inventory_image = "basic_materials_padlock.png"
|
||||
})
|
||||
|
||||
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:paraffin", "hades_materials:plastic_base")
|
||||
minetest.register_alias_force("hades_extramaterials:silicon", "hades_materials:silicon")
|
||||
end
|
||||
|
||||
|
|
|
|||
70
crafts.lua
70
crafts.lua
|
|
@ -13,6 +13,7 @@ local materials = {
|
|||
water_bucket = "bucket:bucket_water",
|
||||
empty_bucket = "bucket:bucket_empty",
|
||||
dye_dark_grey = "dye:dark_grey",
|
||||
silicon = "mesecons_materials:silicon",
|
||||
}
|
||||
|
||||
if minetest.get_modpath("mcl_core") then
|
||||
|
|
@ -33,6 +34,7 @@ if minetest.get_modpath("mcl_core") then
|
|||
copper_ingot = "mcl_core:iron_ingot",
|
||||
tin_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
|
||||
materials = {
|
||||
|
|
@ -51,10 +53,11 @@ elseif minetest.get_modpath("fl_ores") and minetest.get_modpath("fl_stone") then
|
|||
copper_ingot = "fl_ores:copper_ingot",
|
||||
tin_ingot = "fl_ores:tin_ingot",
|
||||
silver_ingot = "fl_ores:iron_ingot",
|
||||
silicon = "mesecons_materials:silicon",
|
||||
}
|
||||
elseif minetest.get_modpath("hades_core") then
|
||||
materials = {
|
||||
dirt = "fl_topsoil:dirt",
|
||||
dirt = "hades_core:dirt",
|
||||
sand = "hades_core:fertile_sand",
|
||||
gravel = "hades_core:gravel",
|
||||
steel_ingot = "hades_core:steel_ingot",
|
||||
|
|
@ -63,24 +66,31 @@ elseif minetest.get_modpath("hades_core") then
|
|||
torch = "hades_torches:torch",
|
||||
diamond = "hades_core:diamond",
|
||||
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",
|
||||
tin_ingot = "hades_core:tin_ingot",
|
||||
--[[
|
||||
since hades doesnt have buckets or water for the user,
|
||||
using dirt from near water to pull the water out
|
||||
]]
|
||||
water_bucket = "hades_core:fertile_sand",
|
||||
empty_bucket = "hades_core:dirt",
|
||||
water_bucket = "hades_core:dirt",
|
||||
empty_bucket = "hades_core:fertile_sand",
|
||||
--set this to steel unless hadesextraores is present
|
||||
silver_ingot = "hades_core:steel_ingot",
|
||||
silicon = "hades_materials:silicon",
|
||||
}
|
||||
|
||||
if minetest.get_modpath("hades_bucket") then
|
||||
materials["water_bucket"] = "hades_bucket:bucket_water"
|
||||
materials["empty_bucket"] = "hades_bucket:bucket_empty"
|
||||
end
|
||||
if minetest.get_modpath("hades_extraores") then
|
||||
materials["silver_ingot"] = "hades_extraores:silver_ingot"
|
||||
end
|
||||
end
|
||||
|
||||
local have_hades_materials = minetest.get_modpath("hades_materials")
|
||||
|
||||
--craft recipes
|
||||
minetest.register_craft({
|
||||
output = "basic_materials:chainlink_brass 12",
|
||||
|
|
@ -140,6 +150,13 @@ minetest.register_craft( {
|
|||
},
|
||||
})
|
||||
|
||||
if have_hades_materials then
|
||||
minetest.clear_craft({
|
||||
type = "shapeless",
|
||||
recipe = {"group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves", "group:leaves"}
|
||||
})
|
||||
end
|
||||
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = "basic_materials:oil_extract 2",
|
||||
|
|
@ -147,11 +164,13 @@ minetest.register_craft({
|
|||
})
|
||||
|
||||
--cooking recipes
|
||||
minetest.register_craft({
|
||||
if not have_hades_materials then
|
||||
minetest.register_craft({
|
||||
type = "cooking",
|
||||
output = "basic_materials:plastic_sheet",
|
||||
recipe = "basic_materials:paraffin",
|
||||
})
|
||||
})
|
||||
end
|
||||
|
||||
minetest.register_craft({
|
||||
type = "cooking",
|
||||
|
|
@ -305,46 +324,45 @@ minetest.register_craft( {
|
|||
},
|
||||
})
|
||||
|
||||
--i3 does has issues in its craft override with replacements
|
||||
if not minetest.get_modpath("i3") then
|
||||
minetest.register_craft( {
|
||||
minetest.register_craft( {
|
||||
type = "shapeless",
|
||||
output = "basic_materials:terracotta_base 8",
|
||||
recipe = {
|
||||
materials.bucket_water,
|
||||
materials.water_bucket,
|
||||
materials.clay_lump,
|
||||
materials.gravel,
|
||||
},
|
||||
replacements = {{materials.bucket_water, materials.bucket_empty}},
|
||||
})
|
||||
replacements = {{materials.water_bucket, materials.empty_bucket}},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
minetest.register_craft({
|
||||
type = "shapeless",
|
||||
output = "basic_materials:wet_cement 3",
|
||||
recipe = {
|
||||
materials.dirt,
|
||||
materials.dark_grey,
|
||||
materials.dark_grey,
|
||||
materials.dark_grey,
|
||||
materials.bucket_water
|
||||
materials.dye_dark_grey,
|
||||
materials.dye_dark_grey,
|
||||
materials.dye_dark_grey,
|
||||
materials.water_bucket
|
||||
},
|
||||
replacements = {{materials.bucket_water, materials.bucket_empty}},
|
||||
})
|
||||
end
|
||||
replacements = {{materials.water_bucket, materials.empty_bucket}},
|
||||
})
|
||||
|
||||
minetest.register_craft( {
|
||||
output = "mesecons_materials:silicon 4",
|
||||
if not have_hades_materials then
|
||||
minetest.register_craft( {
|
||||
output = materials.silicon.." 4",
|
||||
recipe = {
|
||||
{ materials.sand, materials.sand },
|
||||
{ materials.sand, materials.steel_ingot },
|
||||
},
|
||||
})
|
||||
})
|
||||
end
|
||||
|
||||
minetest.register_craft( {
|
||||
output = "basic_materials:ic 4",
|
||||
recipe = {
|
||||
{ "mesecons_materials:silicon", "mesecons_materials:silicon" },
|
||||
{ "mesecons_materials:silicon", materials.copper_ingot },
|
||||
{ materials.silicon, materials.silicon },
|
||||
{ materials.silicon, materials.copper_ingot },
|
||||
},
|
||||
})
|
||||
|
||||
|
|
@ -362,7 +380,7 @@ minetest.register_craft( {
|
|||
output = "basic_materials:silver_wire 2",
|
||||
type = "shapeless",
|
||||
recipe = {
|
||||
"moreores:silver_ingot",
|
||||
materials.silver_ingot,
|
||||
"basic_materials:empty_spool",
|
||||
"basic_materials:empty_spool",
|
||||
},
|
||||
|
|
|
|||
2
mod.conf
2
mod.conf
|
|
@ -1,3 +1,3 @@
|
|||
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
|
||||
min_minetest_version = 5.2.0
|
||||
|
|
|
|||
Loading…
Reference in New Issue