Skip to content
Snippets Groups Projects
Commit bbc14eee authored by Alexander Ralph Michael Minges's avatar Alexander Ralph Michael Minges Committed by Buckaroo Banzai
Browse files

enhance compatibility with mc2

parent 819bced8
Branches
No related tags found
No related merge requests found
...@@ -30,7 +30,7 @@ minetest.register_node("mapserver:border", { ...@@ -30,7 +30,7 @@ minetest.register_node("mapserver:border", {
"mapserver_border.png" "mapserver_border.png"
}, },
groups = {cracky=3,oddly_breakable_by_hand=3}, groups = {cracky=3,oddly_breakable_by_hand=3},
sounds = default.node_sound_glass_defaults(), sounds = moditems.sound_glass(),
can_dig = mapserver.can_interact, can_dig = mapserver.can_interact,
after_place_node = mapserver.after_place_node, after_place_node = mapserver.after_place_node,
......
local default_path = core.get_modpath("default") and default
local mineclone_path = core.get_modpath("mcl_core") and mcl_core
moditems = {}
if mineclone_path then
moditems.sound_glass = mcl_sounds.node_sound_glass_defaults
else
moditems.sound_glass = default.node_sound_glass_defaults
end
mapserver = { mapserver = {
enable_crafting = minetest.settings:get("mapserver.enable_crafting") == "true", enable_crafting = minetest.settings:get("mapserver.enable_crafting") == "true",
send_interval = tonumber(minetest.settings:get("mapserver.send_interval")) or 2, send_interval = tonumber(minetest.settings:get("mapserver.send_interval")) or 2,
......
...@@ -32,7 +32,7 @@ minetest.register_node("mapserver:label", { ...@@ -32,7 +32,7 @@ minetest.register_node("mapserver:label", {
"mapserver_label.png" "mapserver_label.png"
}, },
groups = {cracky=3,oddly_breakable_by_hand=3}, groups = {cracky=3,oddly_breakable_by_hand=3},
sounds = default.node_sound_glass_defaults(), sounds = moditems.sound_glass(),
can_dig = mapserver.can_interact, can_dig = mapserver.can_interact,
after_place_node = mapserver.after_place_node, after_place_node = mapserver.after_place_node,
......
name = mapserver name = mapserver
description = Mod for the mapserver. description = Mod for the mapserver.
optional_depends = default, dye, advtrains, minecart, monitoring, bones optional_depends = default, dye, advtrains, minecart, monitoring, bones, mcl_core, mcl_sounds
...@@ -47,7 +47,7 @@ local register_poi = function(color, dye) ...@@ -47,7 +47,7 @@ local register_poi = function(color, dye)
"[combine:16x16:0,0=mapserver_gold_block.png:3,2=mapserver_poi_" .. color .. ".png" "[combine:16x16:0,0=mapserver_gold_block.png:3,2=mapserver_poi_" .. color .. ".png"
}, },
groups = {cracky=3,oddly_breakable_by_hand=3}, groups = {cracky=3,oddly_breakable_by_hand=3},
sounds = default.node_sound_glass_defaults(), sounds = moditems.sound_glass(),
can_dig = mapserver.can_interact, can_dig = mapserver.can_interact,
after_place_node = mapserver.after_place_node, after_place_node = mapserver.after_place_node,
......
...@@ -33,7 +33,7 @@ minetest.register_node("mapserver:train", { ...@@ -33,7 +33,7 @@ minetest.register_node("mapserver:train", {
"mapserver_train.png" "mapserver_train.png"
}, },
groups = {cracky=3,oddly_breakable_by_hand=3}, groups = {cracky=3,oddly_breakable_by_hand=3},
sounds = default.node_sound_glass_defaults(), sounds = moditems.sound_glass(),
can_dig = mapserver.can_interact, can_dig = mapserver.can_interact,
after_place_node = mapserver.after_place_node, after_place_node = mapserver.after_place_node,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment