Fix mesecons_gamecompat mvps hardcoding issues and increased game compatibility

.luacheckrc

@@ -15,6 +15,7 @@ ignore = {
 max_line_length = 200
 
 read_globals = {
+	"core",
 	"default",
 	"digiline",
 	"doors",

mesecons_extrawires/init.lua

@@ -3,4 +3,6 @@ dofile(minetest.get_modpath("mesecons_extrawires").."/tjunction.lua");
 dofile(minetest.get_modpath("mesecons_extrawires").."/corner.lua");
 dofile(minetest.get_modpath("mesecons_extrawires").."/doublecorner.lua");
 dofile(minetest.get_modpath("mesecons_extrawires").."/vertical.lua");
-dofile(minetest.get_modpath("mesecons_extrawires").."/mesewire.lua");
+if core.registered_nodes["mesecons_gamecompat:mese"] then
+	dofile(minetest.get_modpath("mesecons_extrawires").."/mesewire.lua");
+end

mesecons_gamecompat/compat_mcl.lua → mesecons_gamecompat/compat_mcla.lua

@@ -7,7 +7,7 @@ minetest.register_alias("mesecons_gamecompat:coalblock", "mcl_core:coalblock")
 minetest.register_alias("mesecons_gamecompat:cobble", "mcl_core:cobble")
 minetest.register_alias("mesecons_gamecompat:glass", "mcl_core:glass")
 minetest.register_alias("mesecons_gamecompat:lava_source", "mcl_core:lava_source")
-minetest.register_alias("mesecons_gamecompat:mese", "mesecons:redstoneblock")
+minetest.register_alias("mesecons_gamecompat:mese", "mcl_redstone_torch:redstoneblock")
 minetest.register_alias("mesecons_gamecompat:mese_crystal", "mesecoms:redstone")
 minetest.register_alias("mesecons_gamecompat:mese_crystal_fragment", "mesecons:redstone")
 minetest.register_alias("mesecons_gamecompat:obsidian_glass", "mcl_core:glass")
@@ -41,3 +41,26 @@ end
 -- Textures
 
 mesecon.texture.steel_block = "default_steel_block.png"
+
+if minetest.get_modpath("mesecons_mvps") then
+	core.register_on_mods_loaded(function()
+		for _,v in pairs(core.registered_nodes) do
+			if v.groups and v.groups.bed then
+				mesecon.register_mvps_stopper(v.name)
+			end
+			if v.groups and v.groups.door then
+				mesecon.register_mvps_stopper(v.name)
+			end
+		end
+	end)
+end
+
+
+core.register_craft({
+	output = "mesecons:wire_00000000_off",
+	recipe = {{"mcl_redstone:redstone"}}
+})
+core.register_craft({
+	output = "mcl_redstone:redstone",
+	recipe = {{"mesecons:wire_00000000_off"}}
+})

mesecons_gamecompat/compat_mtg.lua

@@ -48,28 +48,26 @@ if minetest.get_modpath("mesecons_mvps") then
 	for _, name in ipairs({
 		"default:chest_locked",
 		"default:chest_locked_open",
-		"doors:door_steel_b_1", -- old style doors
-		"doors:door_steel_b_2", --
-		"doors:door_steel_t_1", --
-		"doors:door_steel_t_2", --
-		"doors:door_steel_a",   -- new style doors
-		"doors:door_steel_b",   --
-		"doors:door_steel_c",   --
-		"doors:door_steel_d",   --
 		"doors:hidden",
 		"doors:trapdoor_steel",
 		"doors:trapdoor_steel_open",
-		"beds:bed_bottom",
-		"beds:bed_top",
-		"beds:fancy_bed_bottom",
-		"beds:fancy_bed_top",
-		"xpanes:door_steel_bar_a",
-		"xpanes:door_steel_bar_b",
-		"xpanes:door_steel_bar_c",
-		"xpanes:door_steel_bar_d",
 		"xpanes:trapdoor_steel_bar",
 		"xpanes:trapdoor_steel_bar_open",
 	}) do
 		mesecon.register_mvps_stopper(name)
 	end
+	core.register_on_mods_loaded(function()
+		if minetest.get_modpath("doors") then
+			for k,_ in pairs(doors.registered_doors) do
+				mesecon.register_mvps_stopper(k)
+			end
+		end
+		if minetest.get_modpath("beds") then
+			for _,v in pairs(core.registered_nodes) do
+				if v.groups and v.groups.bed then
+					mesecon.register_mvps_stopper(v.name)
+				end
+			end
+		end
+	end)
 end

mesecons_gamecompat/init.lua

@@ -14,7 +14,11 @@ if minetest.get_modpath("default") then
 	dofile(minetest.get_modpath("mesecons_gamecompat").."/compat_mtg.lua")
 end
 
-if minetest.get_modpath("mcl_core") then
+if minetest.get_modpath("mcl_redstone") then
 	minetest.log("info", "Mesecons: detected MineClonia Game for game compatibility")
-	dofile(minetest.get_modpath("mesecons_gamecompat").."/compat_mcl.lua")
+	dofile(minetest.get_modpath("mesecons_gamecompat").."/compat_mcla.lua")
+end
+
+if minetest.get_modpath("doors") then
+	dofile(minetest.get_modpath("mesecons_gamecompat").."/doors.lua")
 end

mesecons_gamecompat/mod.conf

@@ -1,3 +1,3 @@
 name = mesecons_gamecompat
 depends = mesecons
-optional_depends = fire, default, dye, mesecons_mvps, tnt, mcl_fire, mcl_core, mcl_dye, mcl_tnt
+optional_depends = fire, default, dye, mesecons_mvps, tnt, doors, beds, mcl_fire, mcl_core, mcl_dye, mcl_tnt

mesecons_pistons/init.lua

@@ -115,27 +115,13 @@ local function piston_off(pos, node)
 	end
 end
 
-local orientations = {
-	[0] = { 4,  8},
-	      {13, 17},
-	      {10,  6},
-	      {20, 15},
-}
-
 local function piston_orientate(pos, placer)
 	mesecon.mvps_set_owner(pos, placer)
 	if not placer then
 		return
 	end
-	local pitch = math.deg(placer:get_look_vertical())
 	local node = minetest.get_node(pos)
-	if pitch > 55 then
-		node.param2 = orientations[node.param2][1]
-	elseif pitch < -55 then
-		node.param2 = orientations[node.param2][2]
-	else
-		return
-	end
+	node.param2 = core.dir_to_facedir(placer:get_look_dir(), true)
 	minetest.swap_node(pos, node)
 	-- minetest.after, because on_placenode for unoriented piston must be processed first
 	minetest.after(0, mesecon.on_placenode, pos, node)