Door Fixes & Improvements (#3479)

This pull request fixes the issue where people had to mirror their door textures because the game used a different method to texture the doors.

Speaking of mirrored, this pull request also fixes mirrored doors and improves those greatly.

Reviewed-on: MineClone2/MineClone2#3479
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
Co-authored-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
Co-committed-by: FossFanatic <fossfanatic@noreply.git.minetest.land>
This commit is contained in:
FossFanatic 2023-06-13 15:43:52 +00:00 committed by ancientmarinerdev
parent f57f73681a
commit ac31642ec9
104 changed files with 401 additions and 266 deletions

View File

@ -4,10 +4,6 @@
--- DateTime: 12/29/22 12:38 PM -- Restructure Date --- DateTime: 12/29/22 12:38 PM -- Restructure Date
--- Copyright (C) 2022 - 2023, Michieal. See License.txt --- Copyright (C) 2022 - 2023, Michieal. See License.txt
-- CONSTS
-- Due to door fix #2736, doors are displayed backwards. When this is fixed, set this variable to false.
local BROKEN_DOORS = true
-- FUTURE USE VARIABLE. MUST REMAIN FALSE UNTIL IT HAS BEEN FULLY IMPLEMENTED. DO NOT ENABLE. -- FUTURE USE VARIABLE. MUST REMAIN FALSE UNTIL IT HAS BEEN FULLY IMPLEMENTED. DO NOT ENABLE.
local SIDE_SCAFFOLDING = false local SIDE_SCAFFOLDING = false
local SIDE_SCAFFOLD_NAME = "mcl_bamboo:scaffolding_horizontal" local SIDE_SCAFFOLD_NAME = "mcl_bamboo:scaffolding_horizontal"
@ -49,17 +45,6 @@ end
if minetest.get_modpath("mcl_doors") then if minetest.get_modpath("mcl_doors") then
if mcl_doors then if mcl_doors then
local top_door_tiles = {}
local bot_door_tiles = {}
if BROKEN_DOORS then
top_door_tiles = { "mcl_bamboo_door_top_alt.png", "mcl_bamboo_door_top.png" }
bot_door_tiles = { "mcl_bamboo_door_bottom_alt.png", "mcl_bamboo_door_bottom.png" }
else
top_door_tiles = { "mcl_bamboo_door_top.png", "mcl_bamboo_door_top.png" }
bot_door_tiles = { "mcl_bamboo_door_bottom.png", "mcl_bamboo_door_bottom.png" }
end
local name = "mcl_bamboo:bamboo_door" local name = "mcl_bamboo:bamboo_door"
local def = { local def = {
description = S("Bamboo Door"), description = S("Bamboo Door"),
@ -70,8 +55,8 @@ if minetest.get_modpath("mcl_doors") then
groups = { handy = 1, axey = 1, material_wood = 1, flammable = -1 }, groups = { handy = 1, axey = 1, material_wood = 1, flammable = -1 },
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
tiles_bottom = bot_door_tiles, tiles_bottom = "mcl_bamboo_door_bottom.png",
tiles_top = top_door_tiles, tiles_top = "mcl_bamboo_door_top.png",
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
} }

View File

@ -671,8 +671,8 @@ mcl_doors:register_door("mcl_crimson:crimson_door", {
groups = {handy=1,axey=1, material_wood=1, flammable=-1}, groups = {handy=1,axey=1, material_wood=1, flammable=-1},
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
tiles_bottom = {"mcl_crimson_crimson_door_bottom.png", "mcl_doors_door_crimson_side_lower.png"}, tiles_bottom = "mcl_crimson_crimson_door_bottom.png",
tiles_top = {"mcl_crimson_crimson_door_top.png", "mcl_doors_door_crimson_side_upper.png"}, tiles_top = "mcl_crimson_crimson_door_top.png",
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
}) })
@ -709,8 +709,8 @@ mcl_doors:register_door("mcl_crimson:warped_door", {
groups = {handy=1,axey=1, material_wood=1, flammable=-1}, groups = {handy=1,axey=1, material_wood=1, flammable=-1},
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
tiles_bottom = {"mcl_crimson_warped_door_bottom.png", "mcl_doors_door_warped_side_lower.png"}, tiles_bottom = "mcl_crimson_warped_door_bottom.png",
tiles_top = {"mcl_crimson_warped_door_top.png", "mcl_doors_door_warped_side_upper.png"}, tiles_top = "mcl_crimson_warped_door_top.png",
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
}) })

