minetest-mods/technic
1
0
Fork 1
mirror of https://github.com/minetest-mods/technic.git synced 2024-09-30 08:10:42 +02:00
Code Issues Releases Wiki Activity

Merge branch 'quarry-facedir-fix' of github.com:pandorabox-io/technic-1 into pandorabox

Browse Source
This commit is contained in:
Thomas Rudin 2018-12-03 10:54:10 +01:00
commit 6ef76aacfb
3 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
extranodes/init.lua
View File

@ -193,7 +193,6 @@ end
minetest.register_node(":technic:insulator_clip", iclip_def) minetest.register_node(":technic:insulator_clip", iclip_def)
minetest.register_node(":technic:insulator_clip_fencepost", iclipfence_def) minetest.register_node(":technic:insulator_clip_fencepost", iclipfence_def)
minetest.register_node(":technic:steel_strut_with_insulator_clip", sclip_def)
minetest.register_craft({ minetest.register_craft({
output = "technic:insulator_clip", output = "technic:insulator_clip",
@ -215,33 +214,35 @@ minetest.register_craft({
local steelmod = minetest.get_modpath("steel") local steelmod = minetest.get_modpath("steel")
if steelmod then if streetsmod or steelmod then
minetest.register_craft({ minetest.register_node(":technic:steel_strut_with_insulator_clip", sclip_def)
output = "technic:steel_strut_with_insulator_clip",
recipe = {
{"technic:insulator_clip_fencepost"},
{"steel:strut_mount"}
}
})
minetest.register_craft({ if steelmod then
output = "technic:steel_strut_with_insulator_clip", minetest.register_craft({
recipe = { output = "technic:steel_strut_with_insulator_clip",
{"technic:insulator_clip_fencepost", "" }, recipe = {
{"steel:strut", "default:steel_ingot" }, {"technic:insulator_clip_fencepost"},
} {"steel:strut_mount"}
}) }
})
end minetest.register_craft({
output = "technic:steel_strut_with_insulator_clip",
recipe = {
{"technic:insulator_clip_fencepost", "" },
{"steel:strut", "default:steel_ingot" },
}
})
if streetsmod then elseif streetsmod then
minetest.register_craft({ minetest.register_craft({
output = "technic:steel_strut_with_insulator_clip", output = "technic:steel_strut_with_insulator_clip",
recipe = { recipe = {
{"technic:insulator_clip_fencepost", "" }, {"technic:insulator_clip_fencepost", "" },
{"streets:steel_support", "default:steel_ingot" }, {"streets:steel_support", "default:steel_ingot" },
} }
}) })
end
end end
if minetest.get_modpath("unifieddyes") then if minetest.get_modpath("unifieddyes") then

6
technic/crafts.lua
View File

@ -44,6 +44,12 @@ minetest.clear_craft({
output = "basic_materials:brass_ingot", output = "basic_materials:brass_ingot",
}) })
minetest.register_craft( {
type = "shapeless",
output = "basic_materials:brass_ingot 9",
recipe = { "basic_materials:brass_block" },
})
-- tubes crafting recipes -- tubes crafting recipes
minetest.register_craft({ minetest.register_craft({

5
technic/machines/HV/quarry.lua
View File

@ -116,6 +116,11 @@ local function quarry_run(pos, node)
if meta:get_int("enabled") and meta:get_int("HV_EU_input") >= quarry_demand and meta:get_int("purge_on") == 0 then if meta:get_int("enabled") and meta:get_int("HV_EU_input") >= quarry_demand and meta:get_int("purge_on") == 0 then
local pdir = minetest.facedir_to_dir(node.param2) local pdir = minetest.facedir_to_dir(node.param2)
if pdir.y > 0 or pdir.y < 0 then
-- faces up or down, not valid, otherwise depth-check would run endless and hang up the server
return
end
local qdir = pdir.x == 1 and vector.new(0,0,-1) or local qdir = pdir.x == 1 and vector.new(0,0,-1) or
(pdir.z == -1 and vector.new(-1,0,0) or (pdir.z == -1 and vector.new(-1,0,0) or
(pdir.x == -1 and vector.new(0,0,1) or (pdir.x == -1 and vector.new(0,0,1) or