Skip to content

Commit

Permalink
Merge branch 'master' into missionsSupport
Browse files Browse the repository at this point in the history
  • Loading branch information
SwissalpS authored Dec 29, 2024
2 parents aaf86e1 + bc79a70 commit 9cc4ef8
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 3 deletions.
1 change: 1 addition & 0 deletions .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ globals = {
}

read_globals = {
"core",
"table.copy",
"table.indexof",
"minetest",
Expand Down
1 change: 1 addition & 0 deletions init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ local mods = {
"technic",
"technic_chests",
"technic_cnc",
"vacuum",
"vessels",
"xdecor",
}
Expand Down
1 change: 1 addition & 0 deletions mod.conf
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ optional_depends = """
technic,
technic_chests,
technic_cnc,
vacuum,
vessels,
xdecor,
"""
Expand Down
13 changes: 10 additions & 3 deletions nodes/pipeworks.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

13 changes: 13 additions & 0 deletions nodes/vacuum.lua
Original file line number Diff line number Diff line change
@@ -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,
},
})

0 comments on commit 9cc4ef8

Please sign in to comment.