View File

@ -54,19 +54,11 @@ function mcl_doors:register_door(name, def)
def.sound_close = "doors_door_close" def.sound_close = "doors_door_close"
end end
local box = {{-8/16, -8/16, -8/16, 8/16, 8/16, -5/16}} if not def.node_box then
def.node_box = {{-8/16, -8/16, -8/16, 8/16, 8/16, -5/16}}
if not def.node_box_bottom then
def.node_box_bottom = box
end end
if not def.node_box_top then if not def.selection_box then
def.node_box_top = box def.selection_box = {{-8/16, -8/16, -8/16, 8/16, 8/16, -5/16}}
end
if not def.selection_box_bottom then
def.selection_box_bottom= box
end
if not def.selection_box_top then
def.selection_box_top = box
end end
local longdesc, usagehelp, tt_help local longdesc, usagehelp, tt_help
@ -159,7 +151,7 @@ function mcl_doors:register_door(name, def)
local door_dir = 1 local door_dir = 1
if left_node.name:sub(1, #name) == name then if left_node.name:sub(1, #name) == name then
mirrored = true mirrored = true
door_dir = 2 door_dir = 3
p2 = left_node.param2 p2 = left_node.param2
end end
@ -202,8 +194,22 @@ function mcl_doors:register_door(name, def)
end, end,
}) })
local tt = def.tiles_top local top_door_texture = def.tiles_top:match("(.+)%..+$") -- This removes the filename extension from the images.
local tb = def.tiles_bottom local bottom_door_texture = def.tiles_bottom:match("(.+)%..+$") -- This removes the filename extension from the images.
local texture_top = top_door_texture .. ".png"
local texture_bottom = bottom_door_texture .. ".png"
local texture_top_toppart = top_door_texture .. "_toppart.png" -- Special texture to make the top of opened doors not look weird.
local texture_bottom_bottompart = bottom_door_texture .. "_bottompart.png" -- Special texture to make the bottom of opened doors not look weird.
local texture_top_side = top_door_texture .. "_side.png" -- Special texture to make the side of opened doors not look weird.
local texture_bottom_side = bottom_door_texture .. "_side.png" -- Special texture to make the side of opened doors not look weird.
local texture_top_mirrored = texture_top .. "^[transformFX"
local texture_bottom_mirrored = texture_bottom .. "^[transformFX"
local texture_top_toppart_mirrored = texture_top_toppart .. "^[transformFX"
local texture_bottom_bottompart_mirrored = texture_bottom_bottompart .. "^[transformFX"
local texture_top_side_mirrored = texture_top_side .. "^[transformFX"
local texture_bottom_side_mirrored = texture_bottom_side .. "^[transformFX"
local function on_open_close(pos, dir, check_name, replace, replace_dir) local function on_open_close(pos, dir, check_name, replace, replace_dir)
local meta1 = minetest_get_meta(pos) local meta1 = minetest_get_meta(pos)
@ -242,16 +248,29 @@ function mcl_doors:register_door(name, def)
end end
local function on_mesecons_signal_open(pos, node) local function on_mesecons_signal_open(pos, node)
local meta2 = minetest_get_meta(pos)
if meta2:get_int("is_mirrored") ~= 1 then
on_open_close(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2") on_open_close(pos, 1, name.."_t_1", name.."_b_2", name.."_t_2")
else
on_open_close(pos, 1, name.."_t_3", name.."_b_4", name.."_t_4")
end end
end
local function on_mesecons_signal_close(pos, node) local function on_mesecons_signal_close(pos, node)
if not mesecon.is_powered({x=pos.x,y=pos.y+1,z=pos.z}) then if not mesecon.is_powered({x=pos.x,y=pos.y+1,z=pos.z}) then
local meta2 = minetest_get_meta(pos)
if meta2:get_int("is_mirrored") ~= 1 then
on_open_close(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1") on_open_close(pos, 1, name.."_t_2", name.."_b_1", name.."_t_1")
else
on_open_close(pos, 1, name.."_t_4", name.."_b_3", name.."_t_3")
end end
end end
end
local function on_mesecons_signal_open_top(pos, node) local function on_mesecons_signal_open_top(pos, node)
on_mesecons_signal_open({x=pos.x, y=pos.y-1, z=pos.z}, node) on_mesecons_signal_open({x=pos.x, y=pos.y-1, z=pos.z}, node)
end end
local function on_mesecons_signal_close_top(pos, node) local function on_mesecons_signal_close_top(pos, node)
if not mesecon.is_powered({x=pos.x,y=pos.y-1,z=pos.z}) then if not mesecon.is_powered({x=pos.x,y=pos.y-1,z=pos.z}) then
on_mesecons_signal_close({x=pos.x, y=pos.y-1, z=pos.z}, node) on_mesecons_signal_close({x=pos.x, y=pos.y-1, z=pos.z}, node)
@ -277,8 +296,8 @@ function mcl_doors:register_door(name, def)
end end
end end
minetest.register_node(name.."_b_1", { local template_def = {
tiles = {"blank.png", tt[2].."^[transformFXR90", tb[2], tb[2].."^[transformFX", tb[1], tb[1].."^[transformFX"}, tiles = nil,
use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true,
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
@ -288,18 +307,31 @@ function mcl_doors:register_door(name, def)
drawtype = "nodebox", drawtype = "nodebox",
node_box = { node_box = {
type = "fixed", type = "fixed",
fixed = def.node_box_bottom fixed = def.node_box
}, },
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = def.selection_box_bottom fixed = def.selection_box
}, },
groups = def.groups, groups = def.groups,
_mcl_hardness = def._mcl_hardness, _mcl_hardness = def._mcl_hardness,
_mcl_blast_resistance = def._mcl_blast_resistance, _mcl_blast_resistance = def._mcl_blast_resistance,
sounds = def.sounds, sounds = def.sounds,
after_destruct = function(bottom, oldnode) after_destruct = nil,
on_rightclick = nil,
mesecons = nil,
on_rotate = nil,
can_dig = check_player_priv,
}
local _b_1_def = table.copy(template_def)
_b_1_def.tiles = {"blank.png", texture_bottom_bottompart .. "^[transformFY", texture_bottom_side, texture_bottom_side_mirrored, texture_bottom_mirrored, texture_bottom}
_b_1_def.after_destruct = function(bottom, oldnode)
local meta_bottom = minetest_get_meta(bottom) local meta_bottom = minetest_get_meta(bottom)
if meta_bottom:get_int("rotation") == 1 then if meta_bottom:get_int("rotation") == 1 then
meta_bottom:set_int("rotation", 0) meta_bottom:set_int("rotation", 0)
@ -310,15 +342,12 @@ function mcl_doors:register_door(name, def)
minetest.remove_node(top) minetest.remove_node(top)
end end
end end
end, end
_b_1_def.on_rightclick = on_rightclick
on_rightclick = on_rightclick, _b_1_def.mesecons = { effector = {
mesecons = { effector = {
action_on = on_mesecons_signal_open, action_on = on_mesecons_signal_open,
}}, }}
_b_1_def.on_rotate = function(bottom, node, user, mode, param2)
on_rotate = function(bottom, node, user, mode, param2)
if mode == screwdriver.ROTATE_FACE then if mode == screwdriver.ROTATE_FACE then
local meta_bottom = minetest_get_meta(bottom) local meta_bottom = minetest_get_meta(bottom)
meta_bottom:set_int("rotation", 1) meta_bottom:set_int("rotation", 1)
@ -334,10 +363,9 @@ function mcl_doors:register_door(name, def)
return true return true
end end
return false return false
end, end
can_dig = check_player_priv, minetest.register_node(name.."_b_1", _b_1_def)
})
if def.only_redstone_can_open then if def.only_redstone_can_open then
on_rightclick = nil on_rightclick = nil
@ -349,29 +377,9 @@ function mcl_doors:register_door(name, def)
end end
end end
minetest.register_node(name.."_t_1", { local _t_1_def = table.copy(template_def)
tiles = {tt[2].."^[transformR90", "blank.png", tt[2], tt[2].."^[transformFX", tt[1], tt[1].."^[transformFX"}, _t_1_def.tiles = {texture_top_toppart .. "^[transformFY", "blank.png", texture_top_side, texture_top_side_mirrored, texture_top_mirrored, texture_top}
use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, _t_1_def.after_destruct = function(top, oldnode)
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
is_ground_content = false,
drop = "",
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = def.node_box_top
},
selection_box = {
type = "fixed",
fixed = def.selection_box_top
},
groups = def.groups,
_mcl_hardness = def._mcl_hardness,
_mcl_blast_resistance = def._mcl_blast_resistance,
sounds = def.sounds,
after_destruct = function(top, oldnode)
local meta_top = minetest_get_meta(top) local meta_top = minetest_get_meta(top)
if meta_top:get_int("rotation") == 1 then if meta_top:get_int("rotation") == 1 then
meta_top:set_int("rotation", 0) meta_top:set_int("rotation", 0)
@ -381,16 +389,13 @@ function mcl_doors:register_door(name, def)
minetest.dig_node(bottom) minetest.dig_node(bottom)
end end
end end
end, end
_t_1_def.on_rightclick = on_rightclick
on_rightclick = on_rightclick, _t_1_def.mesecons = { effector = {
mesecons = { effector = {
action_on = on_mesecons_signal_open_top, action_on = on_mesecons_signal_open_top,
rules = mesecon.rules.flat, rules = mesecon.rules.flat,
}}, }}
_t_1_def.on_rotate = function(top, node, user, mode, param2)
on_rotate = function(top, node, user, mode, param2)
if mode == screwdriver.ROTATE_FACE then if mode == screwdriver.ROTATE_FACE then
local meta_top = minetest_get_meta(top) local meta_top = minetest_get_meta(top)
meta_top:set_int("rotation", 1) meta_top:set_int("rotation", 1)
@ -406,10 +411,9 @@ function mcl_doors:register_door(name, def)
return true return true
end end
return false return false
end, end
can_dig = check_player_priv, minetest.register_node(name.."_t_1", _t_1_def)
})
if def.only_redstone_can_open then if def.only_redstone_can_open then
on_rightclick = nil on_rightclick = nil
@ -421,29 +425,9 @@ function mcl_doors:register_door(name, def)
end end
end end
minetest.register_node(name.."_b_2", { local _b_2_def = table.copy(template_def)
tiles = {"blank.png", tt[2].."^[transformFXR90", tb[2].."^[transformI", tb[2].."^[transformFX", tb[1].."^[transformFX", tb[1]}, _b_2_def.tiles = {"blank.png", texture_bottom_bottompart_mirrored, texture_bottom_side, texture_bottom_side, texture_bottom, texture_bottom_mirrored}
use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, _b_2_def.after_destruct = function(bottom, oldnode)
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
is_ground_content = false,
drop = "",
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = def.node_box_bottom
},
selection_box = {
type = "fixed",
fixed = def.selection_box_bottom
},
groups = def.groups,
_mcl_hardness = def._mcl_hardness,
_mcl_blast_resistance = def._mcl_blast_resistance,
sounds = def.sounds,
after_destruct = function(bottom, oldnode)
local meta_bottom = minetest_get_meta(bottom) local meta_bottom = minetest_get_meta(bottom)
if meta_bottom:get_int("rotation") == 1 then if meta_bottom:get_int("rotation") == 1 then
meta_bottom:set_int("rotation", 0) meta_bottom:set_int("rotation", 0)
@ -454,15 +438,12 @@ function mcl_doors:register_door(name, def)
minetest.remove_node(top) minetest.remove_node(top)
end end
end end
end, end
_b_2_def.on_rightclick = on_rightclick
on_rightclick = on_rightclick, _b_2_def.mesecons = { effector = {
mesecons = { effector = {
action_off = on_mesecons_signal_close, action_off = on_mesecons_signal_close,
}}, }}
_b_2_def.on_rotate = function(bottom, node, user, mode, param2)
on_rotate = function(bottom, node, user, mode, param2)
if mode == screwdriver.ROTATE_FACE then if mode == screwdriver.ROTATE_FACE then
local meta_bottom = minetest_get_meta(bottom) local meta_bottom = minetest_get_meta(bottom)
meta_bottom:set_int("rotation", 1) meta_bottom:set_int("rotation", 1)
@ -478,10 +459,9 @@ function mcl_doors:register_door(name, def)
return true return true
end end
return false return false
end, end
can_dig = check_player_priv, minetest.register_node(name.."_b_2", _b_2_def)
})
if def.only_redstone_can_open then if def.only_redstone_can_open then
on_rightclick = nil on_rightclick = nil
@ -493,29 +473,9 @@ function mcl_doors:register_door(name, def)
end end
end end
minetest.register_node(name.."_t_2", { local _t_2_def = table.copy(template_def)
tiles = {tt[2].."^[transformR90", "blank.png", tt[2].."^[transformI", tt[2].."^[transformFX", tt[1].."^[transformFX", tt[1]}, _t_2_def.tiles = {texture_top_toppart_mirrored, "blank.png", texture_top_side, texture_top_side, texture_top, texture_top_mirrored}
use_texture_alpha = minetest.features.use_texture_alpha_string_modes and "clip" or true, _t_2_def.after_destruct = function(top, oldnode)
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
is_ground_content = false,
drop = "",
drawtype = "nodebox",
node_box = {
type = "fixed",
fixed = def.node_box_top
},
selection_box = {
type = "fixed",
fixed = def.selection_box_top
},
groups = def.groups,
_mcl_hardness = def._mcl_hardness,
_mcl_blast_resistance = def._mcl_blast_resistance,
sounds = def.sounds,
after_destruct = function(top, oldnode)
local meta_top = minetest_get_meta(top) local meta_top = minetest_get_meta(top)
if meta_top:get_int("rotation") == 1 then if meta_top:get_int("rotation") == 1 then
meta_top:set_int("rotation", 0) meta_top:set_int("rotation", 0)
@ -525,16 +485,13 @@ function mcl_doors:register_door(name, def)
minetest.dig_node(bottom) minetest.dig_node(bottom)
end end
end end
end, end
_t_2_def.on_rightclick = on_rightclick
on_rightclick = on_rightclick, _t_2_def.mesecons = { effector = {
mesecons = { effector = {
action_off = on_mesecons_signal_close_top, action_off = on_mesecons_signal_close_top,
rules = mesecon.rules.flat, rules = mesecon.rules.flat,
}}, }}
_t_2_def.on_rotate = function(top, node, user, mode, param2)
on_rotate = function(top, node, user, mode, param2)
if mode == screwdriver.ROTATE_FACE then if mode == screwdriver.ROTATE_FACE then
local meta_top = minetest_get_meta(top) local meta_top = minetest_get_meta(top)
meta_top:set_int("rotation", 1) meta_top:set_int("rotation", 1)
@ -550,17 +507,210 @@ function mcl_doors:register_door(name, def)
return true return true
end end
return false return false
end, end
minetest.register_node(name.."_t_2", _t_2_def)
if not def.only_redstone_can_open then
on_rightclick = function(pos, node, clicker)
if check_player_priv(pos, clicker) then
on_open_close(pos, 1, name.."_t_3", name.."_b_4", name.."_t_4")
end
end
end
local _b_3_def = table.copy(template_def)
_b_3_def.tiles = {"blank.png", texture_bottom_mirrored .. "^[transformFY", texture_bottom_side, texture_bottom_side_mirrored, texture_bottom, texture_bottom_mirrored}
_b_3_def.after_destruct = function(bottom, oldnode)
local meta_bottom = minetest_get_meta(bottom)
if meta_bottom:get_int("rotation") == 1 then
meta_bottom:set_int("rotation", 0)
else
minetest.add_item(bottom, name)
local top = { x = bottom.x, y = bottom.y + 1, z = bottom.z }
if minetest.get_node(bottom).name ~= name.."_b_4" and minetest.get_node(top).name == name.."_t_3" then
minetest.remove_node(top)
end
end
end
_b_3_def.on_rightclick = on_rightclick
_b_3_def.mesecons = { effector = {
action_on = on_mesecons_signal_open,
}}
_b_3_def.on_rotate = function(bottom, node, user, mode, param2)
if mode == screwdriver.ROTATE_FACE then
local meta_bottom = minetest_get_meta(bottom)
meta_bottom:set_int("rotation", 1)
node.param2 = screwdriver.rotate.facedir(bottom, node, mode)
minetest.swap_node(bottom, node)
local top = {x=bottom.x,y=bottom.y+1,z=bottom.z}
local meta_top = minetest_get_meta(top)
meta_top:set_int("rotation", 1)
node.name = name .."_t_3"
minetest.swap_node(top, node)
return true
end
return false
end
minetest.register_node(name.."_b_3", _b_3_def)
if def.only_redstone_can_open then
on_rightclick = nil
else
on_rightclick = function(pos, node, clicker)
if check_player_priv(pos, clicker) then
on_open_close(pos, -1, name.."_b_3", name.."_t_4", name.."_b_4")
end
end
end
local _t_3_def = table.copy(template_def)
_t_3_def.tiles = {texture_top_toppart_mirrored .. "^[transformFY", "blank.png", texture_top_side, texture_top_side_mirrored, texture_top, texture_top_mirrored}
_t_3_def.after_destruct = function(top, oldnode)
local meta_top = minetest_get_meta(top)
if meta_top:get_int("rotation") == 1 then
meta_top:set_int("rotation", 0)
else
local bottom = { x = top.x, y = top.y - 1, z = top.z }
if minetest.get_node(top).name ~= name.."_t_4" and minetest.get_node(bottom).name == name.."_b_3" and oldnode.name == name.."_t_3" then
minetest.dig_node(bottom)
end
end
end
_t_3_def.on_rightclick = on_rightclick
_t_3_def.mesecons = { effector = {
action_on = on_mesecons_signal_open_top,
rules = mesecon.rules.flat,
}}
_t_3_def.on_rotate = function(top, node, user, mode, param2)
if mode == screwdriver.ROTATE_FACE then
local meta_top = minetest_get_meta(top)
meta_top:set_int("rotation", 1)
node.param2 = screwdriver.rotate.facedir(top, node, mode)
minetest.swap_node(top, node)
local bottom = {x=top.x,y=top.y-1,z=top.z}
local meta_bottom = minetest_get_meta(bottom)
meta_bottom:set_int("rotation", 1)
node.name = name .."_b_3"
minetest.swap_node(bottom, node)
return true
end
return false
end
minetest.register_node(name.."_t_3", _t_3_def)
if def.only_redstone_can_open then
on_rightclick = nil
else
on_rightclick = function(pos, node, clicker)
if check_player_priv(pos, clicker) then
on_open_close(pos, 1, name.."_t_4", name.."_b_3", name.."_t_3")
end
end
end
local _b_4_def = table.copy(template_def)
_b_4_def.tiles = {"blank.png", texture_bottom_bottompart, texture_bottom_side_mirrored, texture_bottom_side_mirrored, texture_bottom_mirrored, texture_bottom}
_b_4_def.after_destruct = function(bottom, oldnode)
local meta_bottom = minetest_get_meta(bottom)
if meta_bottom:get_int("rotation") == 1 then
meta_bottom:set_int("rotation", 0)
else
local top = { x = bottom.x, y = bottom.y + 1, z = bottom.z }
minetest.add_item(bottom, name)
if minetest.get_node(bottom).name ~= name.."_b_3" and minetest.get_node(top).name == name.."_t_4" then
minetest.remove_node(top)
end
end
end
_b_4_def.on_rightclick = on_rightclick
_b_4_def.mesecons = { effector = {
action_off = on_mesecons_signal_close,
}}
_b_4_def.on_rotate = function(bottom, node, user, mode, param2)
if mode == screwdriver.ROTATE_FACE then
local meta_bottom = minetest_get_meta(bottom)
meta_bottom:set_int("rotation", 1)
node.param2 = screwdriver.rotate.facedir(bottom, node, mode)
minetest.swap_node(bottom, node)
local top = {x=bottom.x,y=bottom.y+1,z=bottom.z}
local meta_top = minetest_get_meta(top)
meta_top:set_int("rotation", 1)
node.name = name .."_t_4"
minetest.swap_node(top, node)
return true
end
return false
end
minetest.register_node(name.."_b_4", _b_4_def)
if def.only_redstone_can_open then
on_rightclick = nil
else
on_rightclick = function(pos, node, clicker)
if check_player_priv(pos, clicker) then
on_open_close(pos, -1, name.."_b_4", name.."_t_3", name.."_b_3")
end
end
end
local _t_4_def = table.copy(template_def)
_t_4_def.tiles = {texture_top_toppart, "blank.png", texture_top_side_mirrored, texture_top_side_mirrored, texture_top_mirrored, texture_top}
_t_4_def.after_destruct = function(top, oldnode)
local meta_top = minetest_get_meta(top)
if meta_top:get_int("rotation") == 1 then
meta_top:set_int("rotation", 0)
else
local bottom = { x = top.x, y = top.y - 1, z = top.z }
if minetest.get_node(top).name ~= name.."_t_3" and minetest.get_node(bottom).name == name.."_b_4" and oldnode.name == name.."_t_4" then
minetest.dig_node(bottom)
end
end
end
_t_4_def.on_rightclick = on_rightclick
_t_4_def.mesecons = { effector = {
action_off = on_mesecons_signal_close_top,
rules = mesecon.rules.flat,
}}
_t_4_def.on_rotate = function(top, node, user, mode, param2)
if mode == screwdriver.ROTATE_FACE then
local meta_top = minetest_get_meta(top)
meta_top:set_int("rotation", 1)
node.param2 = screwdriver.rotate.facedir(top, node, mode)
minetest.swap_node(top, node)
local bottom = {x=top.x,y=top.y-1,z=top.z}
local meta_bottom = minetest_get_meta(bottom)
meta_bottom:set_int("rotation", 1)
node.name = name .."_b_4"
minetest.swap_node(bottom, node)
return true
end
return false
end
minetest.register_node(name.."_t_4", _t_4_def)
can_dig = check_player_priv,
})
-- Add entry aliases for the Help -- Add entry aliases for the Help
if minetest.get_modpath("doc") then if minetest.get_modpath("doc") then
doc.add_entry_alias("craftitems", name, "nodes", name.."_b_1") doc.add_entry_alias("craftitems", name, "nodes", name.."_b_1")
doc.add_entry_alias("craftitems", name, "nodes", name.."_b_2") doc.add_entry_alias("craftitems", name, "nodes", name.."_b_2")
doc.add_entry_alias("craftitems", name, "nodes", name.."_b_3")
doc.add_entry_alias("craftitems", name, "nodes", name.."_b_4")
doc.add_entry_alias("craftitems", name, "nodes", name.."_t_1") doc.add_entry_alias("craftitems", name, "nodes", name.."_t_1")
doc.add_entry_alias("craftitems", name, "nodes", name.."_t_2") doc.add_entry_alias("craftitems", name, "nodes", name.."_t_2")
doc.add_entry_alias("craftitems", name, "nodes", name.."_t_3")
doc.add_entry_alias("craftitems", name, "nodes", name.."_t_4")
end end
end end

