Morik666
/
techages
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename stairs mod to mcl_stairs

This commit is contained in:
Wuzzy 2017-06-05 18:40:56 +02:00
parent b9a40f2b7f
commit 8daac96e58
26 changed files with 85 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mods/HELP/mcl_craftguide/init.lua
View File

@ -42,8 +42,8 @@ local group_stereotypes = {
water_bucket = "bucket:bucket_water",
flower = "mcl_flowers:dandelion",
mushroom = "mcl_mushrooms:mushroom_brown",
wood_slab = "stairs:slab_wood",
wood_stairs = "stairs:stairs_wood",
wood_slab = "mcl_stairs:slab_wood",
wood_stairs = "mcl_stairs:stairs_wood",
coal = "mcl_core:coal_lump",
shulker_box = "mcl_chests:violet_shulker_box",
quartz_block = "mcl_nether:quartz_block",

4
mods/ITEMS/REDSTONE/mesecons_delayer/init.lua
View File

@ -105,7 +105,7 @@ minetest.register_node("mesecons_delayer:delayer_off_"..tostring(i), {
drawtype = "nodebox",
tiles = {
"mesecons_delayer_off.png",
"stairs_stone_slab_top.png",
"mcl_stairs_stone_slab_top.png",
"mesecons_delayer_sides_off.png",
"mesecons_delayer_sides_off.png",
"mesecons_delayer_ends_off.png",
@ -166,7 +166,7 @@ minetest.register_node("mesecons_delayer:delayer_on_"..tostring(i), {
drawtype = "nodebox",
tiles = {
"mesecons_delayer_on.png",
"stairs_stone_slab_top.png",
"mcl_stairs_stone_slab_top.png",
"mesecons_delayer_sides_on.png",
"mesecons_delayer_sides_on.png",
"mesecons_delayer_ends_on.png",

8
mods/ITEMS/mcl_nether/init.lua
View File

@ -204,14 +204,6 @@ minetest.register_craft({
}
})
minetest.register_craft({
output = 'mcl_nether:quartz_chiseled 2',
recipe = {
{'stairs:slab_quartzblock'},
{'stairs:slab_quartzblock'},
}
})
minetest.register_craft({
output = 'mcl_nether:quartz_pillar 2',
recipe = {

3
mods/ITEMS/stairs/README.txt → mods/ITEMS/mcl_stairs/README.txt
View File

@ -1,5 +1,6 @@
Minetest Game mod: stairs
MineClone 2 mod: mcl_stairs
=========================
Forked from stairs mod in Minetest Game 0.4.16.
See license.txt for license information.
Authors of source code

0
mods/ITEMS/stairs/depends.txt → mods/ITEMS/mcl_stairs/depends.txt
View File

112
mods/ITEMS/stairs/init.lua → mods/ITEMS/mcl_stairs/init.lua
View File

@ -1,10 +1,10 @@
-- Minetest 0.4 mod: stairs
-- Minetest 0.4 mod: mcl_stairs
-- See README.txt for licensing and other information.
-- Global namespace for functions
stairs = {}
mcl_stairs = {}
local function place_slab_normal(itemstack, placer, pointed_thing)
local p0 = pointed_thing.under
@ -51,13 +51,13 @@ local function place_stair(itemstack, placer, pointed_thing)
return minetest.item_place(itemstack, placer, pointed_thing, param2)
end
-- Register stairs.
-- Node will be called stairs:stair_<subname>
-- Register mcl_stairs.
-- Node will be called mcl_stairs:stair_<subname>
function stairs.register_stair(subname, recipeitem, groups, images, description, sounds, hardness)
function mcl_stairs.register_stair(subname, recipeitem, groups, images, description, sounds, hardness)
groups.stair = 1
groups.building_block = 1
minetest.register_node(":stairs:stair_" .. subname, {
minetest.register_node(":mcl_stairs:stair_" .. subname, {
description = description,
_doc_items_longdesc = "Stairs are useful to reach higher places by walking over them; jumping is not required. Placing stairs in a corner pattern will create corner stairs. Stairs placed on the bottom or at the upper half of the side of a block will be placed upside down.",
drawtype = "mesh",
@ -95,7 +95,7 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
if recipeitem then
minetest.register_craft({
output = 'stairs:stair_' .. subname .. ' 4',
output = 'mcl_stairs:stair_' .. subname .. ' 4',
recipe = {
{recipeitem, "", ""},
{recipeitem, recipeitem, ""},
@ -105,7 +105,7 @@ function stairs.register_stair(subname, recipeitem, groups, images, description,
-- Flipped recipe
minetest.register_craft({
output = 'stairs:stair_' .. subname .. ' 4',
output = 'mcl_stairs:stair_' .. subname .. ' 4',
recipe = {
{"", "", recipeitem},
{"", recipeitem, recipeitem},
@ -120,12 +120,12 @@ end
local slab_trans_dir = {[0] = 8, 0, 2, 1, 3, 4}
-- Register slabs.
-- Node will be called stairs:slab_<subname>
-- Node will be called mcl_stairs:slab_<subname>
-- double_description: NEW argument, not supported in Minetest Game
-- double_description: Description of double slab
function stairs.register_slab(subname, recipeitem, groups, images, description, sounds, hardness, double_description)
local lower_slab = "stairs:slab_"..subname
function mcl_stairs.register_slab(subname, recipeitem, groups, images, description, sounds, hardness, double_description)
local lower_slab = "mcl_stairs:slab_"..subname
local upper_slab = lower_slab.."_top"
local double_slab = lower_slab.."_double"
@ -257,18 +257,18 @@ end
-- Stair/slab registration function.
-- Nodes will be called stairs:{stair,slab}_<subname>
-- Nodes will be called mcl_stairs:{stair,slab}_<subname>
function stairs.register_stair_and_slab(subname, recipeitem,
function mcl_stairs.register_stair_and_slab(subname, recipeitem,
groups, images, desc_stair, desc_slab, sounds, hardness,
double_description)
stairs.register_stair(subname, recipeitem, groups, images, desc_stair, sounds, hardness)
stairs.register_slab(subname, recipeitem, groups, images, desc_slab, sounds, hardness, double_description)
mcl_stairs.register_stair(subname, recipeitem, groups, images, desc_stair, sounds, hardness)
mcl_stairs.register_slab(subname, recipeitem, groups, images, desc_slab, sounds, hardness, double_description)
end
-- Very simple registration function
-- Makes stair and slab out of a source node
function stairs.register_stair_and_slab_simple(subname, sourcenode, desc_stair, desc_slab, desc_double_slab)
function mcl_stairs.register_stair_and_slab_simple(subname, sourcenode, desc_stair, desc_slab, desc_double_slab)
local def = minetest.registered_nodes[sourcenode]
local groups = {}
-- Only allow a strict set of groups to be added to stairs and slabs for more predictable results
@ -278,7 +278,7 @@ function stairs.register_stair_and_slab_simple(subname, sourcenode, desc_stair,
groups[allowed_groups[a]] = def.groups[allowed_groups[a]]
end
end
stairs.register_stair_and_slab(subname, sourcenode, groups, def.tiles, desc_stair, desc_slab, def.sounds, def._mcl_hardness, desc_double_slab)
mcl_stairs.register_stair_and_slab(subname, sourcenode, groups, def.tiles, desc_stair, desc_slab, def.sounds, def._mcl_hardness, desc_double_slab)
end
-- Register all Minecraft stairs and slabs
@ -286,13 +286,13 @@ end
-- slabs actually take slightly longer to be dug than their stair counterparts.
-- Note sure if it is a good idea to preserve this oddity.
stairs.register_stair("wood", "mcl_core:wood",
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)
stairs.register_slab("wood", "mcl_core:wood",
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",
@ -300,13 +300,13 @@ stairs.register_slab("wood", "mcl_core:wood",
2,
"Double Oak Wood Slab")
stairs.register_stair("junglewood", "mcl_core:junglewood",
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)
stairs.register_slab("junglewood", "mcl_core:junglewood",
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",
@ -314,14 +314,14 @@ stairs.register_slab("junglewood", "mcl_core:junglewood",
2,
"Double Jungle Wood Slab")
stairs.register_stair("acaciawood", "mcl_core:acaciawood",
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)
stairs.register_slab("acaciawood", "mcl_core:acaciawood",
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",
@ -329,13 +329,13 @@ stairs.register_slab("acaciawood", "mcl_core:acaciawood",
2,
"Double Acacia Wood Slab")
stairs.register_stair("sprucewood", "mcl_core:sprucewood",
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)
stairs.register_slab("sprucewood", "mcl_core:sprucewood",
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",
@ -343,13 +343,13 @@ stairs.register_slab("sprucewood", "mcl_core:sprucewood",
2,
"Double Spruce Wood Slab")
stairs.register_stair("birchwood", "mcl_core:birchwood",
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)
stairs.register_slab("birchwood", "mcl_core:birchwood",
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",
@ -357,13 +357,13 @@ stairs.register_slab("birchwood", "mcl_core:birchwood",
2,
"Double Birch Wood Slab")
stairs.register_stair("darkwood", "mcl_core:darkwood",
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)
stairs.register_slab("darkwood", "mcl_core:darkwood",
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",
@ -371,62 +371,62 @@ stairs.register_slab("darkwood", "mcl_core:darkwood",
2,
"Double Dark Oak Wood Slab")
stairs.register_slab("stone", "mcl_core:stone",
mcl_stairs.register_slab("stone", "mcl_core:stone",
{pickaxey=1, material_stone=1},
{"stairs_stone_slab_top.png", "stairs_stone_slab_top.png", "stairs_stone_slab_side.png"},
{"mcl_stairs_stone_slab_top.png", "mcl_stairs_stone_slab_top.png", "mcl_stairs_stone_slab_side.png"},
"Stone Slab",
mcl_sounds.node_sound_stone_defaults(), 2, "Double Stone Slab")
stairs.register_stair_and_slab_simple("cobble", "mcl_core:cobble", "Cobblestone Stairs", "Cobblestone Slab", nil, nil, "Double Cobblestone Slab")
mcl_stairs.register_stair_and_slab_simple("cobble", "mcl_core:cobble", "Cobblestone Stairs", "Cobblestone Slab", nil, nil, "Double Cobblestone Slab")
stairs.register_stair_and_slab_simple("brick_block", "mcl_core:brick_block", "Brick Stairs", "Brick Slab", nil, nil, "Double Brick Slab")
mcl_stairs.register_stair_and_slab_simple("brick_block", "mcl_core:brick_block", "Brick Stairs", "Brick Slab", nil, nil, "Double Brick Slab")
stairs.register_stair("sandstone", "group:sandstone",
mcl_stairs.register_stair("sandstone", "group:sandstone",
{pickaxey=1, material_stone=1},
{"mcl_core_sandstone_top.png", "mcl_core_sandstone_bottom.png", "mcl_core_sandstone_normal.png"},
"Sandstone Stairs",
mcl_sounds.node_sound_stone_defaults(), 0.8, nil, "mcl_core:sandstone")
stairs.register_slab("sandstone", "group:sandstone",
mcl_stairs.register_slab("sandstone", "group:sandstone",
{pickaxey=1, material_stone=1},
{"mcl_core_sandstone_top.png", "mcl_core_sandstone_bottom.png", "mcl_core_sandstone_normal.png"},
"Sandstone Slab",
mcl_sounds.node_sound_stone_defaults(), 2, "Double Sandstone Slab", "mcl_core:sandstone")
stairs.register_stair("redsandstone", "group:redsandstone",
mcl_stairs.register_stair("redsandstone", "group:redsandstone",
{pickaxey=1, material_stone=1},
{"mcl_core_red_sandstone_top.png", "mcl_core_red_sandstone_bottom.png", "mcl_core_red_sandstone_normal.png"},
"Red Sandstone Stairs",
mcl_sounds.node_sound_stone_defaults(), 0.8, nil, "mcl_core:redsandstone")
stairs.register_slab("redsandstone", "group:redsandstone",
mcl_stairs.register_slab("redsandstone", "group:redsandstone",
{pickaxey=1, material_stone=1},
{"mcl_core_red_sandstone_top.png", "mcl_core_red_sandstone_bottom.png", "mcl_core_red_sandstone_normal.png"},
"Red Sandstone Slab",
mcl_sounds.node_sound_stone_defaults(), 2, "Double Red Sandstone Slab", "mcl_core:redsandstone")
stairs.register_stair("stonebrick", "group:stonebrick",
mcl_stairs.register_stair("stonebrick", "group:stonebrick",
{pickaxey=1, material_stone=1},
{"default_stone_brick.png"},
"Stone Bricks Stairs",
mcl_sounds.node_sound_stone_defaults(), 1.5, nil, "mcl_core:stonebrick")
stairs.register_slab("stonebrick", "group:stonebrick",
mcl_stairs.register_slab("stonebrick", "group:stonebrick",
{pickaxey=1, material_stone=1},
{"default_stone_brick.png"},
"Stone Bricks Slab",
mcl_sounds.node_sound_stone_defaults(), 2, "Double Stone Bricks Slab", "mcl_core:stonebrick")
stairs.register_stair("quartzblock", "group:quartz_block",
mcl_stairs.register_stair("quartzblock", "group:quartz_block",
{pickaxey=1, material_stone=1},
{"mcl_nether_quartz_block_top.png", "mcl_nether_quartz_block_bottom.png", "mcl_nether_quartz_block_side.png"},
"Quartz Stairs",
mcl_sounds.node_sound_stone_defaults(), 0.8, nil, "mcl_nether:quartz_block")
stairs.register_slab("quartzblock", "group:quartz_block",
mcl_stairs.register_slab("quartzblock", "group:quartz_block",
{pickaxey=1, material_stone=1},
{"mcl_nether_quartz_block_top.png", "mcl_nether_quartz_block_bottom.png", "mcl_nether_quartz_block_side.png"},
"Quartz Slab",
mcl_sounds.node_sound_stone_defaults(), 2, "Double Quarzt Slab", "mcl_nether:quartz_block")
stairs.register_stair_and_slab("nether_brick", "mcl_nether:nether_brick",
mcl_stairs.register_stair_and_slab("nether_brick", "mcl_nether:nether_brick",
{pickaxey=1, material_stone=1},
{"mcl_nether_nether_brick.png"},
"Nether Brick Stairs",
@ -435,13 +435,13 @@ stairs.register_stair_and_slab("nether_brick", "mcl_nether:nether_brick",
2,
"Double Nether Brick Slab")
stairs.register_stair("purpur_block", "mcl_end:purpur_block",
mcl_stairs.register_stair("purpur_block", "mcl_end:purpur_block",
{pickaxey=1, material_stone=1},
{"mcl_end_purpur_block.png"},
"Purpur Stairs",
mcl_sounds.node_sound_stone_defaults(),
1.5)
stairs.register_slab("purpur_block", "mcl_end:purpur_block",
mcl_stairs.register_slab("purpur_block", "mcl_end:purpur_block",
{pickaxey=1, material_stone=1},
{"mcl_end_purpur_block.png"},
"Purpur Slab",
@ -452,32 +452,40 @@ stairs.register_slab("purpur_block", "mcl_end:purpur_block",
minetest.register_craft({
output = 'mcl_core:sandstonecarved',
recipe = {
{'stairs:slab_sandstone'},
{'stairs:slab_sandstone'}
{'mcl_stairs:slab_sandstone'},
{'mcl_stairs:slab_sandstone'}
}
})
minetest.register_craft({
output = 'mcl_core:redsandstonecarved',
recipe = {
{'stairs:slab_redsandstone'},
{'stairs:slab_redsandstone'}
{'mcl_stairs:slab_redsandstone'},
{'mcl_stairs:slab_redsandstone'}
}
})
minetest.register_craft({
output = 'mcl_core:stonebrickcarved',
recipe = {
{'stairs:slab_stonebrick'},
{'stairs:slab_stonebrick'}
{'mcl_stairs:slab_stonebrick'},
{'mcl_stairs:slab_stonebrick'}
}
})
minetest.register_craft({
output = 'mcl_end:purpur_pillar',
recipe = {
{'stairs:slab_purpur_block'},
{'stairs:slab_purpur_block'}
{'mcl_stairs:slab_purpur_block'},
{'mcl_stairs:slab_purpur_block'}
}
})
minetest.register_craft({
output = 'mcl_nether:quartz_chiseled 2',
recipe = {
{'mcl_stairs:slab_quartzblock'},
{'mcl_stairs:slab_quartzblock'},
}
})

0
mods/ITEMS/stairs/license.txt → mods/ITEMS/mcl_stairs/license.txt
View File

1
mods/ITEMS/mcl_stairs/mod.conf Normal file
View File

@ -0,0 +1 @@
name = mcl_stairs

0
mods/ITEMS/stairs/models/stairs_stair.obj → mods/ITEMS/mcl_stairs/models/stairs_stair.obj
View File

0
mods/ITEMS/stairs/textures/stairs_stone_slab_side.png → mods/ITEMS/mcl_stairs/textures/mcl_stairs_stone_slab_side.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 433 B

After

Width:  |  Height:  |  Size: 433 B

0
mods/ITEMS/stairs/textures/stairs_stone_slab_top.png → mods/ITEMS/mcl_stairs/textures/mcl_stairs_stone_slab_top.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 401 B

After

Width:  |  Height:  |  Size: 401 B

2
mods/ITEMS/mcstair/depends.txt
View File

@ -1,3 +1,3 @@
mcl_core
stairs
mcl_stairs
doc?

4
mods/ITEMS/mcstair/init.lua
View File

@ -658,7 +658,7 @@ for _,v in ipairs({
"darkwood"
}) do
local t = minetest.registered_nodes["mcl_core:"..v].tiles[1]
mcstair.add("stairs:stair_"..v, {
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)",
@ -682,5 +682,5 @@ for _,v in ipairs({
"purpur_block",
"nether_brick",
}) do
mcstair.add("stairs:stair_"..v)
mcstair.add("mcl_stairs:stair_"..v)
end

2
mods/ITEMS/minetest-3d_armor/3d_armor_stand/depends.txt
View File

@ -1,5 +1,5 @@
3d_armor
mcl_core
mcl_sounds
stairs
mcl_stairs
doc_identifier?

2
mods/ITEMS/minetest-3d_armor/3d_armor_stand/init.lua
View File

@ -226,7 +226,7 @@ minetest.register_craft({
recipe = {
{"mcl_core:stick", "mcl_core:stick", "mcl_core:stick"},
{"", "mcl_core:stick", ""},
{"mcl_core:stick", "stairs:slab_stone", "mcl_core:stick"},
{"mcl_core:stick", "mcl_stairs:slab_stone", "mcl_core:stick"},
}
})

2
mods/MAPGEN/mcl_mapgen_core/depends.txt
View File

@ -2,5 +2,5 @@ mcl_init
mcl_util
mcl_core
mcl_cocoas
stairs
mcl_stairs
mcl_structures

8
mods/MAPGEN/mcl_mapgen_core/init.lua
View File

@ -33,11 +33,11 @@ minetest.register_alias("mapgen_snow", "mcl_core:snow")
minetest.register_alias("mapgen_snowblock", "mcl_core:snowblock")
minetest.register_alias("mapgen_ice", "mcl_core:ice")
minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble")
minetest.register_alias("mapgen_stair_cobble", "mcl_stairs:stair_cobble")
minetest.register_alias("mapgen_sandstonebrick", "mcl_core:sandstonesmooth")
minetest.register_alias("mapgen_stair_sandstonebrick", "stairs:stair_sandstone")
minetest.register_alias("mapgen_stair_sandstone_block", "stairs:stair_sandstone")
minetest.register_alias("mapgen_stair_desert_stone", "stairs:stair_sandstone")
minetest.register_alias("mapgen_stair_sandstonebrick", "mcl_stairs:stair_sandstone")
minetest.register_alias("mapgen_stair_sandstone_block", "mcl_stairs:stair_sandstone")
minetest.register_alias("mapgen_stair_desert_stone", "mcl_stairs:stair_sandstone")
--
-- Ore generation

2
mods/MAPGEN/mcl_structures/build/desert_temple.we
View File

File diff suppressed because one or more lines are too long

BIN
mods/MAPGEN/mcl_structures/build/desert_well.mts
View File

Binary file not shown.

2
mods/MAPGEN/mcl_structures/build/pnj_house_1.we
View File

File diff suppressed because one or more lines are too long

2
mods/MAPGEN/mcl_structures/build/pnj_house_2.we
View File

File diff suppressed because one or more lines are too long

2
mods/MAPGEN/mcl_structures/build/pnj_house_3.we
View File

File diff suppressed because one or more lines are too long

2
mods/MAPGEN/mcl_structures/build/pnj_town_1.we
View File

File diff suppressed because one or more lines are too long

2
mods/MAPGEN/mcl_structures/build/pnj_town_withway_1.we
View File

File diff suppressed because one or more lines are too long

2
mods/MAPGEN/mcl_structures/build/witcher_house.we
View File

File diff suppressed because one or more lines are too long

2
mods/MAPGEN/mcl_structures/depends.txt
View File

@ -2,7 +2,7 @@ mcl_core
mcl_loot
xpanes
mcl_doors
stairs
mcl_stairs
mcl_colorblocks
mcl_wool
mcl_fences