Merge branch 'master' into christmasSupport

.luacheckrc

@@ -5,6 +5,7 @@ globals = {
 }
 
 read_globals = {
+	"core",
 	"table.copy",
 	"table.indexof",
 	"minetest",

init.lua

@@ -35,10 +35,12 @@ local mods = {
 	"digistuff",
 	"digtron",
 	"drawers",
+	"easyvend",
 	"mesecons_commandblock",
 	"mesecons_detector",
 	"mesecons_luacontroller",
 	"mesecons_microcontroller",
+	"missions",
 	"mobs",
 	"more_chests",
 	"pipeworks",
@@ -47,6 +49,7 @@ local mods = {
 	"technic",
 	"technic_chests",
 	"technic_cnc",
+	"vacuum",
 	"vessels",
 	"xdecor",
 }

mod.conf

@@ -14,10 +14,12 @@ optional_depends = """
 	digiscreen,
 	digistuff,
 	drawers,
+	easyvend,
 	mesecons_commandblock,
 	mesecons_detector,
 	mesecons_luacontroller,
 	mesecons_microcontroller,
+	missions,
 	mobs,
 	more_chests,
 	pipeworks,
@@ -26,6 +28,7 @@ optional_depends = """
 	technic,
 	technic_chests,
 	technic_cnc,
+	vacuum,
 	vessels,
 	xdecor,
 """

nodes/easyvend.lua

@@ -0,0 +1,27 @@
+
+-- Register wrench support for the easyvend mod
+
+for _, name in ipairs({
+		"easyvend:vendor", "easyvend:vendor_on",
+		"easyvend:depositor", "easyvend:depositor_on",
+	}) do
+	wrench.register_node(name, {
+		lists = { "gold", "item" },
+		metas = {
+			configmode = wrench.META_TYPE_INT,
+			cost = wrench.META_TYPE_INT,
+			earnings = wrench.META_TYPE_INT,
+			formspec = wrench.META_TYPE_IGNORE,
+			infotext = wrench.META_TYPE_IGNORE,
+			itemname = wrench.META_TYPE_STRING,
+			joke_id = wrench.META_TYPE_INT,
+			joketimer = wrench.META_TYPE_INT,
+			message = wrench.META_TYPE_IGNORE,
+			number = wrench.META_TYPE_INT,
+			owner = wrench.META_TYPE_STRING,
+			status = wrench.META_TYPE_IGNORE,
+			stock = wrench.META_TYPE_INT,
+			wear = wrench.META_TYPE_INT,
+		},
+	})
+end

nodes/missions.lua

@@ -0,0 +1,18 @@
+
+-- Register wrench support for the missions mod
+
+wrench.register_node("missions:mission", {
+	lists = { "main" },
+	metas = {
+		description = wrench.META_TYPE_STRING,
+		hidden = wrench.META_TYPE_INT,
+		infotext = wrench.META_TYPE_STRING,
+		name = wrench.META_TYPE_STRING,
+		owner = wrench.META_TYPE_STRING,
+		steps = wrench.META_TYPE_STRING,
+		successcount = wrench.META_TYPE_INT,
+		time = wrench.META_TYPE_INT,
+		valid = wrench.META_TYPE_INT,
+	},
+})
+

nodes/pipeworks.lua

@@ -142,14 +142,18 @@ for i = 1, 6 do
 	table.insert(mese_tube_data.lists, "line"..i)
 end
 
+local has_lua_tube = core.get_modpath("mesecons_luacontroller") and true
+
 for xm = 0, 1 do
 for xp = 0, 1 do
 for ym = 0, 1 do
 for yp = 0, 1 do
 for zm = 0, 1 do
 for zp = 0, 1 do
 	local tname = xm..xp..ym..yp..zm..zp
-	wrench.register_node("pipeworks:lua_tube"..tname, lua_tube_data)
+	if has_lua_tube then
+		wrench.register_node("pipeworks:lua_tube"..tname, lua_tube_data)
+	end
 	wrench.register_node("pipeworks:mese_tube_"..tname, mese_tube_data)
 end
 end
@@ -158,5 +162,8 @@ end
 end
 end
 
-lua_tube_data.drop = nil
-wrench.register_node("pipeworks:lua_tube_burnt", lua_tube_data)
+if has_lua_tube then
+	lua_tube_data.drop = nil
+	wrench.register_node("pipeworks:lua_tube_burnt", lua_tube_data)
+end
+

nodes/vacuum.lua

@@ -0,0 +1,13 @@
+
+-- Register wrench support for the vacuum mod
+
+wrench.register_node("vacuum:airpump", {
+	lists = { "main" },
+	metas = {
+		enabled = wrench.META_TYPE_INT,
+		formspec = wrench.META_TYPE_IGNORE,
+		infotext = wrench.META_TYPE_IGNORE,
+		owner = wrench.META_TYPE_STRING,
+	},
+})
+