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.

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

Underch mod marble compatibility #331

Merged
merged 2 commits into from
Oct 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 9 additions & 7 deletions technic_worldgen/crafts.lua
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,15 @@ minetest.register_craft({
output = "technic:wrought_iron_ingot",
})

minetest.register_craft({
output = "technic:marble_bricks 4",
recipe = {
{"technic:marble","technic:marble"},
{"technic:marble","technic:marble"}
}
})
if not minetest.get_modpath("underch") then
minetest.register_craft({
output = "technic:marble_bricks 4",
recipe = {
{"technic:marble","technic:marble"},
{"technic:marble","technic:marble"}
}
})
end

minetest.register_craft({
output = "technic:granite_bricks 4",
Expand Down
2 changes: 1 addition & 1 deletion technic_worldgen/mod.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name = technic_worldgen
depends =
optional_depends = default, mcl_core, mcl_sounds, mcl_init, mcl_worlds, mg
optional_depends = default, mcl_core, mcl_sounds, mcl_init, mcl_worlds, mg, underch
41 changes: 23 additions & 18 deletions technic_worldgen/nodes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -79,25 +79,30 @@ else
})
end

minetest.register_node(":technic:marble", {
description = S("Marble"),
tiles = {"technic_marble.png"},
is_ground_content = true,
groups = {cracky=3, marble=1, pickaxey=1},
_mcl_hardness = 0.8,
_mcl_blast_resistance = 1,
sounds = technic.sounds.node_sound_stone_defaults(),
})
if minetest.get_modpath("underch") then
minetest.register_alias("technic:marble", "underch:marble")
minetest.register_alias("technic:marble_bricks", "underch:marble_brick")
else
minetest.register_node(":technic:marble", {
description = S("Marble"),
tiles = {"technic_marble.png"},
is_ground_content = true,
groups = {cracky=3, marble=1, pickaxey=1},
_mcl_hardness = 0.8,
_mcl_blast_resistance = 1,
sounds = technic.sounds.node_sound_stone_defaults(),
})

minetest.register_node(":technic:marble_bricks", {
description = S("Marble Bricks"),
tiles = {"technic_marble_bricks.png"},
is_ground_content = true,
groups = {cracky=3, pickaxey=1},
_mcl_hardness = 0.8,
_mcl_blast_resistance = 1,
sounds = technic.sounds.node_sound_stone_defaults(),
})
minetest.register_node(":technic:marble_bricks", {
description = S("Marble Bricks"),
tiles = {"technic_marble_bricks.png"},
is_ground_content = true,
groups = {cracky=3, pickaxey=1},
_mcl_hardness = 0.8,
_mcl_blast_resistance = 1,
sounds = technic.sounds.node_sound_stone_defaults(),
})
end

minetest.register_node(":technic:uranium_block", {
description = S("Uranium Block"),
Expand Down
3 changes: 2 additions & 1 deletion technic_worldgen/oregen.lua
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ if has_mcl then
})
end

if technic.config:get_bool("enable_marble_generation") then
if technic.config:get_bool("enable_marble_generation")
and not minetest.get_modpath("underch") then
minetest.register_ore({
ore_type = "sheet",
ore = "technic:marble",
Expand Down
Loading