Make modpack mostly independent from MTG (#607)

mesecons_extrawires/corner.lua

@@ -32,7 +32,7 @@ minetest.register_node("mesecons_extrawires:corner_on", {
 	selection_box = corner_selectionbox,
 	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
 	drop = "mesecons_extrawires:corner_off",
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 	mesecons = {conductor =
 	{
 		state = mesecon.state.on,
@@ -58,7 +58,7 @@ minetest.register_node("mesecons_extrawires:corner_off", {
 	sunlight_propagates = true,
 	selection_box = corner_selectionbox,
 	groups = {dig_immediate = 3},
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 	mesecons = {conductor =
 	{
 		state = mesecon.state.off,

mesecons_extrawires/crossover.lua

@@ -32,7 +32,7 @@ minetest.register_node("mesecons_extrawires:crossover_off", {
 	stack_max = 99,
 	selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
 	groups = {dig_immediate=3, mesecon=3},
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 	mesecons = {
 		conductor = {
 			states = crossover_states,
@@ -59,7 +59,7 @@ minetest.register_node("mesecons_extrawires:crossover_01", {
 	stack_max = 99,
 	selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
 	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 	mesecons = {
 		conductor = {
 			states = crossover_states,
@@ -86,7 +86,7 @@ minetest.register_node("mesecons_extrawires:crossover_10", {
 	stack_max = 99,
 	selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
 	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 	mesecons = {
 		conductor = {
 			states = crossover_states,
@@ -113,7 +113,7 @@ minetest.register_node("mesecons_extrawires:crossover_on", {
 	stack_max = 99,
 	selection_box = {type="fixed", fixed={-16/32, -16/32, -16/32, 16/32, -5/32, 16/32}},
 	groups = {dig_immediate=3, mesecon=3, not_in_creative_inventory=1},
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 	mesecons = {
 		conductor = {
 			states = crossover_states,

mesecons_extrawires/doublecorner.lua

@@ -61,7 +61,7 @@ for k, state in ipairs(doublecorner_states) do
 		selection_box = doublecorner_selectionbox,
 		groups = groups,
 		drop = doublecorner_states[1],
-		sounds = default.node_sound_defaults(),
+		sounds = mesecon.node_sound.default,
 		mesecons = {
 			conductor = {
 				states = doublecorner_states,

mesecons_extrawires/mesewire.lua

@@ -1,3 +1,20 @@
+local mese_nodename = minetest.registered_aliases["mesecons_gamecompat:mese"]
+if mese_nodename then
+	-- Convert placeholders.
+	minetest.register_alias("mesecons_extrawires:mese", mese_nodename)
+else
+	-- Register placeholder.
+	mese_nodename = "mesecons_extrawires:mese"
+	minetest.register_node("mesecons_extrawires:mese", {
+		description = "Mese Wire",
+		tiles = {"mesecons_wire_off.png"},
+		paramtype = "light",
+		light_source = 3,
+		groups = {cracky = 1},
+		sounds = mesecon.node_sound.stone,
+	})
+end
+
 local mesewire_rules =
 {
 	{x = 1, y = 0, z = 0},
@@ -8,7 +25,7 @@ local mesewire_rules =
 	{x = 0, y = 0, z =-1},
 }
 
-minetest.override_item("default:mese", {
+minetest.override_item(mese_nodename, {
 	mesecons = {conductor = {
 		state = mesecon.state.off,
 		onstate = "mesecons_extrawires:mese_powered",
@@ -18,15 +35,17 @@ minetest.override_item("default:mese", {
 
 -- Copy node definition of powered mese from normal mese
 -- and brighten texture tiles to indicate mese is powered
-local powered_def = mesecon.merge_tables(minetest.registered_nodes["default:mese"], {
-	drop = "default:mese",
-	light_source = 5,
+local unpowered_def = minetest.registered_nodes[mese_nodename]
+local powered_def = mesecon.merge_tables(unpowered_def, {
+	drop = mese_nodename,
+	paramtype = "light",
+	light_source = math.min(unpowered_def.light_source + 2, minetest.LIGHT_MAX),
 	mesecons = {conductor = {
 		state = mesecon.state.on,
-		offstate = "default:mese",
+		offstate = mese_nodename,
 		rules = mesewire_rules
 	}},
-	groups = {cracky = 1, not_in_creative_inventory = 1},
+	groups = mesecon.merge_tables(unpowered_def.groups or {}, {not_in_creative_inventory = 1}),
 	on_blast = mesecon.on_blastnode,
 })
 

mesecons_extrawires/mod.conf

@@ -1,3 +1,3 @@
 name = mesecons_extrawires
-depends = default, mesecons
+depends = mesecons, mesecons_gamecompat
 optional_depends = screwdriver

mesecons_extrawires/tjunction.lua

@@ -44,7 +44,7 @@ minetest.register_node("mesecons_extrawires:tjunction_on", {
 	node_box = tjunction_nodebox,
 	groups = {dig_immediate = 3, not_in_creative_inventory = 1},
 	drop = "mesecons_extrawires:tjunction_off",
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 	mesecons = {conductor =
 	{
 		state = mesecon.state.on,
@@ -74,7 +74,7 @@ minetest.register_node("mesecons_extrawires:tjunction_off", {
 	selection_box = tjunction_selectionbox,
 	node_box = tjunction_nodebox,
 	groups = {dig_immediate = 3},
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 	mesecons = {conductor =
 	{
 		state = mesecon.state.off,

mesecons_extrawires/vertical.lua

@@ -89,7 +89,7 @@ mesecon.register_node("mesecons_extrawires:vertical", {
 	drop = "mesecons_extrawires:vertical_off",
 	after_place_node = vertical_update,
 	after_dig_node = vertical_update,
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 },{
 	tiles = {"mesecons_wire_off.png"},
 	groups = {dig_immediate=3},
@@ -123,7 +123,7 @@ mesecon.register_node("mesecons_extrawires:vertical_top", {
 	drop = "mesecons_extrawires:vertical_off",
 	after_place_node = vertical_update,
 	after_dig_node = vertical_update,
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 },{
 	tiles = {"mesecons_wire_off.png"},
 	mesecons = {conductor = {
@@ -155,7 +155,7 @@ mesecon.register_node("mesecons_extrawires:vertical_bottom", {
 	drop = "mesecons_extrawires:vertical_off",
 	after_place_node = vertical_update,
 	after_dig_node = vertical_update,
-	sounds = default.node_sound_defaults(),
+	sounds = mesecon.node_sound.default,
 },{
 	tiles = {"mesecons_wire_off.png"},
 	mesecons = {conductor = {