diff --git a/mods/blocks/utility/mod.conf b/mods/blocks/utility/mod.conf index 631ca1f38..087157d05 100644 --- a/mods/blocks/utility/mod.conf +++ b/mods/blocks/utility/mod.conf @@ -1,2 +1,2 @@ name = utility -depends = voxelibre +depends = mcl_sounds, voxelibre diff --git a/mods/blocks/utility/models/utility_door.obj b/mods/blocks/utility/models/utility_door.obj index 07ba58850..2458d9c17 100644 --- a/mods/blocks/utility/models/utility_door.obj +++ b/mods/blocks/utility/models/utility_door.obj @@ -2,28 +2,29 @@ # www.blender.org mtllib utility_door.mtl o Cubo -v 0.500000 -0.500000 0.500000 -v 0.500000 1.500000 0.500000 -v -0.500000 -0.500000 0.500000 -v -0.500000 1.500000 0.500000 -v 0.500000 -0.500000 0.312500 -v 0.500000 1.500000 0.312500 -v -0.500000 -0.500000 0.312500 -v -0.500000 1.500000 0.312500 +v 0.500000 -0.500000 -0.312500 +v 0.500000 1.500000 -0.312500 +v -0.500000 -0.500000 -0.312500 +v -0.500000 1.500000 -0.312500 +v 0.500000 -0.500000 -0.500000 +v 0.500000 1.500000 -0.500000 +v -0.500000 -0.500000 -0.500000 +v -0.500000 1.500000 -0.500000 vn -0.0000 -0.0000 1.0000 vn -1.0000 -0.0000 -0.0000 vn -0.0000 -0.0000 -1.0000 vn 1.0000 -0.0000 -0.0000 vn -0.0000 -1.0000 -0.0000 vn -0.0000 1.0000 -0.0000 -vt 0.333333 0.000000 -vt 0.333333 1.000000 -vt 0.000000 1.000000 vt 0.000000 0.000000 +vt 0.000000 1.000000 +vt 0.333000 1.000000 +vt 0.333330 0.000000 vt 0.333333 1.000000 vt 0.333333 0.000000 vt 0.395833 0.000000 vt 0.395833 1.000000 +vt 0.333000 0.000000 vt 0.500000 1.000000 vt 0.500000 0.000000 vt 0.562500 0.000000 @@ -40,7 +41,7 @@ s 0 usemtl Materiais f 1/1/1 2/2/1 4/3/1 3/4/1 f 3/5/2 4/6/2 8/7/2 7/8/2 -f 7/1/3 8/2/3 6/3/3 5/4/3 -f 5/9/4 6/10/4 2/11/4 1/12/4 -f 3/13/5 7/14/5 5/15/5 1/16/5 -f 8/17/6 4/18/6 2/19/6 6/20/6 +f 7/1/3 8/2/3 6/3/3 5/9/3 +f 5/10/4 6/11/4 2/12/4 1/13/4 +f 3/14/5 7/15/5 5/16/5 1/17/5 +f 8/18/6 4/19/6 2/20/6 6/21/6 diff --git a/mods/blocks/utility/models/utility_door_left.obj b/mods/blocks/utility/models/utility_door_left.obj new file mode 100644 index 000000000..351e69407 --- /dev/null +++ b/mods/blocks/utility/models/utility_door_left.obj @@ -0,0 +1,46 @@ +# Blender 3.6.4 +# www.blender.org +mtllib utility_door_left.mtl +o Cubo +v -0.500000 -0.500000 -0.500000 +v -0.500000 1.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 1.500000 -0.500000 +v -0.500000 -0.500000 -0.312500 +v -0.500000 1.500000 -0.312500 +v 0.500000 -0.500000 -0.312500 +v 0.500000 1.500000 -0.312500 +vn -0.0000 -0.0000 -1.0000 +vn 1.0000 -0.0000 -0.0000 +vn -0.0000 -0.0000 1.0000 +vn -1.0000 -0.0000 -0.0000 +vn -0.0000 -1.0000 -0.0000 +vn -0.0000 1.0000 -0.0000 +vt 0.333333 0.000000 +vt 0.333333 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 0.333333 1.000000 +vt 0.333333 0.000000 +vt 0.395833 0.000000 +vt 0.395833 1.000000 +vt 0.500000 1.000000 +vt 0.500000 0.000000 +vt 0.562500 0.000000 +vt 0.562500 1.000000 +vt 0.833333 1.000000 +vt 0.895833 1.000000 +vt 0.895833 0.500000 +vt 0.833333 0.500000 +vt 0.729167 1.000000 +vt 0.666667 1.000000 +vt 0.666667 0.500000 +vt 0.729167 0.500000 +s 0 +usemtl Materiais +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/5/2 4/6/2 8/7/2 7/8/2 +f 7/1/3 8/2/3 6/3/3 5/4/3 +f 5/9/4 6/10/4 2/11/4 1/12/4 +f 3/13/5 7/14/5 5/15/5 1/16/5 +f 8/17/6 4/18/6 2/19/6 6/20/6 diff --git a/mods/blocks/utility/redstone.lua b/mods/blocks/utility/redstone.lua index 181800a66..b48c8ec48 100644 --- a/mods/blocks/utility/redstone.lua +++ b/mods/blocks/utility/redstone.lua @@ -1,7 +1,7 @@ local common_defs = { doors = { collision_box = { - fixed = {-0.5, -0.5, 0.3125, 0.5, 1.5, 0.5}, + fixed = {-0.5, -0.5, -0.3125, 0.5, 1.5, -0.5}, type = "fixed" }, drawtype = "mesh", @@ -10,7 +10,7 @@ local common_defs = { paramtype = "light", paramtype2 = "4dir", selection_box = { - fixed = {-0.5, -0.5, 0.3125, 0.5, 1.5, 0.5}, + fixed = {-0.5, -0.5, -0.3125, 0.5, 1.5, -0.5}, type = "fixed" }, sunlight_propagates = true, @@ -52,60 +52,83 @@ end local doors = { ["acacia"] = { - tiles = set_door_tiles("acacia", false, "building_acacia_planks.png"), + sounds = mcl_sounds.node_sound_wood_defaults(), + tiles = set_door_tiles("acacia", false, "building_acacia_planks.png") }, ["bamboo"] = { + sounds = mcl_sounds.node_sound_wood_defaults(), tiles = set_door_tiles("bamboo", false, "building_bamboo_planks.png") }, ["birch"] = { + sounds = mcl_sounds.node_sound_wood_defaults(), tiles = set_door_tiles("birch", true, nil), }, ["cherry"] = { + sounds = mcl_sounds.node_sound_wood_defaults(), tiles = set_door_tiles("cherry", false, "building_cherry_planks.png"), }, ["copper"] = { + sounds = mcl_sounds.node_sound_metal_defaults(), tiles = set_door_tiles("copper", false, "building_cut_copper.png") }, ["crimson"] = { + sounds = mcl_sounds.node_sound_wood_defaults(), tiles = set_door_tiles("crimson", false, "building_crimson_planks.png") }, ["dark_oak"] = { + sounds = mcl_sounds.node_sound_wood_defaults(), tiles = set_door_tiles("dark_oak", false, "building_dark_oak_planks.png") }, ["exposed_copper"] = { + sounds = mcl_sounds.node_sound_metal_defaults(), tiles = set_door_tiles("exposed_copper", false, "building_exposed_cut_copper.png") }, + ["iron"] = { + sounds = mcl_sounds.node_sound_metal_defaults(), + tiles = set_door_tiles("iron", false, "building_iron_block.png") + }, ["jungle"] = { + sounds = mcl_sounds.node_sound_wood_defaults(), tiles = set_door_tiles("jungle", true, nil) }, ["mangrove"] = { + sounds = mcl_sounds.node_sound_wood_defaults(), tiles = set_door_tiles("mangrove", false, "building_mangrove_planks.png") }, ["oak"] = { + sounds = mcl_sounds.node_sound_wood_defaults(), tiles = set_door_tiles("oak", false, "building_oak_planks.png") }, ["oxidized_copper"] = { + sounds = mcl_sounds.node_sound_metal_defaults(), tiles = set_door_tiles("oxidized_copper", false, "building_oxidized_cut_copper.png") }, ["spruce"] = { + sounds = mcl_sounds.node_sound_wood_defaults(), tiles = set_door_tiles("spruce", false, "building_spruce_planks.png") }, ["warped"] = { + sounds = mcl_sounds.node_sound_wood_defaults(), tiles = set_door_tiles("warped", false, "building_warped_planks.png") }, ["waxed_copper"] = { + sounds = mcl_sounds.node_sound_metal_defaults(), tiles = set_door_tiles("copper", false, "building_cut_copper.png") }, ["waxed_exposed_copper"] = { + sounds = mcl_sounds.node_sound_metal_defaults(), tiles = set_door_tiles("exposed_copper", false, "building_exposed_cut_copper.png") }, ["waxed_oxidized_copper"] = { + sounds = mcl_sounds.node_sound_metal_defaults(), tiles = set_door_tiles("oxidized_copper", false, "building_oxidized_cut_copper.png") }, ["waxed_weathered_copper"] = { + sounds = mcl_sounds.node_sound_metal_defaults(), tiles = set_door_tiles("weathered_copper", false, "building_weathered_cut_copper.png") }, ["weathered_copper"] = { + sounds = mcl_sounds.node_sound_metal_defaults(), tiles = set_door_tiles("weathered_copper", false, "building_weathered_cut_copper.png") } } @@ -115,3 +138,11 @@ for identifier, definitions in pairs(doors) do voxelibre.register_block(identifier.."_door", table.merge(common_defs.doors, definitions)) end + +for identifier, definitions in pairs(doors) do + definitions.mesh = "utility_door_left.obj" + + set_images(identifier, definitions) + + voxelibre.register_block(identifier.."_door_left", table.merge(common_defs.doors, definitions)) +end