diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 6b0785e..9616bad 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -2221,6 +2221,10 @@ function default.chest.register_chest(name, d) local itemstack = player:get_wielded_item() local key_meta = itemstack:get_meta() + if itemstack:get_metadata() == "" then + return + end + if key_meta:get_string("secret") == "" then key_meta:set_string("secret", minetest.parse_json(itemstack:get_metadata()).secret) itemstack:set_metadata("") diff --git a/mods/default/textures/default_desert_cobble.png b/mods/default/textures/default_desert_cobble.png index 7c9fabb..fa1af5d 100644 Binary files a/mods/default/textures/default_desert_cobble.png and b/mods/default/textures/default_desert_cobble.png differ diff --git a/mods/default/textures/default_glass.png b/mods/default/textures/default_glass.png index da25402..74d6a02 100644 Binary files a/mods/default/textures/default_glass.png and b/mods/default/textures/default_glass.png differ diff --git a/mods/default/textures/default_glass_detail.png b/mods/default/textures/default_glass_detail.png index d38dbb7..811a4db 100644 Binary files a/mods/default/textures/default_glass_detail.png and b/mods/default/textures/default_glass_detail.png differ diff --git a/mods/default/tools.lua b/mods/default/tools.lua index 2a84f38..f442a89 100644 --- a/mods/default/tools.lua +++ b/mods/default/tools.lua @@ -4,9 +4,7 @@ minetest.register_item(":", { type = "none", wield_image = "wieldhand.png", - -- wield_scale = {x=1.5, y=2, z=1}, wield_scale = {x=1.3,y=1,z=5}, - -- wield_scale = {x=1,y=1,z=2.5}, tool_capabilities = { full_punch_interval = 0.9, max_drop_level = 0, diff --git a/mods/doors/textures/doors_door_glass.png b/mods/doors/textures/doors_door_glass.png index 26c427b..3c205dd 100644 Binary files a/mods/doors/textures/doors_door_glass.png and b/mods/doors/textures/doors_door_glass.png differ diff --git a/mods/doors/textures/doors_item_glass.png b/mods/doors/textures/doors_item_glass.png index 0ed6373..49a300f 100644 Binary files a/mods/doors/textures/doors_item_glass.png and b/mods/doors/textures/doors_item_glass.png differ diff --git a/mods/stairs/init.lua b/mods/stairs/init.lua index ced7af2..99db950 100644 --- a/mods/stairs/init.lua +++ b/mods/stairs/init.lua @@ -48,7 +48,8 @@ end -- Register stair -- Node will be called stairs:stair_ -function stairs.register_stair(subname, recipeitem, groups, images, description, sounds) +function stairs.register_stair(subname, recipeitem, groups, images, description, + sounds, worldaligntex) -- Set backface culling and world-aligned textures local stair_images = {} for i, image in ipairs(images) do @@ -56,14 +57,16 @@ function stairs.register_stair(subname, recipeitem, groups, images, description, stair_images[i] = { name = image, backface_culling = true, - align_style = "world", } + if worldaligntex then + stair_images[i].align_style = "world" + end else stair_images[i] = table.copy(image) if stair_images[i].backface_culling == nil then stair_images[i].backface_culling = true end - if stair_images[i].align_style == nil then + if worldaligntex and stair_images[i].align_style == nil then stair_images[i].align_style = "world" end end @@ -140,25 +143,24 @@ function stairs.register_stair(subname, recipeitem, groups, images, description, end --- Slab facedir to placement 6d matching table -local slab_trans_dir = {[0] = 8, 0, 2, 1, 3, 4} - - -- Register slab -- Node will be called stairs:slab_ -function stairs.register_slab(subname, recipeitem, groups, images, description, sounds) +function stairs.register_slab(subname, recipeitem, groups, images, description, + sounds, worldaligntex) -- Set world-aligned textures local slab_images = {} for i, image in ipairs(images) do if type(image) == "string" then slab_images[i] = { name = image, - align_style = "world", } + if worldaligntex then + slab_images[i].align_style = "world" + end else slab_images[i] = table.copy(image) - if image.align_style == nil then + if worldaligntex and image.align_style == nil then slab_images[i].align_style = "world" end end @@ -185,33 +187,13 @@ function stairs.register_slab(subname, recipeitem, groups, images, description, local creative_enabled = (creative and creative.is_enabled_for and creative.is_enabled_for(player_name)) - if under and under.name:find("stairs:slab_") then + if under and under.name:find("^stairs:slab_") then -- place slab using under node orientation local dir = minetest.dir_to_facedir(vector.subtract( pointed_thing.above, pointed_thing.under), true) local p2 = under.param2 - -- combine two slabs if possible - if slab_trans_dir[math.floor(p2 / 4)] == dir - and wield_item == under.name then - - if not recipeitem then - return itemstack - end - if minetest.is_protected(pointed_thing.under, player_name) and not - minetest.check_player_privs(player_name, "protection_bypass") then - minetest.record_protection_violation(pointed_thing.under, - player_name) - return - end - minetest.set_node(pointed_thing.under, {name = recipeitem, param2 = p2}) - if not creative_enabled then - itemstack:take_item() - end - return itemstack - end - -- Placing a slab on an upside down slab should make it right-side up. if p2 >= 20 and dir == 8 then p2 = p2 - 20 @@ -300,7 +282,8 @@ end -- Register inner stair -- Node will be called stairs:stair_inner_ -function stairs.register_stair_inner(subname, recipeitem, groups, images, description, sounds) +function stairs.register_stair_inner(subname, recipeitem, groups, images, + description, sounds, worldaligntex) -- Set backface culling and world-aligned textures local stair_images = {} for i, image in ipairs(images) do @@ -308,14 +291,16 @@ function stairs.register_stair_inner(subname, recipeitem, groups, images, descri stair_images[i] = { name = image, backface_culling = true, - align_style = "world", } + if worldaligntex then + stair_images[i].align_style = "world" + end else stair_images[i] = table.copy(image) if stair_images[i].backface_culling == nil then stair_images[i].backface_culling = true end - if stair_images[i].align_style == nil then + if worldaligntex and stair_images[i].align_style == nil then stair_images[i].align_style = "world" end end @@ -378,7 +363,8 @@ end -- Register outer stair -- Node will be called stairs:stair_outer_ -function stairs.register_stair_outer(subname, recipeitem, groups, images, description, sounds) +function stairs.register_stair_outer(subname, recipeitem, groups, images, + description, sounds, worldaligntex) -- Set backface culling and world-aligned textures local stair_images = {} for i, image in ipairs(images) do @@ -386,14 +372,16 @@ function stairs.register_stair_outer(subname, recipeitem, groups, images, descri stair_images[i] = { name = image, backface_culling = true, - align_style = "world", } + if worldaligntex then + stair_images[i].align_style = "world" + end else stair_images[i] = table.copy(image) if stair_images[i].backface_culling == nil then stair_images[i].backface_culling = true end - if stair_images[i].align_style == nil then + if worldaligntex and stair_images[i].align_style == nil then stair_images[i].align_style = "world" end end @@ -455,11 +443,16 @@ end -- Stair/slab registration function. -- Nodes will be called stairs:{stair,slab}_ -function stairs.register_stair_and_slab(subname, recipeitem, groups, images, desc_stair, desc_slab, sounds) - stairs.register_stair(subname, recipeitem, groups, images, desc_stair, sounds) - stairs.register_stair_inner(subname, recipeitem, groups, images, desc_stair, sounds) - stairs.register_stair_outer(subname, recipeitem, groups, images, desc_stair, sounds) - stairs.register_slab(subname, recipeitem, groups, images, desc_slab, sounds) +function stairs.register_stair_and_slab(subname, recipeitem, groups, images, + desc_stair, desc_slab, sounds, worldaligntex) + stairs.register_stair(subname, recipeitem, groups, images, desc_stair, + sounds, worldaligntex) + stairs.register_stair_inner(subname, recipeitem, groups, images, desc_stair, + sounds, worldaligntex) + stairs.register_stair_outer(subname, recipeitem, groups, images, desc_stair, + sounds, worldaligntex) + stairs.register_slab(subname, recipeitem, groups, images, desc_slab, + sounds, worldaligntex) end @@ -472,7 +465,8 @@ stairs.register_stair_and_slab( {"default_wood.png"}, "Wooden Stair", "Wooden Slab", - default.node_sound_wood_defaults() + default.node_sound_wood_defaults(), + false ) stairs.register_stair_and_slab( @@ -482,7 +476,8 @@ stairs.register_stair_and_slab( {"default_junglewood.png"}, "Jungle Wood Stair", "Jungle Wood Slab", - default.node_sound_wood_defaults() + default.node_sound_wood_defaults(), + false ) stairs.register_stair_and_slab( @@ -492,7 +487,8 @@ stairs.register_stair_and_slab( {"default_pine_wood.png"}, "Pine Wood Stair", "Pine Wood Slab", - default.node_sound_wood_defaults() + default.node_sound_wood_defaults(), + false ) stairs.register_stair_and_slab( @@ -502,7 +498,8 @@ stairs.register_stair_and_slab( {"default_acacia_wood.png"}, "Acacia Wood Stair", "Acacia Wood Slab", - default.node_sound_wood_defaults() + default.node_sound_wood_defaults(), + false ) stairs.register_stair_and_slab( @@ -512,7 +509,8 @@ stairs.register_stair_and_slab( {"default_aspen_wood.png"}, "Aspen Wood Stair", "Aspen Wood Slab", - default.node_sound_wood_defaults() + default.node_sound_wood_defaults(), + false ) stairs.register_stair_and_slab( @@ -522,7 +520,8 @@ stairs.register_stair_and_slab( {"default_stone.png"}, "Stone Stair", "Stone Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -532,7 +531,8 @@ stairs.register_stair_and_slab( {"default_cobble.png"}, "Cobblestone Stair", "Cobblestone Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -542,7 +542,8 @@ stairs.register_stair_and_slab( {"default_mossycobble.png"}, "Mossy Cobblestone Stair", "Mossy Cobblestone Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -552,7 +553,8 @@ stairs.register_stair_and_slab( {"default_stone_brick.png"}, "Stone Brick Stair", "Stone Brick Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + false ) stairs.register_stair_and_slab( @@ -562,7 +564,8 @@ stairs.register_stair_and_slab( {"default_stone_block.png"}, "Stone Block Stair", "Stone Block Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -572,7 +575,8 @@ stairs.register_stair_and_slab( {"default_desert_stone.png"}, "Desert Stone Stair", "Desert Stone Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -582,7 +586,8 @@ stairs.register_stair_and_slab( {"default_desert_cobble.png"}, "Desert Cobblestone Stair", "Desert Cobblestone Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -592,7 +597,8 @@ stairs.register_stair_and_slab( {"default_desert_stone_brick.png"}, "Desert Stone Brick Stair", "Desert Stone Brick Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + false ) stairs.register_stair_and_slab( @@ -602,7 +608,8 @@ stairs.register_stair_and_slab( {"default_desert_stone_block.png"}, "Desert Stone Block Stair", "Desert Stone Block Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -612,7 +619,8 @@ stairs.register_stair_and_slab( {"default_sandstone.png"}, "Sandstone Stair", "Sandstone Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -622,7 +630,8 @@ stairs.register_stair_and_slab( {"default_sandstone_brick.png"}, "Sandstone Brick Stair", "Sandstone Brick Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + false ) stairs.register_stair_and_slab( @@ -632,7 +641,8 @@ stairs.register_stair_and_slab( {"default_sandstone_block.png"}, "Sandstone Block Stair", "Sandstone Block Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -642,7 +652,8 @@ stairs.register_stair_and_slab( {"default_desert_sandstone.png"}, "Desert Sandstone Stair", "Desert Sandstone Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -652,7 +663,8 @@ stairs.register_stair_and_slab( {"default_desert_sandstone_brick.png"}, "Desert Sandstone Brick Stair", "Desert Sandstone Brick Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + false ) stairs.register_stair_and_slab( @@ -662,7 +674,8 @@ stairs.register_stair_and_slab( {"default_desert_sandstone_block.png"}, "Desert Sandstone Block Stair", "Desert Sandstone Block Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -672,7 +685,8 @@ stairs.register_stair_and_slab( {"default_silver_sandstone.png"}, "Silver Sandstone Stair", "Silver Sandstone Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -682,7 +696,8 @@ stairs.register_stair_and_slab( {"default_silver_sandstone_brick.png"}, "Silver Sandstone Brick Stair", "Silver Sandstone Brick Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + false ) stairs.register_stair_and_slab( @@ -692,7 +707,8 @@ stairs.register_stair_and_slab( {"default_silver_sandstone_block.png"}, "Silver Sandstone Block Stair", "Silver Sandstone Block Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -702,7 +718,8 @@ stairs.register_stair_and_slab( {"default_obsidian.png"}, "Obsidian Stair", "Obsidian Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -712,7 +729,8 @@ stairs.register_stair_and_slab( {"default_obsidian_brick.png"}, "Obsidian Brick Stair", "Obsidian Brick Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + false ) stairs.register_stair_and_slab( @@ -722,7 +740,8 @@ stairs.register_stair_and_slab( {"default_obsidian_block.png"}, "Obsidian Block Stair", "Obsidian Block Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + true ) stairs.register_stair_and_slab( @@ -732,7 +751,8 @@ stairs.register_stair_and_slab( {"default_brick.png"}, "Brick Stair", "Brick Slab", - default.node_sound_stone_defaults() + default.node_sound_stone_defaults(), + false ) stairs.register_stair_and_slab( @@ -742,7 +762,8 @@ stairs.register_stair_and_slab( {"default_steel_block.png"}, "Steel Block Stair", "Steel Block Slab", - default.node_sound_metal_defaults() + default.node_sound_metal_defaults(), + true ) stairs.register_stair_and_slab( @@ -752,7 +773,8 @@ stairs.register_stair_and_slab( {"default_tin_block.png"}, "Tin Block Stair", "Tin Block Slab", - default.node_sound_metal_defaults() + default.node_sound_metal_defaults(), + true ) stairs.register_stair_and_slab( @@ -762,7 +784,8 @@ stairs.register_stair_and_slab( {"default_copper_block.png"}, "Copper Block Stair", "Copper Block Slab", - default.node_sound_metal_defaults() + default.node_sound_metal_defaults(), + true ) stairs.register_stair_and_slab( @@ -772,7 +795,8 @@ stairs.register_stair_and_slab( {"default_bronze_block.png"}, "Bronze Block Stair", "Bronze Block Slab", - default.node_sound_metal_defaults() + default.node_sound_metal_defaults(), + true ) stairs.register_stair_and_slab( @@ -782,7 +806,8 @@ stairs.register_stair_and_slab( {"default_gold_block.png"}, "Gold Block Stair", "Gold Block Slab", - default.node_sound_metal_defaults() + default.node_sound_metal_defaults(), + true ) stairs.register_stair_and_slab( @@ -792,7 +817,8 @@ stairs.register_stair_and_slab( {"default_ice.png"}, "Ice Stair", "Ice Slab", - default.node_sound_glass_defaults() + default.node_sound_glass_defaults(), + true ) stairs.register_stair_and_slab( @@ -802,5 +828,100 @@ stairs.register_stair_and_slab( {"default_snow.png"}, "Snow Block Stair", "Snow Block Slab", - default.node_sound_snow_defaults() + default.node_sound_snow_defaults(), + true +) + +-- Glass stair nodes need to be registered individually to utilize specialized textures. + +stairs.register_stair( + "glass", + "default:glass", + {cracky = 3}, + {"stairs_glass_split.png", "default_glass.png", + "stairs_glass_stairside.png^[transformFX", "stairs_glass_stairside.png", + "default_glass.png", "stairs_glass_split.png"}, + "Glass Stair", + default.node_sound_glass_defaults(), + false +) + +stairs.register_slab( + "glass", + "default:glass", + {cracky = 3}, + {"default_glass.png", "default_glass.png", "stairs_glass_split.png"}, + "Glass Slab", + default.node_sound_glass_defaults(), + false +) + +stairs.register_stair_inner( + "glass", + "default:glass", + {cracky = 3}, + {"stairs_glass_stairside.png^[transformR270", "default_glass.png", + "stairs_glass_stairside.png^[transformFX", "default_glass.png", + "default_glass.png", "stairs_glass_stairside.png"}, + "Glass Inner Stair", + default.node_sound_glass_defaults(), + false +) + +stairs.register_stair_outer( + "glass", + "default:glass", + {cracky = 3}, + {"stairs_glass_stairside.png^[transformR90", "default_glass.png", + "stairs_glass_outer_stairside.png", "stairs_glass_stairside.png", + "stairs_glass_stairside.png^[transformR90","stairs_glass_outer_stairside.png"}, + "Glass Outer Stair", + default.node_sound_glass_defaults(), + false +) + +stairs.register_stair( + "obsidian_glass", + "default:obsidian_glass", + {cracky = 3}, + {"stairs_obsidian_glass_split.png", "default_obsidian_glass.png", + "stairs_obsidian_glass_stairside.png^[transformFX", "stairs_obsidian_glass_stairside.png", + "default_obsidian_glass.png", "stairs_obsidian_glass_split.png"}, + "Obsidian Glass Stair", + default.node_sound_glass_defaults(), + false +) + +stairs.register_slab( + "obsidian_glass", + "default:obsidian_glass", + {cracky = 3}, + {"default_obsidian_glass.png", "default_obsidian_glass.png", "stairs_obsidian_glass_split.png"}, + "Obsidian Glass Slab", + default.node_sound_glass_defaults(), + false +) + +stairs.register_stair_inner( + "obsidian_glass", + "default:obsidian_glass", + {cracky = 3}, + {"stairs_obsidian_glass_stairside.png^[transformR270", "default_obsidian_glass.png", + "stairs_obsidian_glass_stairside.png^[transformFX", "default_obsidian_glass.png", + "default_obsidian_glass.png", "stairs_obsidian_glass_stairside.png"}, + "Obsidian Glass Inner Stair", + default.node_sound_glass_defaults(), + false +) + +stairs.register_stair_outer( + "obsidian_glass", + "default:obsidian_glass", + {cracky = 3}, + {"stairs_obsidian_glass_stairside.png^[transformR90", "default_obsidian_glass.png", + "stairs_obsidian_glass_outer_stairside.png", "stairs_obsidian_glass_stairside.png", + "stairs_obsidian_glass_stairside.png^[transformR90","stairs_obsidian_glass_outer_stairside.png"}, + "Obsidian Glass Outer Stair", + default.node_sound_glass_defaults(), + false ) \ No newline at end of file diff --git a/mods/stairs/models/stairs_stair.obj b/mods/stairs/models/stairs_stair.obj deleted file mode 100644 index 198edf6..0000000 --- a/mods/stairs/models/stairs_stair.obj +++ /dev/null @@ -1,115 +0,0 @@ -# Blender v2.72 (sub 0) OBJ File: '' -# www.blender.org -mtllib stairs.mtl -o stairs_top -v -0.500000 0.000000 -0.500000 -v -0.500000 0.000000 0.000000 -v 0.500000 0.000000 0.000000 -v 0.500000 0.000000 -0.500000 -v -0.500000 0.500000 0.000000 -v 0.500000 0.500000 0.000000 -v -0.500000 0.500000 0.500000 -v 0.500000 0.500000 0.500000 -vt 0.000000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 0.500000 -vt 0.000000 0.500000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vn 0.000000 1.000000 0.000000 -g stairs_top -usemtl None -s off -f 4/1/1 1/2/1 2/3/1 3/4/1 -f 7/5/1 8/6/1 6/4/1 5/3/1 -o stairs_bottom -v -0.500000 -0.500000 -0.500000 -v 0.500000 -0.500000 -0.500000 -v -0.500000 -0.500000 0.500000 -v 0.500000 -0.500000 0.500000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vn 0.000000 -1.000000 -0.000000 -g stairs_bottom -usemtl None -s off -f 11/7/2 9/8/2 10/9/2 12/10/2 -o stairs_right -v -0.500000 0.000000 -0.500000 -v -0.500000 -0.500000 -0.500000 -v -0.500000 0.000000 0.000000 -v -0.500000 -0.500000 0.500000 -v -0.500000 0.500000 0.000000 -v -0.500000 0.500000 0.500000 -vt 0.000000 0.500000 -vt 0.000000 0.000000 -vt 0.500000 0.500000 -vt 1.000000 1.000000 -vt 0.500000 1.000000 -vt 1.000000 0.000000 -vn -1.000000 0.000000 0.000000 -g stairs_right -usemtl None -s off -f 13/11/3 14/12/3 15/13/3 -f 15/13/3 18/14/3 17/15/3 -f 14/12/3 16/16/3 15/13/3 -f 16/16/3 18/14/3 15/13/3 -o stairs_left -v 0.500000 0.000000 0.000000 -v 0.500000 -0.500000 -0.500000 -v 0.500000 0.000000 -0.500000 -v 0.500000 -0.500000 0.500000 -v 0.500000 0.500000 0.000000 -v 0.500000 0.500000 0.500000 -vt 0.500000 0.500000 -vt 1.000000 0.000000 -vt 1.000000 0.500000 -vt 0.500000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vn 1.000000 0.000000 0.000000 -g stairs_left -usemtl None -s off -f 19/17/4 20/18/4 21/19/4 -f 19/17/4 23/20/4 24/21/4 -f 20/18/4 19/17/4 22/22/4 -f 19/17/4 24/21/4 22/22/4 -o stairs_back -v -0.500000 -0.500000 0.500000 -v 0.500000 -0.500000 0.500000 -v -0.500000 0.500000 0.500000 -v 0.500000 0.500000 0.500000 -vt 1.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vt 0.000000 0.000000 -vn 0.000000 -0.000000 1.000000 -g stairs_back -usemtl None -s off -f 26/23/5 28/24/5 27/25/5 25/26/5 -o stairs_front -v -0.500000 0.000000 -0.500000 -v -0.500000 -0.500000 -0.500000 -v -0.500000 0.000000 0.000000 -v 0.500000 0.000000 0.000000 -v 0.500000 -0.500000 -0.500000 -v 0.500000 0.000000 -0.500000 -v -0.500000 0.500000 0.000000 -v 0.500000 0.500000 0.000000 -vt 1.000000 0.000000 -vt 1.000000 0.500000 -vt 0.000000 0.500000 -vt 0.000000 0.000000 -vt 1.000000 1.000000 -vt 0.000000 1.000000 -vn 0.000000 0.000000 -1.000000 -g stairs_front -usemtl None -s off -f 30/27/6 29/28/6 34/29/6 33/30/6 -f 31/28/6 35/31/6 36/32/6 32/29/6 diff --git a/mods/stairs/models/stairs_stair_inner.obj b/mods/stairs/models/stairs_stair_inner.obj deleted file mode 100644 index 5e4968e..0000000 --- a/mods/stairs/models/stairs_stair_inner.obj +++ /dev/null @@ -1,161 +0,0 @@ -# Blender v2.78 (sub 0) OBJ File: '' -# www.blender.org -mtllib stairs_inner_stair.mtl -o stairs_back_right_stairs_back.001 -v 0.500000 -0.500000 0.500000 -v 0.500000 0.500000 0.500000 -v -0.500000 0.500000 0.500000 -v -0.500000 -0.500000 0.500000 -vt 1.0000 0.0000 -vt 1.0000 1.0000 -vt 0.0000 1.0000 -vt 0.0000 0.0000 -vn 0.0000 -0.0000 1.0000 -usemtl None.001 -s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -o stairs_front_right_stairs_back.003 -v 0.000000 0.000000 -0.500000 -v 0.000000 0.000000 0.000000 -v 0.000000 0.500000 0.000000 -v 0.000000 0.500000 -0.500000 -v -0.500000 0.000000 -0.500000 -v -0.500000 -0.500000 -0.500000 -v -0.500000 0.000000 0.000000 -v -0.500000 0.500000 0.500000 -v -0.500000 0.500000 0.000000 -v -0.500000 -0.500000 0.500000 -vt 0.0000 0.5000 -vt 0.5000 0.5000 -vt 0.5000 1.0000 -vt 0.0000 1.0000 -vt 0.0000 0.5000 -vt 0.0000 0.0000 -vt 0.5000 0.5000 -vt 1.0000 1.0000 -vt 0.5000 1.0000 -vt 1.0000 0.0000 -vn -1.0000 0.0000 0.0000 -usemtl None -s 1 -f 5/5/2 6/6/2 7/7/2 8/8/2 -f 9/9/2 10/10/2 11/11/2 -f 11/11/2 12/12/2 13/13/2 -f 10/10/2 14/14/2 11/11/2 -f 14/14/2 12/12/2 11/11/2 -o stairs_bottom -v -0.500000 -0.500000 0.500000 -v -0.500000 -0.500000 -0.500000 -v 0.500000 -0.500000 -0.500000 -v 0.500000 -0.500000 0.500000 -vt 1.0000 0.0000 -vt 1.0000 1.0000 -vt 0.0000 1.0000 -vt 0.0000 0.0000 -vn 0.0000 -1.0000 -0.0000 -usemtl None -s 1 -f 15/15/3 16/16/3 17/17/3 18/18/3 -o stairs_front_left_stairs_front.002 -v -0.500000 0.000000 0.000000 -v -0.500000 0.500000 0.000000 -v 0.000000 0.500000 0.000000 -v 0.000000 0.000000 0.000000 -v -0.500000 -0.500000 -0.500000 -v -0.500000 0.000000 -0.500000 -v 0.500000 0.000000 -0.500000 -v 0.500000 -0.500000 -0.500000 -v 0.000000 0.000000 -0.500000 -v 0.000000 0.500000 -0.500000 -v 0.500000 0.500000 -0.500000 -v 0.500000 0.000000 -0.500000 -vt 1.0000 0.5000 -vt 1.0000 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.5000 -vt 1.0000 0.0000 -vt 1.0000 0.5000 -vt 0.0000 0.5000 -vt 0.0000 0.0000 -vt 0.5000 0.5000 -vt 0.5000 1.0000 -vt 0.0000 1.0000 -vt 0.0000 0.5000 -vn 0.0000 0.0000 -1.0000 -usemtl None -s 1 -f 19/19/4 20/20/4 21/21/4 22/22/4 -f 23/23/4 24/24/4 25/25/4 26/26/4 -f 27/27/4 28/28/4 29/29/4 30/30/4 -o stairs_top_stairs_top.001 -v 0.000000 0.000000 -0.500000 -v -0.500000 0.000000 -0.500000 -v -0.500000 0.000000 0.000000 -v 0.000000 0.000000 0.000000 -v 0.500000 0.500000 -0.500000 -v 0.000000 0.500000 -0.500000 -v 0.000000 0.500000 0.000000 -v 0.500000 0.500000 0.000000 -v -0.500000 0.500000 0.500000 -v 0.500000 0.500000 0.500000 -v 0.500000 0.500000 0.000000 -v -0.500000 0.500000 0.000000 -vt 0.5000 1.0000 -vt 0.0000 1.0000 -vt 0.0000 0.5000 -vt 0.5000 0.5000 -vt 1.0000 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.5000 -vt 1.0000 0.5000 -vt 0.0000 0.0000 -vt 1.0000 0.0000 -vt 1.0000 0.5000 -vt 0.0000 0.5000 -vn 0.0000 1.0000 0.0000 -usemtl None -s 1 -f 31/31/5 32/32/5 33/33/5 34/34/5 -f 35/35/5 36/36/5 37/37/5 38/38/5 -f 39/39/5 40/40/5 41/41/5 42/42/5 -o stairs_back_left_stairs_back.005 -v 0.500000 0.000000 -0.500000 -v 0.500000 0.500000 -0.500000 -v 0.500000 0.500000 0.000000 -v 0.500000 0.000000 0.000000 -v 0.500000 0.000000 0.000000 -v 0.500000 0.500000 0.000000 -v 0.500000 0.500000 0.500000 -v 0.500000 -0.000000 0.500000 -v 0.500000 -0.500000 -0.500000 -v 0.500000 0.000000 -0.500000 -v 0.500000 0.000000 0.000000 -v 0.500000 -0.500000 -0.000000 -v 0.500000 -0.500000 -0.000000 -v 0.500000 0.000000 0.000000 -v 0.500000 -0.000000 0.500000 -v 0.500000 -0.500000 0.500000 -vt 0.5000 0.5000 -vt 0.5000 1.0000 -vt 0.0000 1.0000 -vt 0.0000 0.5000 -vt 1.0000 0.0000 -vt 1.0000 0.5000 -vt 0.5000 0.5000 -vt 0.5000 0.0000 -vt 0.5000 0.0000 -vt 0.5000 0.5000 -vt 0.0000 0.5000 -vt 0.0000 0.0000 -vt 1.0000 0.5000 -vt 1.0000 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.5000 -vn 1.0000 0.0000 0.0000 -usemtl None -s 1 -f 47/43/6 48/44/6 49/45/6 50/46/6 -f 51/47/6 52/48/6 53/49/6 54/50/6 -f 55/51/6 56/52/6 57/53/6 58/54/6 -usemtl None.002 -f 43/55/6 44/56/6 45/57/6 46/58/6 diff --git a/mods/stairs/models/stairs_stair_outer.obj b/mods/stairs/models/stairs_stair_outer.obj deleted file mode 100644 index cc1975b..0000000 --- a/mods/stairs/models/stairs_stair_outer.obj +++ /dev/null @@ -1,136 +0,0 @@ -# Blender v2.78 (sub 0) OBJ File: '' -# www.blender.org -mtllib stairs_outer_stair.mtl -o stairs_bottom -v -0.500000 -0.500000 0.500000 -v -0.500000 -0.500000 -0.500000 -v 0.500000 -0.500000 -0.500000 -v 0.500000 -0.500000 0.500000 -vt 1.0000 0.0000 -vt 1.0000 1.0000 -vt 0.0000 1.0000 -vt 0.0000 0.0000 -vn 0.0000 -1.0000 -0.0000 -usemtl None -s 1 -f 1/1/1 2/2/1 3/3/1 4/4/1 -o stairs_back_left_stairs_left -v 0.500000 0.000000 0.000000 -v 0.500000 -0.500000 -0.500000 -v 0.500000 0.000000 -0.500000 -v 0.500000 0.500000 0.000000 -v 0.500000 0.500000 0.500000 -v 0.500000 -0.500000 0.500000 -vt 0.5000 0.5000 -vt 1.0000 0.0000 -vt 1.0000 0.5000 -vt 0.5000 1.0000 -vt 0.0000 1.0000 -vt 0.0000 0.0000 -vn 1.0000 0.0000 0.0000 -usemtl None -s 1 -f 5/5/2 6/6/2 7/7/2 -f 5/5/2 8/8/2 9/9/2 -f 6/6/2 5/5/2 10/10/2 -f 5/5/2 9/9/2 10/10/2 -o stairs_back_right_stairs_back -v 0.000000 -0.500000 0.500000 -v 0.000000 -0.000000 0.500000 -v -0.500000 -0.000000 0.500000 -v -0.500000 -0.500000 0.500000 -v 0.500000 -0.500000 0.500000 -v 0.500000 -0.000000 0.500000 -v 0.500000 0.500000 0.500000 -v 0.000000 0.500000 0.500000 -vt 0.5000 0.0000 -vt 0.5000 0.5000 -vt 0.0000 0.5000 -vt 0.0000 0.0000 -vt 1.0000 0.0000 -vt 1.0000 0.5000 -vt 1.0000 1.0000 -vt 0.5000 1.0000 -vn 0.0000 -0.0000 1.0000 -usemtl None -s 1 -f 11/11/3 12/12/3 13/13/3 14/14/3 -f 15/15/3 16/16/3 12/12/3 11/11/3 -f 16/16/3 17/17/3 18/18/3 12/12/3 -o stairs_top_stairs_top.001 -v 0.000000 0.500000 0.500000 -v 0.501689 0.500000 0.500000 -v 0.501689 0.500000 0.000000 -v 0.000000 0.500000 0.000000 -v -0.500000 -0.000000 0.500000 -v 0.001689 -0.000000 0.500000 -v 0.001689 0.000000 0.000000 -v -0.500000 0.000000 0.000000 -v 0.500000 0.000000 -0.500000 -v -0.500000 0.000000 -0.500000 -v -0.500000 0.000000 0.000000 -v 0.500000 0.000000 0.000000 -vt 0.5000 0.0000 -vt 1.0000 0.0000 -vt 1.0000 0.5000 -vt 0.5000 0.5000 -vt 0.0000 0.0000 -vt 0.5000 0.0000 -vt 0.5000 0.5000 -vt 0.0000 0.5000 -vt 1.0000 1.0000 -vt 0.0000 1.0000 -vt 0.0000 0.5000 -vt 1.0000 0.5000 -vn 0.0000 1.0000 0.0000 -usemtl None -s 1 -f 19/19/4 20/20/4 21/21/4 22/22/4 -usemtl None.004 -f 23/23/4 24/24/4 25/25/4 26/26/4 -f 27/27/4 28/28/4 29/29/4 30/30/4 -o stairs_front_left_stairs_front.000 -v -0.500000 -0.500000 -0.500000 -v -0.500000 0.000000 -0.500000 -v 0.500000 0.000000 -0.500000 -v 0.500000 -0.500000 -0.500000 -v 0.500000 0.500000 0.000000 -v 0.500000 0.000000 0.000000 -v 0.000000 0.000000 0.000000 -v 0.000000 0.500000 0.000000 -vt 1.0000 0.0000 -vt 1.0000 0.5000 -vt -0.0000 0.5000 -vt -0.0000 0.0000 -vt 0.5000 0.5000 -vt 0.5000 1.0000 -vt -0.0000 1.0000 -vt -0.0000 0.5000 -vn 0.0000 0.0000 -1.0000 -usemtl None.001 -s 1 -f 31/31/5 32/32/5 33/33/5 34/34/5 -usemtl None.003 -f 37/35/5 38/36/5 35/37/5 36/38/5 -o stairs_front_right_stairs_right.001_stairs_front_left_stairs_front.002 -v -0.500000 -0.500000 0.500000 -v -0.500000 0.000000 0.500000 -v -0.500000 0.000000 -0.500000 -v -0.500000 -0.500000 -0.500000 -v 0.000000 0.000000 0.500000 -v 0.000000 0.500000 0.500000 -v 0.000000 0.500000 -0.000000 -v -0.000000 0.000000 0.000000 -vt 1.0000 0.0000 -vt 1.0000 0.5021 -vt -0.0000 0.5021 -vt -0.0000 0.0000 -vt 1.0000 0.5021 -vt 1.0000 1.0000 -vt 0.5000 1.0000 -vt 0.5000 0.5021 -vn -1.0000 0.0000 0.0000 -usemtl None.002 -s 1 -f 39/39/6 40/40/6 41/41/6 42/42/6 -f 43/43/6 44/44/6 45/45/6 46/46/6 diff --git a/mods/stairs/textures/stairs_glass_outer_stairside.png b/mods/stairs/textures/stairs_glass_outer_stairside.png new file mode 100644 index 0000000..9b298c8 Binary files /dev/null and b/mods/stairs/textures/stairs_glass_outer_stairside.png differ diff --git a/mods/stairs/textures/stairs_glass_split.png b/mods/stairs/textures/stairs_glass_split.png new file mode 100644 index 0000000..6287959 Binary files /dev/null and b/mods/stairs/textures/stairs_glass_split.png differ diff --git a/mods/stairs/textures/stairs_glass_stairside.png b/mods/stairs/textures/stairs_glass_stairside.png new file mode 100644 index 0000000..c424294 Binary files /dev/null and b/mods/stairs/textures/stairs_glass_stairside.png differ diff --git a/mods/stairs/textures/stairs_obsidian_glass_outer_stairside.png b/mods/stairs/textures/stairs_obsidian_glass_outer_stairside.png new file mode 100644 index 0000000..979f11e Binary files /dev/null and b/mods/stairs/textures/stairs_obsidian_glass_outer_stairside.png differ diff --git a/mods/stairs/textures/stairs_obsidian_glass_split.png b/mods/stairs/textures/stairs_obsidian_glass_split.png new file mode 100644 index 0000000..7647b9b Binary files /dev/null and b/mods/stairs/textures/stairs_obsidian_glass_split.png differ diff --git a/mods/stairs/textures/stairs_obsidian_glass_stairside.png b/mods/stairs/textures/stairs_obsidian_glass_stairside.png new file mode 100644 index 0000000..a117cdd Binary files /dev/null and b/mods/stairs/textures/stairs_obsidian_glass_stairside.png differ diff --git a/mods/xpanes/textures/xpanes_edge.png b/mods/xpanes/textures/xpanes_edge.png index 92f78a1..5768d66 100644 Binary files a/mods/xpanes/textures/xpanes_edge.png and b/mods/xpanes/textures/xpanes_edge.png differ