From bbc14eee3547f19077dcee5d15e12af802b2e034 Mon Sep 17 00:00:00 2001
From: Alexander Ralph Michael Minges <alexander.minges@athemis.de>
Date: Sun, 26 Apr 2020 11:41:25 +0200
Subject: [PATCH] enhance compatibility with mc2
---
border.lua | 2 +-
init.lua | 11 +++++++++++
label.lua | 2 +-
mod.conf | 2 +-
poi.lua | 2 +-
train.lua | 2 +-
6 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/border.lua b/border.lua
index 26e8d7b..62fcce9 100644
--- a/border.lua
+++ b/border.lua
@@ -30,7 +30,7 @@ minetest.register_node("mapserver:border", {
"mapserver_border.png"
},
groups = {cracky=3,oddly_breakable_by_hand=3},
- sounds = default.node_sound_glass_defaults(),
+ sounds = moditems.sound_glass(),
can_dig = mapserver.can_interact,
after_place_node = mapserver.after_place_node,
diff --git a/init.lua b/init.lua
index 13c1efe..160e035 100644
--- a/init.lua
+++ b/init.lua
@@ -1,4 +1,15 @@
+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 = {
enable_crafting = minetest.settings:get("mapserver.enable_crafting") == "true",
send_interval = tonumber(minetest.settings:get("mapserver.send_interval")) or 2,
diff --git a/label.lua b/label.lua
index 6f1e62e..d96b82d 100644
--- a/label.lua
+++ b/label.lua
@@ -32,7 +32,7 @@ minetest.register_node("mapserver:label", {
"mapserver_label.png"
},
groups = {cracky=3,oddly_breakable_by_hand=3},
- sounds = default.node_sound_glass_defaults(),
+ sounds = moditems.sound_glass(),
can_dig = mapserver.can_interact,
after_place_node = mapserver.after_place_node,
diff --git a/mod.conf b/mod.conf
index aff3949..daf3a36 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,3 +1,3 @@
name = 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
diff --git a/poi.lua b/poi.lua
index 2d5103a..253d221 100644
--- a/poi.lua
+++ b/poi.lua
@@ -47,7 +47,7 @@ local register_poi = function(color, dye)
"[combine:16x16:0,0=mapserver_gold_block.png:3,2=mapserver_poi_" .. color .. ".png"
},
groups = {cracky=3,oddly_breakable_by_hand=3},
- sounds = default.node_sound_glass_defaults(),
+ sounds = moditems.sound_glass(),
can_dig = mapserver.can_interact,
after_place_node = mapserver.after_place_node,
diff --git a/train.lua b/train.lua
index 16c81e5..33a3c72 100644
--- a/train.lua
+++ b/train.lua
@@ -33,7 +33,7 @@ minetest.register_node("mapserver:train", {
"mapserver_train.png"
},
groups = {cracky=3,oddly_breakable_by_hand=3},
- sounds = default.node_sound_glass_defaults(),
+ sounds = moditems.sound_glass(),
can_dig = mapserver.can_interact,
after_place_node = mapserver.after_place_node,
--
GitLab