From cf8415f87ae1414d0f6ec313e99fd6ba3c817d58 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 29 May 2018 13:25:25 +0200 Subject: [PATCH] Merge mcstair into mcl_stairs --- API.md | 2 +- mods/ITEMS/mcl_stairs/README.txt | 1 + mods/ITEMS/mcl_stairs/alias.lua | 2 +- mods/ITEMS/mcl_stairs/api.lua | 8 +- .../init.lua => mcl_stairs/cornerstair.lua} | 58 +++---- mods/ITEMS/mcl_stairs/init.lua | 1 + mods/ITEMS/mcl_stairs/register.lua | 146 ++++++++---------- .../textures/mcl_stairs_turntexture.png | Bin 0 -> 126 bytes mods/ITEMS/mclx_stairs/depends.txt | 1 - mods/ITEMS/mclx_stairs/init.lua | 18 --- mods/ITEMS/mcstair/README.md | 49 ------ mods/ITEMS/mcstair/depends.txt | 3 - mods/ITEMS/mcstair/description.txt | 1 - mods/ITEMS/mcstair/mod.conf | 1 - .../mcstair/textures/mcstair_turntexture.png | Bin 170 -> 0 bytes 15 files changed, 92 insertions(+), 199 deletions(-) rename mods/ITEMS/{mcstair/init.lua => mcl_stairs/cornerstair.lua} (95%) create mode 100644 mods/ITEMS/mcl_stairs/textures/mcl_stairs_turntexture.png delete mode 100644 mods/ITEMS/mcstair/README.md delete mode 100644 mods/ITEMS/mcstair/depends.txt delete mode 100644 mods/ITEMS/mcstair/description.txt delete mode 100644 mods/ITEMS/mcstair/mod.conf delete mode 100644 mods/ITEMS/mcstair/textures/mcstair_turntexture.png diff --git a/API.md b/API.md index c4e3b2299f..e4e312784a 100644 --- a/API.md +++ b/API.md @@ -62,7 +62,7 @@ API documnetation is included in `ENTITIES/mobs/api.txt`. The following APIs may be subject to change in future. You could already use these APIs but there will probably be breaking changes in the future, or the API is not as fleshed out as it should be. Use at your own risk! * Panes (like glass panes and iron bars): `ITEMS/xpanes` -* Slabs and stairs: `ITEM/mcl_stairs` **and** `ITEMS/mcstair` +* Slabs and stairs: `ITEM/mcl_stairs` * `_on_ignite` callback: `ITEMS/mcl_fire` * Farming: `ITEMS/mcl_farming` * Anything related to redstone: Don't touch (yet) diff --git a/mods/ITEMS/mcl_stairs/README.txt b/mods/ITEMS/mcl_stairs/README.txt index d336e4a225..9607b5d00a 100644 --- a/mods/ITEMS/mcl_stairs/README.txt +++ b/mods/ITEMS/mcl_stairs/README.txt @@ -15,3 +15,4 @@ Jean-Patrick G. (kilbith) (CC BY-SA 3.0): stairs_stair.obj + diff --git a/mods/ITEMS/mcl_stairs/alias.lua b/mods/ITEMS/mcl_stairs/alias.lua index 1b2d938419..1865b57792 100644 --- a/mods/ITEMS/mcl_stairs/alias.lua +++ b/mods/ITEMS/mcl_stairs/alias.lua @@ -11,7 +11,7 @@ for m=1, #materials do minetest.register_alias("stairs:slab_"..mat, "mcl_stairs:slab_"..mat) minetest.register_alias("stairs:stair_"..mat, "mcl_stairs:stair_"..mat) - -- mcstair + -- corner stairs minetest.register_alias("stairs:stair_"..mat.."_inner", "mcl_stairs:stair_"..mat.."_inner") minetest.register_alias("stairs:stair_"..mat.."_outer", "mcl_stairs:stair_"..mat.."_outer") end diff --git a/mods/ITEMS/mcl_stairs/api.lua b/mods/ITEMS/mcl_stairs/api.lua index 8dc65cc413..03d88d4822 100644 --- a/mods/ITEMS/mcl_stairs/api.lua +++ b/mods/ITEMS/mcl_stairs/api.lua @@ -1,3 +1,5 @@ +-- Core mcl_stairs API + -- Wrapper around mintest.pointed_thing_to_face_pos. local function get_fpos(placer, pointed_thing) local fpos @@ -74,10 +76,10 @@ local function place_stair(itemstack, placer, pointed_thing) return minetest.item_place(itemstack, placer, pointed_thing, param2) end --- Register mcl_stairs. +-- Register stairs. -- Node will be called mcl_stairs:stair_ -function mcl_stairs.register_stair(subname, recipeitem, groups, images, description, sounds, hardness) +function mcl_stairs.register_stair(subname, recipeitem, groups, images, description, sounds, hardness, corner_texture_override) groups.stair = 1 groups.building_block = 1 @@ -151,6 +153,8 @@ function mcl_stairs.register_stair(subname, recipeitem, groups, images, descript }, }) end + + mcl_stairs.cornerstair.add("mcl_stairs:stair_"..subname, corner_texture_override) end diff --git a/mods/ITEMS/mcstair/init.lua b/mods/ITEMS/mcl_stairs/cornerstair.lua similarity index 95% rename from mods/ITEMS/mcstair/init.lua rename to mods/ITEMS/mcl_stairs/cornerstair.lua index 2bf8f41fb9..100657ca8f 100644 --- a/mods/ITEMS/mcstair/init.lua +++ b/mods/ITEMS/mcl_stairs/cornerstair.lua @@ -1,4 +1,9 @@ -mcstair = {} +-- Corner stairs handling + +-- This code originally copied from the [mcstair] mod and merged into this mod. +-- This file is licensed under CC0. + +mcl_stairs.cornerstair = {} local get_stair_param = function(node) local stair = minetest.get_item_group(node.name, "stair") @@ -179,7 +184,19 @@ local stair_connect_to_param = function(connect, ceiling) return param end -function mcstair.add(name, stairtiles) +--[[ +mcl_stairs.cornerstair.add(name, stairtiles) + +* "name" is the name of the node to make corner stairs for. +* "stairtiles" is an optional table of tiles to override textures for inner and outer stairs. +* "stairtiles" format is: + + {tiles_def_for_outer_stair, tiles_def_for_inner_stair} + +Note: This function is called when you register a stair, no need to call it again! +]] + +function mcl_stairs.cornerstair.add(name, stairtiles) local node_def = minetest.registered_nodes[name] local outer_tiles local inner_tiles @@ -653,41 +670,4 @@ function mcstair.add(name, stairtiles) end end -for _,v in ipairs({ - "wood", - "junglewood", - "sprucewood", - "acaciawood", - "birchwood", - "darkwood" -}) do - local t = minetest.registered_nodes["mcl_core:"..v].tiles[1] - mcstair.add("mcl_stairs:stair_"..v, { - { - t.."^("..t.."^[transformR90^mcstair_turntexture.png^[makealpha:255,0,255)", - t.."^("..t.."^mcstair_turntexture.png^[transformR270^[makealpha:255,0,255)", - t - }, - { - t.."^("..t.."^[transformR90^(mcstair_turntexture.png^[transformR180)^[makealpha:255,0,255)", - t.."^("..t.."^[transformR270^(mcstair_turntexture.png^[transformR90)^[makealpha:255,0,255)", - t - } - }) -end -for _,v in ipairs({ - "cobble", - "brick_block", - "sandstone", - "redsandstone", - "stonebrick", - "quartzblock", - "purpur_block", - "nether_brick", - "prismarine", - "prismarine_brick", - "prismarine_dark", -}) do - mcstair.add("mcl_stairs:stair_"..v) -end diff --git a/mods/ITEMS/mcl_stairs/init.lua b/mods/ITEMS/mcl_stairs/init.lua index ca6f5755b2..a5ca820bf7 100644 --- a/mods/ITEMS/mcl_stairs/init.lua +++ b/mods/ITEMS/mcl_stairs/init.lua @@ -8,6 +8,7 @@ mcl_stairs = {} -- Load other files dofile(minetest.get_modpath("mcl_stairs").."/api.lua") +dofile(minetest.get_modpath("mcl_stairs").."/cornerstair.lua") dofile(minetest.get_modpath("mcl_stairs").."/register.lua") dofile(minetest.get_modpath("mcl_stairs").."/crafting.lua") dofile(minetest.get_modpath("mcl_stairs").."/alias.lua") diff --git a/mods/ITEMS/mcl_stairs/register.lua b/mods/ITEMS/mcl_stairs/register.lua index e61b4c1237..472afc3cfd 100644 --- a/mods/ITEMS/mcl_stairs/register.lua +++ b/mods/ITEMS/mcl_stairs/register.lua @@ -3,90 +3,47 @@ -- slabs actually take slightly longer to be dug than their stair counterparts. -- Note sure if it is a good idea to preserve this oddity. -mcl_stairs.register_stair("wood", "mcl_core:wood", - {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, - {"default_wood.png"}, - "Oak Wood Stairs", - mcl_sounds.node_sound_wood_defaults(), - 2) -mcl_stairs.register_slab("wood", "mcl_core:wood", - {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, - {"default_wood.png"}, - "Oak Wood Slab", - mcl_sounds.node_sound_wood_defaults(), - 2, - "Double Oak Wood Slab") +local function make_wood_corner_texture(subname) + local t = minetest.registered_nodes["mcl_core:"..subname].tiles[1] + return { + { + t.."^("..t.."^[transformR90^mcl_stairs_turntexture.png^[makealpha:255,0,255)", + t.."^("..t.."^mcl_stairs_turntexture.png^[transformR270^[makealpha:255,0,255)", + t + }, + { + t.."^("..t.."^[transformR90^(mcl_stairs_turntexture.png^[transformR180)^[makealpha:255,0,255)", + t.."^("..t.."^[transformR270^(mcl_stairs_turntexture.png^[transformR90)^[makealpha:255,0,255)", + t + } + } +end +local woods = { + { "wood", "default_wood.png", "Oak Wood Stairs", "Oak Wood Slab", "Double Oak Wood Slab" }, + { "junglewood", "default_junglewood.png", "Jungle Wood Stairs", "Jungle Wood Slab", "Double Jungle Wood Slab" }, + { "acaciawood", "default_acacia_wood.png", "Acacia Wood Stairs", "Acacia Wood Slab", "Double Acacia Wood Slab" }, + { "sprucewood", "mcl_core_planks_spruce.png", "Spruce Wood Stairs", "Spruce Wood Slab", "Double Spruce Wood Slab" }, + { "birchwood", "mcl_core_planks_birch.png", "Birch Wood Stairs", "Birch Wood Slab", "Double Birch Wood Slab" }, + { "darkwood", "mcl_core_planks_big_oak.png", "Dark Oak Wood Stairs", "Dark Oak Wood Slab", "Double Dark Oak Wood Slab" }, +} -mcl_stairs.register_stair("junglewood", "mcl_core:junglewood", - {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, - {"default_junglewood.png"}, - "Jungle Wood Stairs", - mcl_sounds.node_sound_wood_defaults(), - 2) -mcl_stairs.register_slab("junglewood", "mcl_core:junglewood", - {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, - {"default_junglewood.png"}, - "Jungle Wood Slab", - mcl_sounds.node_sound_wood_defaults(), - 2, - "Double Jungle Wood Slab") - -mcl_stairs.register_stair("acaciawood", "mcl_core:acaciawood", - {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, - {"default_acacia_wood.png"}, - "Acacia Wood Stairs", - mcl_sounds.node_sound_wood_defaults(), - 2) - -mcl_stairs.register_slab("acaciawood", "mcl_core:acaciawood", - {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, - {"default_acacia_wood.png"}, - "Acacia Wood Slab", - mcl_sounds.node_sound_wood_defaults(), - 2, - "Double Acacia Wood Slab") - -mcl_stairs.register_stair("sprucewood", "mcl_core:sprucewood", - {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, - {"mcl_core_planks_spruce.png"}, - "Spruce Wood Stairs", - mcl_sounds.node_sound_wood_defaults(), - 2) -mcl_stairs.register_slab("sprucewood", "mcl_core:sprucewood", - {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, - {"mcl_core_planks_spruce.png"}, - "Spruce Wood Slab", - mcl_sounds.node_sound_wood_defaults(), - 2, - "Double Spruce Wood Slab") - -mcl_stairs.register_stair("birchwood", "mcl_core:birchwood", - {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, - {"mcl_core_planks_birch.png"}, - "Birch Wood Stairs", - mcl_sounds.node_sound_wood_defaults(), - 2) -mcl_stairs.register_slab("birchwood", "mcl_core:birchwood", - {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, - {"mcl_core_planks_birch.png"}, - "Birch Wood Slab", - mcl_sounds.node_sound_wood_defaults(), - 2, - "Double Birch Wood Slab") - -mcl_stairs.register_stair("darkwood", "mcl_core:darkwood", - {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, - {"mcl_core_planks_big_oak.png"}, - "Dark Oak Wood Stairs", - mcl_sounds.node_sound_wood_defaults(), - 2) -mcl_stairs.register_slab("darkwood", "mcl_core:darkwood", - {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, - {"mcl_core_planks_big_oak.png"}, - "Dark Oak Wood Slab", - mcl_sounds.node_sound_wood_defaults(), - 2, - "Double Dark Oak Wood Slab") +for w=1, #woods do + local wood = woods[w] + mcl_stairs.register_stair(wood[1], "mcl_core:"..wood[1], + {handy=1,axey=1, flammable=3,wood_stairs=1, material_wood=1}, + {wood[2]}, + wood[3], + mcl_sounds.node_sound_wood_defaults(), + 2, + make_wood_corner_texture(wood[1])) + mcl_stairs.register_slab(wood[1], "mcl_core:"..wood[1], + {handy=1,axey=1, flammable=3,wood_slab=1, material_wood=1}, + {wood[2]}, + wood[4], + mcl_sounds.node_sound_wood_defaults(), + 2, + wood[5]) +end mcl_stairs.register_slab("stone", "mcl_core:stone", {pickaxey=1, material_stone=1}, @@ -171,3 +128,26 @@ mcl_stairs.register_stair_and_slab_simple("prismarine", "mcl_ocean:prismarine", mcl_stairs.register_stair_and_slab_simple("prismarine_brick", "mcl_ocean:prismarine_brick", "Prismarine Brick Stairs", "Prismarine Brick Slab", "Double Prismarine Brick Slab") mcl_stairs.register_stair_and_slab_simple("prismarine_dark", "mcl_ocean:prismarine_dark", "Dark Prismarine Stairs", "Dark Prismarine Slab", "Double Dark Prismarine Slab") + +for _,v in ipairs({ + "wood", + "junglewood", + "sprucewood", + "acaciawood", + "birchwood", + "darkwood" +}) do + local t = minetest.registered_nodes["mcl_core:"..v].tiles[1] + mcl_stairs.cornerstair.add("mcl_stairs:stair_"..v, { + { + t.."^("..t.."^[transformR90^mcl_stairs_turntexture.png^[makealpha:255,0,255)", + t.."^("..t.."^mcl_stairs_turntexture.png^[transformR270^[makealpha:255,0,255)", + t + }, + { + t.."^("..t.."^[transformR90^(mcl_stairs_turntexture.png^[transformR180)^[makealpha:255,0,255)", + t.."^("..t.."^[transformR270^(mcl_stairs_turntexture.png^[transformR90)^[makealpha:255,0,255)", + t + } + }) +end diff --git a/mods/ITEMS/mcl_stairs/textures/mcl_stairs_turntexture.png b/mods/ITEMS/mcl_stairs/textures/mcl_stairs_turntexture.png new file mode 100644 index 0000000000000000000000000000000000000000..d59ff892427ea2015a775f9b7561b56f81ce4493 GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9>wkv-K<4~qBA- literal 0 HcmV?d00001 diff --git a/mods/ITEMS/mclx_stairs/depends.txt b/mods/ITEMS/mclx_stairs/depends.txt index ade2a1d421..89eb864a69 100644 --- a/mods/ITEMS/mclx_stairs/depends.txt +++ b/mods/ITEMS/mclx_stairs/depends.txt @@ -5,4 +5,3 @@ mcl_nether mcl_end mcl_colorblocks mcl_stairs -mcstair diff --git a/mods/ITEMS/mclx_stairs/init.lua b/mods/ITEMS/mclx_stairs/init.lua index 3c6a7fd51d..05dfb27c47 100644 --- a/mods/ITEMS/mclx_stairs/init.lua +++ b/mods/ITEMS/mclx_stairs/init.lua @@ -1,55 +1,39 @@ mcl_stairs.register_stair_and_slab_simple("end_bricks", "mcl_end:end_bricks", "End Stone Brick Stairs", "End Stone Brick Slab", "Double End Stone Brick Slab") -mcstair.add("mcl_stairs:stair_end_bricks") mcl_stairs.register_stair_and_slab_simple("red_nether_brick", "mcl_nether:red_nether_brick", "Red Nether Brick Stairs", "Red Nether Brick Slab", "Double Red Nether Brick Slab") -mcstair.add("mcl_stairs:stair_red_nether_brick") mcl_stairs.register_stair_and_slab_simple("mossycobble", "mcl_core:mossycobble", "Moss Stone Stairs", "Moss Stone Slab", "Double Moss Stone Slab") -mcstair.add("mcl_stairs:stair_mossycobble") mcl_stairs.register_stair_and_slab_simple("tree_bark", "mcl_core:tree_bark", "Oak Bark Stairs", "Oak Bark Slab", "Double Oak Bark Slab") -mcstair.add("mcl_stairs:stair_tree_bark") mcl_stairs.register_stair_and_slab_simple("acaciatree_bark", "mcl_core:acaciatree_bark", "Acacia Bark Stairs", "Acacia Bark Slab", "Double Acacia Bark Slab") -mcstair.add("mcl_stairs:stair_acaciatree_bark") mcl_stairs.register_stair_and_slab_simple("sprucetree_bark", "mcl_core:sprucetree_bark", "Spruce Bark Stairs", "Spruce Bark Slab", "Double Spruce Bark Slab") -mcstair.add("mcl_stairs:stair_sprucetree_bark") mcl_stairs.register_stair_and_slab_simple("birchtree_bark", "mcl_core:birchtree_bark", "Birch Bark Stairs", "Birch Bark Slab", "Double Birch Bark Slab") -mcstair.add("mcl_stairs:stair_birchtree_bark") mcl_stairs.register_stair_and_slab_simple("jungletree_bark", "mcl_core:jungletree_bark", "Jungle Bark Stairs", "Jungle Bark Slab", "Double Jungle Bark Slab") -mcstair.add("mcl_stairs:stair_jungletree_bark") mcl_stairs.register_stair_and_slab_simple("darktree_bark", "mcl_core:darktree_bark", "Dark Oak Bark Stairs", "Dark Oak Bark Slab", "Double Dark Oak Bark Slab") -mcstair.add("mcl_stairs:stair_darktree_bark") mcl_stairs.register_slab("lapisblock", "mcl_core:lapisblock", {pickaxey=3}, {"mcl_core_lapis_block.png", "mcl_core_lapis_block.png", "mcl_stairs_lapis_block_slab.png"}, "Lapis Lazuli Slab", nil, nil, "Double Lapis Lazuli Slab") mcl_stairs.register_stair("lapisblock", "mcl_core:lapisblock", {pickaxey=3}, {"mcl_stairs_lapis_block_slab.png", "mcl_core_lapis_block.png", "mcl_core_lapis_block.png", "mcl_core_lapis_block.png", "mcl_core_lapis_block.png", "mcl_stairs_lapis_block_slab.png"}, "Lapis Lazuli Stair") -mcstair.add("mcl_stairs:stair_lapisblock") mcl_stairs.register_slab("goldblock", "mcl_core:goldblock", {pickaxey=4}, {"default_gold_block.png", "default_gold_block.png", "mcl_stairs_gold_block_slab.png"}, "Slab of Gold", nil, nil, "Double Slab of Gold") mcl_stairs.register_stair("goldblock", "mcl_core:goldblock", {pickaxey=4}, {"mcl_stairs_gold_block_slab.png", "default_gold_block.png", "default_gold_block.png", "default_gold_block.png", "default_gold_block.png", "mcl_stairs_gold_block_slab.png"}, "Stair of Gold") -mcstair.add("mcl_stairs:stair_goldblock") mcl_stairs.register_slab("ironblock", "mcl_core:ironblock", {pickaxey=2}, {"default_steel_block.png", "default_steel_block.png", "mcl_stairs_iron_block_slab.png"}, "Slab of Iron", nil, nil, "Double Slab of Iron") mcl_stairs.register_stair("ironblock", "mcl_core:ironblock", {pickaxey=2}, {"mcl_stairs_iron_block_slab.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "default_steel_block.png", "mcl_stairs_iron_block_slab.png"}, "Stair of Iron") -mcstair.add("mcl_stairs:stair_ironblock") mcl_stairs.register_slab("andesite_smooth", "mcl_core:andesite_smooth", {pickaxey=1}, {"mcl_core_andesite_smooth.png", "mcl_core_andesite_smooth.png", "mcl_stairs_andesite_smooth_slab.png"}, "Polished Andesite Slab", nil, nil, "Double Polished Andesite Slab") mcl_stairs.register_stair("andesite_smooth", "mcl_core:andesite_smooth", {pickaxey=1}, {"mcl_stairs_andesite_smooth_slab.png", "mcl_core_andesite_smooth.png", "mcl_core_andesite_smooth.png", "mcl_core_andesite_smooth.png", "mcl_core_andesite_smooth.png", "mcl_stairs_andesite_smooth_slab.png"}, "Polished Andesite Stair") -mcstair.add("mcl_stairs:stair_andesite_smooth") mcl_stairs.register_slab("granite_smooth", "mcl_core:granite_smooth", {pickaxey=1}, {"mcl_core_granite_smooth.png", "mcl_core_granite_smooth.png", "mcl_stairs_granite_smooth_slab.png"}, "Polished Granite Slab", nil, nil, "Double Polished Granite Slab") mcl_stairs.register_stair("granite_smooth", "mcl_core:granite_smooth", {pickaxey=1}, {"mcl_stairs_granite_smooth_slab.png", "mcl_core_granite_smooth.png", "mcl_core_granite_smooth.png", "mcl_core_granite_smooth.png", "mcl_core_granite_smooth.png", "mcl_stairs_granite_smooth_slab.png"}, "Polished Granite Stair") -mcstair.add("mcl_stairs:stair_granite_smooth") mcl_stairs.register_slab("diorite_smooth", "mcl_core:diorite_smooth", {pickaxey=1}, {"mcl_core_diorite_smooth.png", "mcl_core_diorite_smooth.png", "mcl_stairs_diorite_smooth_slab.png"}, "Polished Diorite Slab", nil, nil, "Double Polished Diorite Slab") mcl_stairs.register_stair("diorite_smooth", "mcl_core:diorite_smooth", {pickaxey=1}, {"mcl_stairs_diorite_smooth_slab.png", "mcl_core_diorite_smooth.png", "mcl_core_diorite_smooth.png", "mcl_core_diorite_smooth.png", "mcl_core_diorite_smooth.png", "mcl_stairs_diorite_smooth_slab.png"}, "Polished Diorite Stair") -mcstair.add("mcl_stairs:stair_diorite_smooth") mcl_stairs.register_stair("stonebrickmossy", "mcl_core:stonebrickmossy", {pickaxey=1}, {"mcl_core_stonebrick_mossy.png"}, "Mossy Stone Brick Stairs", mcl_sounds.node_sound_stone_defaults(), 1.5, nil, "mcl_core:stonebrickmossy") -mcstair.add("mcl_stairs:stair_stonebrickmossy") mcl_stairs.register_slab("stonebrickmossy", "mcl_core:stonebrickmossy", {pickaxey=1}, @@ -62,7 +46,6 @@ mcl_stairs.register_stair("stonebrickcracked", "mcl_core:stonebrickcracked", {"mcl_core_stonebrick_cracked.png"}, "Cracked Stone Brick Stairs", mcl_sounds.node_sound_stone_defaults(), 1.5, nil, "mcl_core:stonebrickcracked") -mcstair.add("mcl_stairs:stair_stonebrickcracked") mcl_stairs.register_slab("stonebrickcracked", "mcl_core:stonebrickcracked", {pickaxey=1}, @@ -96,6 +79,5 @@ for i=1, #block.dyes do block.dyes[i][2].." Concrete Stairs", block.dyes[i][2].." Concrete Slab", "Double "..block.dyes[i][2].." Concrete Slab") - mcstair.add("mcl_stairs:stair_concrete_"..c) end diff --git a/mods/ITEMS/mcstair/README.md b/mods/ITEMS/mcstair/README.md deleted file mode 100644 index f2b2843977..0000000000 --- a/mods/ITEMS/mcstair/README.md +++ /dev/null @@ -1,49 +0,0 @@ -mcstair v1.0 - -Minecraft like corner stairs. - -License for all of this mod is "CC0", see below. - -```txt -CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER. - -Statement of Purpose -The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work"). -Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others. -For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights. - -1. Copyright and Related Rights. A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following: - i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work; - ii. moral rights retained by the original author(s) and/or performer(s); - iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work; - iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below; - v. rights protecting the extraction, dissemination, use and reuse of data in a Work; - vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and - vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof. - -2. Waiver. To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose. - -3. Public License Fallback. Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose. - -4. Limitations and Disclaimers. - a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document. - b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law. - c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work. - d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work. -``` - -mod api: - -```lua -mcstair.add(name, stairtiles) -``` - -"name" is the name of the node to make corner stairs for. - -"stairtiles" is an optional table of tiles to override textures for inner and outer stairs. - -"stairtiles" format is... - -```lua -{tiles_def_for_outer_stair, tiles_def_for_inner_stair} -``` diff --git a/mods/ITEMS/mcstair/depends.txt b/mods/ITEMS/mcstair/depends.txt deleted file mode 100644 index dd0b3ab4bf..0000000000 --- a/mods/ITEMS/mcstair/depends.txt +++ /dev/null @@ -1,3 +0,0 @@ -mcl_core -mcl_stairs -doc? diff --git a/mods/ITEMS/mcstair/description.txt b/mods/ITEMS/mcstair/description.txt deleted file mode 100644 index 382c480791..0000000000 --- a/mods/ITEMS/mcstair/description.txt +++ /dev/null @@ -1 +0,0 @@ -Minecraft like corner stairs. \ No newline at end of file diff --git a/mods/ITEMS/mcstair/mod.conf b/mods/ITEMS/mcstair/mod.conf deleted file mode 100644 index c0546d6d03..0000000000 --- a/mods/ITEMS/mcstair/mod.conf +++ /dev/null @@ -1 +0,0 @@ -name = mcstair diff --git a/mods/ITEMS/mcstair/textures/mcstair_turntexture.png b/mods/ITEMS/mcstair/textures/mcstair_turntexture.png deleted file mode 100644 index 6a2e8db131e211493efdba742269ff2244a1e47d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9E0F%r@Zaoj(t03^u_VYZ zn8D%MjWi&Kv%n*=n1O*?7=#%aX3dcR3bL1Y`ns||WaJT$Vp6F;!vPf1@^onYg32%Qv!ZTU?W%gkyyTVWZ{GW&RX|+~p00i_ I>zopr054-L;s5{u