View File

@ -14,8 +14,8 @@ mcl_doors:register_door("mcl_doors:wooden_door", {
groups = {handy=1,axey=1, material_wood=1, flammable=-1}, groups = {handy=1,axey=1, material_wood=1, flammable=-1},
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
tiles_bottom = {"mcl_doors_door_wood_lower.png", "mcl_doors_door_wood_side_lower.png"}, tiles_bottom = "mcl_doors_door_wood_lower.png",
tiles_top = {"mcl_doors_door_wood_upper.png", "mcl_doors_door_wood_side_upper.png"}, tiles_top = "mcl_doors_door_wood_upper.png",
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
}) })
@ -37,8 +37,8 @@ mcl_doors:register_door("mcl_doors:acacia_door", {
groups = {handy=1,axey=1, material_wood=1, flammable=-1}, groups = {handy=1,axey=1, material_wood=1, flammable=-1},
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
tiles_bottom = {"mcl_doors_door_acacia_lower.png", "mcl_doors_door_acacia_side_lower.png"}, tiles_bottom = "mcl_doors_door_acacia_lower.png",
tiles_top = {"mcl_doors_door_acacia_upper.png", "mcl_doors_door_acacia_side_upper.png"}, tiles_top = "mcl_doors_door_acacia_upper.png",
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
}) })
@ -60,8 +60,8 @@ mcl_doors:register_door("mcl_doors:birch_door", {
groups = {handy=1,axey=1, material_wood=1, flammable=-1}, groups = {handy=1,axey=1, material_wood=1, flammable=-1},
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
tiles_bottom = {"mcl_doors_door_birch_lower.png", "mcl_doors_door_birch_side_lower.png"}, tiles_bottom = "mcl_doors_door_birch_lower.png",
tiles_top = {"mcl_doors_door_birch_upper.png", "mcl_doors_door_birch_side_upper.png"}, tiles_top = "mcl_doors_door_birch_upper.png",
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
}) })
@ -83,8 +83,8 @@ mcl_doors:register_door("mcl_doors:dark_oak_door", {
groups = {handy=1,axey=1, material_wood=1, flammable=-1}, groups = {handy=1,axey=1, material_wood=1, flammable=-1},
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
tiles_bottom = {"mcl_doors_door_dark_oak_lower.png", "mcl_doors_door_dark_oak_side_lower.png"}, tiles_bottom = "mcl_doors_door_dark_oak_lower.png",
tiles_top = {"mcl_doors_door_dark_oak_upper.png", "mcl_doors_door_dark_oak_side_upper.png"}, tiles_top = "mcl_doors_door_dark_oak_upper.png",
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
}) })
@ -106,8 +106,8 @@ mcl_doors:register_door("mcl_doors:jungle_door", {
groups = {handy=1,axey=1, material_wood=1, flammable=-1}, groups = {handy=1,axey=1, material_wood=1, flammable=-1},
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
tiles_bottom = {"mcl_doors_door_jungle_lower.png", "mcl_doors_door_jungle_side_lower.png"}, tiles_bottom = "mcl_doors_door_jungle_lower.png",
tiles_top = {"mcl_doors_door_jungle_upper.png", "mcl_doors_door_jungle_side_upper.png"}, tiles_top = "mcl_doors_door_jungle_upper.png",
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
}) })
@ -129,8 +129,8 @@ mcl_doors:register_door("mcl_doors:spruce_door", {
groups = {handy=1,axey=1, material_wood=1, flammable=-1}, groups = {handy=1,axey=1, material_wood=1, flammable=-1},
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
tiles_bottom = {"mcl_doors_door_spruce_lower.png", "mcl_doors_door_spruce_side_lower.png"}, tiles_bottom = "mcl_doors_door_spruce_lower.png",
tiles_top = {"mcl_doors_door_spruce_upper.png", "mcl_doors_door_spruce_side_upper.png"}, tiles_top = "mcl_doors_door_spruce_upper.png",
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
}) })
@ -183,8 +183,8 @@ mcl_doors:register_door("mcl_doors:iron_door", {
groups = {pickaxey=1, mesecon_effector_on=1}, groups = {pickaxey=1, mesecon_effector_on=1},
_mcl_hardness = 5, _mcl_hardness = 5,
_mcl_blast_resistance = 5, _mcl_blast_resistance = 5,
tiles_bottom = {"mcl_doors_door_iron_lower.png^[transformFX", "mcl_doors_door_iron_side_lower.png"}, tiles_bottom = "mcl_doors_door_iron_lower.png",
tiles_top = {"mcl_doors_door_iron_upper.png^[transformFX", "mcl_doors_door_iron_side_upper.png"}, tiles_top = "mcl_doors_door_iron_upper.png",
sounds = mcl_sounds.node_sound_metal_defaults(), sounds = mcl_sounds.node_sound_metal_defaults(),
sound_open = "doors_steel_door_open", sound_open = "doors_steel_door_open",
sound_close = "doors_steel_door_close", sound_close = "doors_steel_door_close",

View File

@ -416,8 +416,8 @@ mcl_doors:register_door("mcl_mangrove:mangrove_door", {
groups = {handy=1,axey=1, material_wood=1, flammable=-1}, groups = {handy=1,axey=1, material_wood=1, flammable=-1},
_mcl_hardness = 3, _mcl_hardness = 3,
_mcl_blast_resistance = 3, _mcl_blast_resistance = 3,
tiles_bottom = {"mcl_mangrove_door_bottom.png", "mcl_doors_door_mangrove_side_lower.png"}, tiles_bottom = "mcl_mangrove_door_bottom.png",
tiles_top = {"mcl_mangrove_door_top.png", "mcl_doors_door_mangrove_side_upper.png"}, tiles_top = "mcl_mangrove_door_top.png",
sounds = mcl_sounds.node_sound_wood_defaults(), sounds = mcl_sounds.node_sound_wood_defaults(),
}) })

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

After

Width:  |  Height:  |  Size: 182 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 190 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 501 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 209 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 258 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 495 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 331 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 224 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 B

After

Width:  |  Height:  |  Size: 239 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 B

After

Width:  |  Height:  |  Size: 241 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 143 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 249 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 281 B

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 B

After

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 198 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 138 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 190 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 190 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 218 B

After

Width:  |  Height:  |  Size: 226 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 231 B

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 145 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 199 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 182 B

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 191 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 117 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 222 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 285 B

After

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 206 B

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 237 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 238 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 155 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 235 B

After

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 B

After

Width:  |  Height:  |  Size: 248 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 158 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 242 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 196 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 152 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 134 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 217 B

After

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 140 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 B

Some files were not shown because too many files have changed in this diff Show More