From fd8dabdbf4bc964582f3e3507563408dbf38f471 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Thu, 15 Jan 2015 19:12:20 +0100 Subject: [PATCH] Moreblocks' update - Moreblocks' update to use last version's nodes and features --- mods/moreblocks/{LICENSE.txt => LICENSE.md} | 7 +- mods/moreblocks/README.md | 11 + mods/moreblocks/README.txt | 12 - mods/moreblocks/aliases.lua | 21 +- mods/moreblocks/circular_saw.lua | 10 +- mods/moreblocks/config.lua | 7 + mods/moreblocks/crafting.lua | 7 +- mods/moreblocks/depends.txt | 4 +- mods/moreblocks/init.lua | 23 +- mods/moreblocks/locale/de.txt | 0 mods/moreblocks/locale/es.txt | 0 mods/moreblocks/locale/fr.txt | 0 mods/moreblocks/locale/template.txt | 0 mods/moreblocks/models/moreblocks_slope.obj | 21 + .../models/moreblocks_slope_half.obj | 23 + .../models/moreblocks_slope_half_raised.obj | 26 + .../models/moreblocks_slope_inner.obj | 26 + .../models/moreblocks_slope_inner_half.obj | 28 ++ .../moreblocks_slope_inner_half_raised.obj | 31 ++ .../models/moreblocks_slope_outer.obj | 18 + .../models/moreblocks_slope_outer_cut.obj | 19 + .../moreblocks_slope_outer_cut_half.obj | 20 + ...moreblocks_slope_outer_cut_half_raised.obj | 23 + .../models/moreblocks_slope_outer_half.obj | 22 + .../moreblocks_slope_outer_half_raised.obj | 27 ++ mods/moreblocks/nodes.lua | 14 +- mods/moreblocks/ownership.lua | 6 + mods/moreblocks/redefinitions.lua | 12 + mods/moreblocks/stairsplus/API.md | 3 +- mods/moreblocks/stairsplus/aliases.lua | 8 + mods/moreblocks/stairsplus/conversion.lua | 7 + mods/moreblocks/stairsplus/init.lua | 19 +- mods/moreblocks/stairsplus/microblocks.lua | 15 +- mods/moreblocks/stairsplus/panels.lua | 15 +- mods/moreblocks/stairsplus/registrations.lua | 11 +- mods/moreblocks/stairsplus/slabs.lua | 21 +- mods/moreblocks/stairsplus/slopes.lua | 459 ++++++++++++++++++ mods/moreblocks/stairsplus/stairs.lua | 21 +- mods/moreblocks/textures/default_brick.png | Bin .../textures/default_fence_overlay.png | Bin mods/moreblocks/textures/invisible.png | Bin .../textures/moreblocks_cactus_brick.png | Bin .../textures/moreblocks_cactus_checker.png | Bin .../moreblocks_circle_stone_bricks.png | Bin .../moreblocks_circular_saw_bottom.png | Bin .../textures/moreblocks_circular_saw_side.png | Bin .../textures/moreblocks_circular_saw_top.png | Bin .../textures/moreblocks_clean_glass.png | Bin .../textures/moreblocks_coal_checker.png | Bin .../textures/moreblocks_coal_glass.png | Bin .../moreblocks_coal_glass_stairsplus.png | Bin .../textures/moreblocks_coal_stone.png | Bin .../textures/moreblocks_coal_stone_bricks.png | Bin .../textures/moreblocks_empty_bookshelf.png | Bin .../textures/moreblocks_fence_jungle_wood.png | Bin .../textures/moreblocks_fence_wood.png | Bin mods/moreblocks/textures/moreblocks_glass.png | Bin .../textures/moreblocks_glass_stairsplus.png | Bin .../textures/moreblocks_glow_glass.png | Bin .../moreblocks_glow_glass_stairsplus.png | Bin .../textures/moreblocks_grey_bricks.png | Bin .../textures/moreblocks_iron_checker.png | Bin .../textures/moreblocks_iron_glass.png | Bin .../moreblocks_iron_glass_stairsplus.png | Bin .../textures/moreblocks_iron_stone.png | Bin .../textures/moreblocks_iron_stone_bricks.png | Bin .../textures/moreblocks_junglestick.png | Bin .../moreblocks_obsidian_glass_stairsplus.png | Bin .../textures/moreblocks_plankstone.png | Bin .../textures/moreblocks_plankstone_2.png | Bin mods/moreblocks/textures/moreblocks_rope.png | Bin .../textures/moreblocks_split_stone_tile.png | Bin .../moreblocks_split_stone_tile_alt.png | Bin .../moreblocks_split_stone_tile_top.png | Bin .../textures/moreblocks_stone_tile.png | Bin .../textures/moreblocks_super_glow_glass.png | Bin ...moreblocks_super_glow_glass_stairsplus.png | Bin .../textures/moreblocks_sweeper.png | Bin mods/moreblocks/textures/moreblocks_tar.png | Bin .../textures/moreblocks_trap_glass.png | Bin .../textures/moreblocks_trap_glow_glass.png | Bin .../textures/moreblocks_trap_stone.png | Bin .../moreblocks_trap_super_glow_glass.png | Bin .../textures/moreblocks_tree_stairsplus.png | Bin .../textures/moreblocks_wood_tile.png | Bin .../textures/moreblocks_wood_tile_center.png | Bin .../textures/moreblocks_wood_tile_full.png | Bin .../textures/moreblocks_wood_tile_up.png | Bin 88 files changed, 915 insertions(+), 82 deletions(-) rename mods/moreblocks/{LICENSE.txt => LICENSE.md} (71%) mode change 100755 => 100644 create mode 100644 mods/moreblocks/README.md delete mode 100755 mods/moreblocks/README.txt mode change 100755 => 100644 mods/moreblocks/aliases.lua mode change 100755 => 100644 mods/moreblocks/circular_saw.lua mode change 100755 => 100644 mods/moreblocks/config.lua mode change 100755 => 100644 mods/moreblocks/crafting.lua mode change 100755 => 100644 mods/moreblocks/depends.txt mode change 100755 => 100644 mods/moreblocks/init.lua mode change 100755 => 100644 mods/moreblocks/locale/de.txt mode change 100755 => 100644 mods/moreblocks/locale/es.txt mode change 100755 => 100644 mods/moreblocks/locale/fr.txt mode change 100755 => 100644 mods/moreblocks/locale/template.txt create mode 100644 mods/moreblocks/models/moreblocks_slope.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_half.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_half_raised.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_inner.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_inner_half.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_inner_half_raised.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_outer.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_outer_cut.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_outer_cut_half.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_outer_half.obj create mode 100644 mods/moreblocks/models/moreblocks_slope_outer_half_raised.obj mode change 100755 => 100644 mods/moreblocks/nodes.lua mode change 100755 => 100644 mods/moreblocks/ownership.lua mode change 100755 => 100644 mods/moreblocks/redefinitions.lua mode change 100755 => 100644 mods/moreblocks/stairsplus/API.md mode change 100755 => 100644 mods/moreblocks/stairsplus/aliases.lua mode change 100755 => 100644 mods/moreblocks/stairsplus/conversion.lua mode change 100755 => 100644 mods/moreblocks/stairsplus/init.lua mode change 100755 => 100644 mods/moreblocks/stairsplus/microblocks.lua mode change 100755 => 100644 mods/moreblocks/stairsplus/panels.lua mode change 100755 => 100644 mods/moreblocks/stairsplus/registrations.lua mode change 100755 => 100644 mods/moreblocks/stairsplus/slabs.lua create mode 100644 mods/moreblocks/stairsplus/slopes.lua mode change 100755 => 100644 mods/moreblocks/stairsplus/stairs.lua mode change 100755 => 100644 mods/moreblocks/textures/default_brick.png mode change 100755 => 100644 mods/moreblocks/textures/default_fence_overlay.png mode change 100755 => 100644 mods/moreblocks/textures/invisible.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_cactus_brick.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_cactus_checker.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_circle_stone_bricks.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_circular_saw_bottom.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_circular_saw_side.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_circular_saw_top.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_clean_glass.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_coal_checker.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_coal_glass.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_coal_glass_stairsplus.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_coal_stone.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_coal_stone_bricks.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_empty_bookshelf.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_fence_jungle_wood.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_fence_wood.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_glass.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_glass_stairsplus.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_glow_glass.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_glow_glass_stairsplus.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_grey_bricks.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_iron_checker.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_iron_glass.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_iron_glass_stairsplus.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_iron_stone.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_iron_stone_bricks.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_junglestick.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_obsidian_glass_stairsplus.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_plankstone.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_plankstone_2.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_rope.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_split_stone_tile.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_split_stone_tile_alt.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_split_stone_tile_top.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_stone_tile.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_super_glow_glass.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_super_glow_glass_stairsplus.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_sweeper.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_tar.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_trap_glass.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_trap_glow_glass.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_trap_stone.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_trap_super_glow_glass.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_tree_stairsplus.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_wood_tile.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_wood_tile_center.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_wood_tile_full.png mode change 100755 => 100644 mods/moreblocks/textures/moreblocks_wood_tile_up.png diff --git a/mods/moreblocks/LICENSE.txt b/mods/moreblocks/LICENSE.md old mode 100755 new mode 100644 similarity index 71% rename from mods/moreblocks/LICENSE.txt rename to mods/moreblocks/LICENSE.md index 726257de..45c5ff5a --- a/mods/moreblocks/LICENSE.txt +++ b/mods/moreblocks/LICENSE.md @@ -1,8 +1,9 @@ -+---- zlib/libpng license ----+ +zlib license +============ -Copyright (c) 2013-2014 Calinou and contributors +Copyright (c) 2011-2015 Calinou and contributors -This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. +**This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.** Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: diff --git a/mods/moreblocks/README.md b/mods/moreblocks/README.md new file mode 100644 index 00000000..228ce97d --- /dev/null +++ b/mods/moreblocks/README.md @@ -0,0 +1,11 @@ +More Blocks +=========== + +More Blocks for Minetest , a free/libre infinite +world block sandbox game. + +To install, just clone this repository into your "mods" directory. + +More Blocks code is licensed under the zlib license, textures are by Calinou and are licensed under CC BY-SA 3.0 Unported. + +**Forum topic:** diff --git a/mods/moreblocks/README.txt b/mods/moreblocks/README.txt deleted file mode 100755 index aa99eda3..00000000 --- a/mods/moreblocks/README.txt +++ /dev/null @@ -1,12 +0,0 @@ -More Blocks -========== - -More Blocks for Minetest (http://minetest.net), a free and open source infinite -world block sandbox game. - -To install, just clone this repository into your "mods" directory. - -More Blocks code is under the zlib license, textures are under CC BY-SA 3.0 unported. - -Forum topic: http://forum.minetest.net/viewtopic.php?id=509 - diff --git a/mods/moreblocks/aliases.lua b/mods/moreblocks/aliases.lua old mode 100755 new mode 100644 index df820c33..15f7b6b2 --- a/mods/moreblocks/aliases.lua +++ b/mods/moreblocks/aliases.lua @@ -1,24 +1,28 @@ --- More Blocks aliases +--[[ +More Blocks: alias definitions +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + +-- More Blocks aliases: minetest.register_alias("sweeper", "moreblocks:sweeper") minetest.register_alias("circular_saw", "moreblocks:circular_saw") minetest.register_alias("jungle_stick", "moreblocks:jungle_stick") --- Old block/item replacement - +-- Old block/item replacement: minetest.register_alias("moreblocks:oerkkiblock", "default:mossycobble") minetest.register_alias("moreblocks:screwdriver", "screwdriver:screwdriver") --- Node and item renaming - +-- Node and item renaming: minetest.register_alias("moreblocks:stone_bricks", "default:stonebrick") minetest.register_alias("moreblocks:stonebrick", "default:stonebrick") minetest.register_alias("moreblocks:junglewood", "default:junglewood") minetest.register_alias("moreblocks:jungle_wood", "default:junglewood") for _, t in pairs(circular_saw.names) do - minetest.register_alias("moreblocks:" ..t[1].. "_jungle_wood" ..t[2], - "moreblocks:" ..t[1].. "_junglewood" ..t[2]) + minetest.register_alias("moreblocks:" .. t[1] .. "_jungle_wood" .. t[2], + "moreblocks:" .. t[1] .. "_junglewood" .. t[2]) end minetest.register_alias("moreblocks:horizontaltree", "moreblocks:horizontal_tree") minetest.register_alias("moreblocks:horizontaljungletree", "moreblocks:horizontal_jungle_tree") @@ -51,8 +55,7 @@ minetest.register_alias("moreblocks:junglestick", "moreblocks:jungle_stick") minetest.register_alias("moreblocks:splitstonesquare","moreblocks:split_stone_tile") minetest.register_alias("moreblocks:allfacestree","moreblocks:all_faces_tree") --- ABM for horizontal trees (fix facedir). - +-- ABM for horizontal trees (fix facedir): local horizontal_tree_convert_facedir = {7, 12, 9, 18} minetest.register_abm({ diff --git a/mods/moreblocks/circular_saw.lua b/mods/moreblocks/circular_saw.lua old mode 100755 new mode 100644 index 2af5972a..98ddecbc --- a/mods/moreblocks/circular_saw.lua +++ b/mods/moreblocks/circular_saw.lua @@ -1,4 +1,12 @@ -local S = moreblocks.gettext +--[[ +More Blocks: circular saw + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + +local S = moreblocks.intllib + circular_saw = {} circular_saw.known_stairs = setmetatable({}, { diff --git a/mods/moreblocks/config.lua b/mods/moreblocks/config.lua old mode 100755 new mode 100644 index e5db0861..d646dacd --- a/mods/moreblocks/config.lua +++ b/mods/moreblocks/config.lua @@ -1,3 +1,10 @@ +--[[ +More Blocks: configuration handling + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + moreblocks.config = {} local function getbool_default(setting, default) diff --git a/mods/moreblocks/crafting.lua b/mods/moreblocks/crafting.lua old mode 100755 new mode 100644 index 158d40a5..4429d9ae --- a/mods/moreblocks/crafting.lua +++ b/mods/moreblocks/crafting.lua @@ -1,4 +1,9 @@ --- Crafting +--[[ +More Blocks: crafting recipes + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] minetest.register_craft({ output = "default:stick", diff --git a/mods/moreblocks/depends.txt b/mods/moreblocks/depends.txt old mode 100755 new mode 100644 index 9207dab8..198fe8a6 --- a/mods/moreblocks/depends.txt +++ b/mods/moreblocks/depends.txt @@ -1,2 +1,2 @@ -default -intllib? +default +intllib? diff --git a/mods/moreblocks/init.lua b/mods/moreblocks/init.lua old mode 100755 new mode 100644 index a86a38ea..2919a308 --- a/mods/moreblocks/init.lua +++ b/mods/moreblocks/init.lua @@ -1,20 +1,22 @@ --[[ --- More Blocks (moreblocks) by Calinou --- Licensed under the zlib/ license for code and CC BY-SA 3.0 for textures, see LICENSE.txt for info. +===================================================================== +** More Blocks ** +By Calinou, with the help of ShadowNinja and VanessaE. + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +===================================================================== --]] moreblocks = {} --- Load translation library if intllib is installed - -local S -- Load translation library if intllib is installed: -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) +local S +if minetest.get_modpath("intllib") then + S = intllib.Getter() else S = function(s) return s end end -moreblocks.gettext = S +moreblocks.intllib = S local modpath = minetest.get_modpath("moreblocks") @@ -27,6 +29,5 @@ dofile(modpath .. "/crafting.lua") dofile(modpath .. "/aliases.lua") if minetest.setting_getbool("log_mods") then - print(S("[moreblocks] loaded.")) + minetest.log("action", S("[moreblocks] loaded.")) end - diff --git a/mods/moreblocks/locale/de.txt b/mods/moreblocks/locale/de.txt old mode 100755 new mode 100644 diff --git a/mods/moreblocks/locale/es.txt b/mods/moreblocks/locale/es.txt old mode 100755 new mode 100644 diff --git a/mods/moreblocks/locale/fr.txt b/mods/moreblocks/locale/fr.txt old mode 100755 new mode 100644 diff --git a/mods/moreblocks/locale/template.txt b/mods/moreblocks/locale/template.txt old mode 100755 new mode 100644 diff --git a/mods/moreblocks/models/moreblocks_slope.obj b/mods/moreblocks/models/moreblocks_slope.obj new file mode 100644 index 00000000..05c853b7 --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope.obj @@ -0,0 +1,21 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_slope_onetexture.blend' +# www.blender.org +mtllib slope_test_slope_onetexture.mtl +o Cube_Cube.002 +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 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +usemtl None +s off +f 1/1 2/2 3/3 4/4 +f 4/3 3/4 5/1 6/2 +f 2/1 5/3 3/4 +f 1/2 4/3 6/4 +f 2/1 1/2 6/3 5/4 diff --git a/mods/moreblocks/models/moreblocks_slope_half.obj b/mods/moreblocks/models/moreblocks_slope_half.obj new file mode 100644 index 00000000..bc96bb8b --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_half.obj @@ -0,0 +1,23 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_slope_long_fronthalf_onetexture.blend' +# www.blender.org +mtllib slope_test_slope_long_fronthalf_onetexture.mtl +o Cube_Cube.002 +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.500000 +v -0.500000 -0.500000 -0.500000 +v 0.500000 -0.500000 -0.500000 +vt 1.000000 0.500000 +vt 0.000000 0.500000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +usemtl None +s off +f 1/1 2/2 3/3 4/4 +f 4/3 3/4 5/5 6/6 +f 2/1 5/3 3/4 +f 1/2 4/3 6/4 +f 2/5 1/6 6/3 5/4 diff --git a/mods/moreblocks/models/moreblocks_slope_half_raised.obj b/mods/moreblocks/models/moreblocks_slope_half_raised.obj new file mode 100644 index 00000000..79e0dc01 --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_half_raised.obj @@ -0,0 +1,26 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_slope_long_backhalf_onetexture.blend' +# www.blender.org +mtllib slope_test_slope_long_backhalf_onetexture.mtl +o Cube +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 +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 +vt 1.000000 1.000000 +vt 0.000000 0.500000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.500000 +vt 0.000000 1.000000 +usemtl None +s off +f 5/1 6/2 2/3 1/4 +f 6/5 7/2 3/3 2/4 +f 7/5 8/6 4/3 3/4 +f 8/1 5/6 1/3 4/4 +f 1/4 2/1 3/6 4/3 +f 8/6 7/3 6/4 5/1 diff --git a/mods/moreblocks/models/moreblocks_slope_inner.obj b/mods/moreblocks/models/moreblocks_slope_inner.obj new file mode 100644 index 00000000..68fc1700 --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_inner.obj @@ -0,0 +1,26 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_icorner_onetexture.blend' +# www.blender.org +o Cube_Cube.000 +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 +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 +v -0.500000 -0.500000 -0.500000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +s off +f 6/1 1/2 7/3 8/4 +f 2/1 5/3 3/4 +f 2/1 1/2 5/4 +f 6/2 8/3 9/4 +f 9/1 8/2 7/3 3/4 +f 3/3 7/4 1/1 2/2 +f 1/1 6/2 9/3 +l 1 4 +l 3 4 diff --git a/mods/moreblocks/models/moreblocks_slope_inner_half.obj b/mods/moreblocks/models/moreblocks_slope_inner_half.obj new file mode 100644 index 00000000..6decaea3 --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_inner_half.obj @@ -0,0 +1,28 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_icorner_half_short_onetexture.blend' +# www.blender.org +mtllib slope_test_icorner_half_short_onetexture.mtl +o Cube_Cube.000 +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.500000 +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.500000 +v -0.500000 -0.500000 -0.500000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +usemtl None +s off +f 6/1 1/2 7/3 8/4 +f 2/1 5/3 3/4 +f 2/1 1/2 5/4 +f 6/2 8/3 9/4 +f 9/1 8/2 7/3 3/4 +f 3/3 7/4 1/1 2/2 +f 1/1 6/2 9/3 +l 1 4 +l 3 4 diff --git a/mods/moreblocks/models/moreblocks_slope_inner_half_raised.obj b/mods/moreblocks/models/moreblocks_slope_inner_half_raised.obj new file mode 100644 index 00000000..8aff6cab --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_inner_half_raised.obj @@ -0,0 +1,31 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_icorner_half_tall_onetexture.blend' +# www.blender.org +mtllib slope_test_icorner_half_tall_onetexture.mtl +o Cube_Cube.000 +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 +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.500000 -0.500000 +v -0.500000 0.000000 -0.500000 +v -0.500000 -0.500000 -0.500000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.500000 +vt 0.000000 0.500000 +usemtl None +s off +f 6/1 1/2 7/3 8/4 +f 2/1 1/2 5/4 +f 3/3 7/4 1/1 2/2 +f 1/2 6/3 9/4 +f 3/1 10/2 8/3 7/4 +f 8/3 10/4 5/5 6/2 +f 3/4 2/1 5/6 10/3 +l 1 4 +l 3 4 diff --git a/mods/moreblocks/models/moreblocks_slope_outer.obj b/mods/moreblocks/models/moreblocks_slope_outer.obj new file mode 100644 index 00000000..383c195f --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_outer.obj @@ -0,0 +1,18 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_ocorner_onetexture.blend' +# www.blender.org +o Cube_Cube.002 +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 +v 0.500000 -0.500000 -0.500000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +s off +f 3/1 2/2 4/3 5/4 +f 1/2 3/3 5/4 +f 1/1 2/3 3/4 +f 1/1 4/3 2/4 +f 1/2 5/3 4/4 diff --git a/mods/moreblocks/models/moreblocks_slope_outer_cut.obj b/mods/moreblocks/models/moreblocks_slope_outer_cut.obj new file mode 100644 index 00000000..4608c69c --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_outer_cut.obj @@ -0,0 +1,19 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_corner_pyramid_tall_2_onetexture.blend' +# www.blender.org +mtllib slope_test_corner_pyramid_tall_2_onetexture.mtl +o Cube +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 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 0.000000 1.000000 +vt 0.500000 1.000000 +usemtl None +s off +f 4/1 1/2 3/3 +f 2/3 4/4 3/2 +f 3/2 1/3 2/4 +f 1/3 4/5 2/2 diff --git a/mods/moreblocks/models/moreblocks_slope_outer_cut_half.obj b/mods/moreblocks/models/moreblocks_slope_outer_cut_half.obj new file mode 100644 index 00000000..e4be8825 --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_outer_cut_half.obj @@ -0,0 +1,20 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_corner_pyramid_short_2_onetexture.blend' +# www.blender.org +mtllib slope_test_corner_pyramid_short_2_onetexture.mtl +o Cube +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.000000 0.500000 +vt 1.000000 0.500000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 0.000000 0.500000 +vt 0.000000 1.000000 +vt 0.500000 1.000000 +usemtl None +s off +f 4/1 1/2 3/3 +f 2/3 4/4 3/2 +f 3/2 1/3 2/5 +f 1/3 4/6 2/2 diff --git a/mods/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj b/mods/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj new file mode 100644 index 00000000..65a3b8ac --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_outer_cut_half_raised.obj @@ -0,0 +1,23 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_corner_pyramid_short_3_onetexture.blend' +# www.blender.org +mtllib slope_test_corner_pyramid_short_3_onetexture.mtl +o Cube_Cube.002 +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.500000 0.500000 +v 0.500000 -0.500000 -0.500000 +v 0.500000 -0.000000 -0.500000 +vt 0.000000 0.500000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 1.000000 0.500000 +usemtl None +s off +f 1/1 2/2 3/3 4/4 +f 4/5 3/2 5/3 6/6 +f 2/5 5/3 3/4 +f 1/2 4/3 6/4 +f 2/3 1/6 6/1 5/2 diff --git a/mods/moreblocks/models/moreblocks_slope_outer_half.obj b/mods/moreblocks/models/moreblocks_slope_outer_half.obj new file mode 100644 index 00000000..0c56e26a --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_outer_half.obj @@ -0,0 +1,22 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_corner_pyramid_short_1_onetexture.blend' +# www.blender.org +mtllib slope_test_corner_pyramid_short_1_onetexture.mtl +o Cube +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 +v 0.500000 0.000000 0.500000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 0.500000 +vt 0.000000 0.500000 +usemtl None +s off +f 1/1 2/2 3/3 4/4 +f 5/5 1/3 4/4 +f 3/4 5/6 4/3 +f 2/4 5/2 3/3 +f 1/4 5/1 2/3 diff --git a/mods/moreblocks/models/moreblocks_slope_outer_half_raised.obj b/mods/moreblocks/models/moreblocks_slope_outer_half_raised.obj new file mode 100644 index 00000000..e4fa3d1f --- /dev/null +++ b/mods/moreblocks/models/moreblocks_slope_outer_half_raised.obj @@ -0,0 +1,27 @@ +# Blender v2.69 (sub 0) OBJ File: 'slope_test_corner_pyramid_tall_3_onetexture.blend' +# www.blender.org +mtllib slope_test_corner_pyramid_tall_3_onetexture.mtl +o Cube_Cube.002 +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.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.500000 -0.000000 -0.500000 +vt 0.000000 0.500000 +vt 0.000000 0.000000 +vt 1.000000 0.000000 +vt 1.000000 1.000000 +vt 0.000000 1.000000 +vt 1.000000 0.500000 +usemtl None +s off +f 1/1 2/2 3/3 4/4 +f 4/5 3/2 5/3 6/6 +f 8/3 4/5 6/2 +f 1/6 8/1 7/2 2/3 +f 4/5 8/3 1/4 +f 6/1 5/2 7/3 8/6 +f 5/5 3/2 2/3 7/4 diff --git a/mods/moreblocks/nodes.lua b/mods/moreblocks/nodes.lua old mode 100755 new mode 100644 index 5efda8f8..d3120c9a --- a/mods/moreblocks/nodes.lua +++ b/mods/moreblocks/nodes.lua @@ -1,4 +1,11 @@ -local S = moreblocks.gettext +--[[ +More Blocks: node definitions + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + +local S = moreblocks.intllib local sound_wood = default.node_sound_wood_defaults() local sound_stone = default.node_sound_stone_defaults() @@ -116,6 +123,11 @@ local nodes = { groups = {cracky = 2}, sounds = sound_stone, }, + ["cobble_compressed"] = { + description = S("Compressed Cobblestone"), + groups = {cracky = 1}, + sounds = sound_stone, + }, ["plankstone"] = { description = S("Plankstone"), groups = {cracky = 3}, diff --git a/mods/moreblocks/ownership.lua b/mods/moreblocks/ownership.lua old mode 100755 new mode 100644 index 9cd4cb30..1c2431ba --- a/mods/moreblocks/ownership.lua +++ b/mods/moreblocks/ownership.lua @@ -1,3 +1,9 @@ +--[[ +More Blocks: ownership handling + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] local S = moreblocks.gettext diff --git a/mods/moreblocks/redefinitions.lua b/mods/moreblocks/redefinitions.lua old mode 100755 new mode 100644 index 4db169b1..a6498f16 --- a/mods/moreblocks/redefinitions.lua +++ b/mods/moreblocks/redefinitions.lua @@ -1,3 +1,10 @@ +--[[ +More Blocks: redefinitions of default stuff + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + -- Redefinitions of some default crafting recipes: minetest.register_craft({ @@ -71,6 +78,11 @@ minetest.override_item("default:papyrus", { sunlight_propagates = true, }) +minetest.override_item("default:fence_wood", { + paramtype = "light", + sunlight_propagates = true, +}) + minetest.override_item("default:junglegrass", { paramtype = "light", sunlight_propagates = true, diff --git a/mods/moreblocks/stairsplus/API.md b/mods/moreblocks/stairsplus/API.md old mode 100755 new mode 100644 index a98ec81e..2db0f2b3 --- a/mods/moreblocks/stairsplus/API.md +++ b/mods/moreblocks/stairsplus/API.md @@ -1,6 +1,5 @@ API documentation for Stairs+ -================================ -- - - - - - - - - - - - - - - - +============================= * `stairsplus:register_all(modname, subname, recipeitem, fields)` Registers a stair, slab, panel, microblock, and any other types of diff --git a/mods/moreblocks/stairsplus/aliases.lua b/mods/moreblocks/stairsplus/aliases.lua old mode 100755 new mode 100644 index c92df483..c235d342 --- a/mods/moreblocks/stairsplus/aliases.lua +++ b/mods/moreblocks/stairsplus/aliases.lua @@ -1,3 +1,9 @@ +--[[ +More Blocks: alias definitions + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] local function register_stairsplus_alias(modname, origname, newname) minetest.register_alias(modname.. ":slab_" ..origname, "moreblocks:slab_" ..newname) @@ -33,12 +39,14 @@ end register_stairsplus_alias("stairsplus", "stone", "stone") register_stairsplus_alias("stairsplus", "wood", "wood") +register_stairsplus_alias("stairsplus", "pinewood", "pinewood") register_stairsplus_alias("stairsplus", "cobble", "cobble") register_stairsplus_alias("stairsplus", "brick", "brick") register_stairsplus_alias("stairsplus", "sandstone", "sandstone") register_stairsplus_alias("stairsplus", "glass", "glass") register_stairsplus_alias("stairsplus", "tree", "tree") register_stairsplus_alias("stairsplus", "jungletree", "jungletree") +register_stairsplus_alias("stairsplus", "pinetree", "pinetree") register_stairsplus_alias("stairsplus", "desert_stone", "desert_stone") register_stairsplus_alias("stairsplus", "steelblock", "steelblock") register_stairsplus_alias("stairsplus", "mossycobble", "mossycobble") diff --git a/mods/moreblocks/stairsplus/conversion.lua b/mods/moreblocks/stairsplus/conversion.lua old mode 100755 new mode 100644 index fda30c7b..13966b66 --- a/mods/moreblocks/stairsplus/conversion.lua +++ b/mods/moreblocks/stairsplus/conversion.lua @@ -1,3 +1,10 @@ +--[[ +More Blocks: conversion + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + -- Function to convert all stairs/slabs/etc nodes from -- inverted, wall, etc to regular + 6d facedir diff --git a/mods/moreblocks/stairsplus/init.lua b/mods/moreblocks/stairsplus/init.lua old mode 100755 new mode 100644 index ae09b7d3..ffec1b7f --- a/mods/moreblocks/stairsplus/init.lua +++ b/mods/moreblocks/stairsplus/init.lua @@ -1,3 +1,10 @@ +--[[ +More Blocks: Stairs+ + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + -- Nodes will be called :{stair,slab,panel,micro}_ local modpath = minetest.get_modpath("moreblocks").. "/stairsplus" @@ -18,6 +25,7 @@ function stairsplus:register_all(modname, subname, recipeitem, fields) end self:register_stair(modname, subname, recipeitem, fields) self:register_slab (modname, subname, recipeitem, fields) + self:register_slope(modname, subname, recipeitem, fields) self:register_panel(modname, subname, recipeitem, fields) self:register_micro(modname, subname, recipeitem, fields) -- self:register_6dfacedir_conversion(modname, subname) -- Not needed as of Q3 2013, uncomment to fix old maps. @@ -36,8 +44,9 @@ end -- dofile(modpath.. "/aliases.lua") -- Not needed as of Q2 2013, uncomment to fix old maps. -- dofile(modpath.. "/conversion.lua") -- Not needed as of Q2 2013, uncomment to fix old maps. -dofile(modpath.. "/stairs.lua") -dofile(modpath.. "/slabs.lua") -dofile(modpath.. "/panels.lua") -dofile(modpath.. "/microblocks.lua") -dofile(modpath.. "/registrations.lua") +dofile(modpath .. "/stairs.lua") +dofile(modpath .. "/slabs.lua") +dofile(modpath .. "/slopes.lua") +dofile(modpath .. "/panels.lua") +dofile(modpath .. "/microblocks.lua") +dofile(modpath .. "/registrations.lua") diff --git a/mods/moreblocks/stairsplus/microblocks.lua b/mods/moreblocks/stairsplus/microblocks.lua old mode 100755 new mode 100644 index f88ed12e..8d52c4a2 --- a/mods/moreblocks/stairsplus/microblocks.lua +++ b/mods/moreblocks/stairsplus/microblocks.lua @@ -1,10 +1,11 @@ -local S -- Load translation library if intllib is installed: -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function(s) return s end -end +--[[ +More Blocks: microblock definitions + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + +local S = moreblocks.intllib -- Node will be called :micro_ diff --git a/mods/moreblocks/stairsplus/panels.lua b/mods/moreblocks/stairsplus/panels.lua old mode 100755 new mode 100644 index 73b283ed..2220fe42 --- a/mods/moreblocks/stairsplus/panels.lua +++ b/mods/moreblocks/stairsplus/panels.lua @@ -1,10 +1,11 @@ -local S -- Load translation library if intllib is installed: -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function(s) return s end -end +--[[ +More Blocks: panel definitions + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + +local S = moreblocks.intllib -- Node will be called :panel_ diff --git a/mods/moreblocks/stairsplus/registrations.lua b/mods/moreblocks/stairsplus/registrations.lua old mode 100755 new mode 100644 index cc22d333..7b38b13b --- a/mods/moreblocks/stairsplus/registrations.lua +++ b/mods/moreblocks/stairsplus/registrations.lua @@ -1,3 +1,10 @@ +--[[ +More Blocks: registrations + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + local default_nodes = { -- Default stairs/slabs/panels/microblocks: "stone", "cobble", @@ -10,12 +17,14 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks: "bronzeblock", "diamondblock", "desert_stone", --- "desert_cobble", + "desert_cobble", "glass", "tree", "wood", "jungletree", "junglewood", + "pinetree", + "pinewood", "obsidian", "obsidian_glass", "stonebrick", diff --git a/mods/moreblocks/stairsplus/slabs.lua b/mods/moreblocks/stairsplus/slabs.lua old mode 100755 new mode 100644 index 9c31745d..68ba5200 --- a/mods/moreblocks/stairsplus/slabs.lua +++ b/mods/moreblocks/stairsplus/slabs.lua @@ -1,10 +1,11 @@ -local S -- Load translation library if intllib is installed: -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function(s) return s end -end +--[[ +More Blocks: slab definitions + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + +local S = moreblocks.intllib -- Node will be called :slab_ @@ -75,11 +76,11 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields) end def.description = desc if fields.drop then - def.drop = modname.. ":slab_" ..fields.drop..alternate + def.drop = modname.. ":slab_" .. fields.drop .. alternate end - minetest.register_node(":" ..modname.. ":slab_" ..subname..alternate, def) + minetest.register_node(":" .. modname .. ":slab_" .. subname .. alternate, def) end - minetest.register_alias("stairs:slab_" ..subname, modname.. ":slab_" ..subname) + minetest.register_alias("stairs:slab_" .. subname, modname .. ":slab_" .. subname) -- Some saw-less recipes: diff --git a/mods/moreblocks/stairsplus/slopes.lua b/mods/moreblocks/stairsplus/slopes.lua new file mode 100644 index 00000000..3a169060 --- /dev/null +++ b/mods/moreblocks/stairsplus/slopes.lua @@ -0,0 +1,459 @@ +--[[ +More Blocks: slope definitions + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + +local S = moreblocks.intllib + +local box_slope = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.25, 0.5}, + {-0.5, -0.25, -0.25, 0.5, 0, 0.5}, + {-0.5, 0, 0, 0.5, 0.25, 0.5}, + {-0.5, 0.25, 0.25, 0.5, 0.5, 0.5} + } +} + +local box_slope_half = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.375, 0.5}, + {-0.5, -0.375, -0.25, 0.5, -0.25, 0.5}, + {-0.5, -0.25, 0, 0.5, -0.125, 0.5}, + {-0.5, -0.125, 0.25, 0.5, 0, 0.5}, + } +} + +local box_slope_half_raised = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.125, 0.5}, + {-0.5, 0.125, -0.25, 0.5, 0.25, 0.5}, + {-0.5, 0.25, 0, 0.5, 0.375, 0.5}, + {-0.5, 0.375, 0.25, 0.5, 0.5, 0.5}, + } +} + +--============================================================== + +local box_slope_inner = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.25, 0.5}, + {-0.5, -0.5, -0.25, 0.5, 0, 0.5}, + {-0.5, -0.5, -0.5, 0.25, 0, 0.5}, + {-0.5, 0, -0.5, 0, 0.25, 0.5}, + {-0.5, 0, 0, 0.5, 0.25, 0.5}, + {-0.5, 0.25, 0.25, 0.5, 0.5, 0.5}, + {-0.5, 0.25, -0.5, -0.25, 0.5, 0.5}, + } +} + +local box_slope_inner_half = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.375, 0.5}, + {-0.5, -0.375, -0.25, 0.5, -0.25, 0.5}, + {-0.5, -0.375, -0.5, 0.25, -0.25, 0.5}, + {-0.5, -0.25, -0.5, 0, -0.125, 0.5}, + {-0.5, -0.25, 0, 0.5, -0.125, 0.5}, + {-0.5, -0.125, 0.25, 0.5, 0, 0.5}, + {-0.5, -0.125, -0.5, -0.25, 0, 0.5}, + } +} + +local box_slope_inner_half_raised = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.125, 0.5}, + {-0.5, 0.125, -0.25, 0.5, 0.25, 0.5}, + {-0.5, 0.125, -0.5, 0.25, 0.25, 0.5}, + {-0.5, 0.25, -0.5, 0, 0.375, 0.5}, + {-0.5, 0.25, 0, 0.5, 0.375, 0.5}, + {-0.5, 0.375, 0.25, 0.5, 0.5, 0.5}, + {-0.5, 0.375, -0.5, -0.25, 0.5, 0.5}, + } +} + +--============================================================== + +local box_slope_outer = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.25, 0.5}, + {-0.5, -0.25, -0.25, 0.25, 0, 0.5}, + {-0.5, 0, 0, 0, 0.25, 0.5}, + {-0.5, 0.25, 0.25, -0.25, 0.5, 0.5} + } +} + +local box_slope_outer_half = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, -0.375, 0.5}, + {-0.5, -0.375, -0.25, 0.25, -0.25, 0.5}, + {-0.5, -0.25, 0, 0, -0.125, 0.5}, + {-0.5, -0.125, 0.25, -0.25, 0, 0.5} + } +} + +local box_slope_outer_half_raised = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.5, 0.5, 0.125, 0.5}, + {-0.5, 0.125, -0.25, 0.25, 0.25, 0.5}, + {-0.5, 0.25, 0, 0, 0.375, 0.5}, + {-0.5, 0.375, 0.25, -0.25, 0.5, 0.5} + } +} + +-- Node will be called :slope_ + +function register_slope(modname, subname, recipeitem, groups, images, description, drop, light) + return stairsplus:register_slope(modname, subname, recipeitem, { + groups = groups, + tiles = images, + description = description, + drop = drop, + light_source = light, + sounds = default.node_sound_stone_defaults(), + }) +end + +function stairsplus:register_slope(modname, subname, recipeitem, fields) + local defs = { + [""] = { + mesh = "moreblocks_slope.obj", + collision_box = box_slope, + selection_box = box_slope, + + }, + ["_half"] = { + mesh = "moreblocks_slope_half.obj", + collision_box = box_slope_half, + selection_box = box_slope_half, + }, + ["_half_raised"] = { + mesh = "moreblocks_slope_half_raised.obj", + collision_box = box_slope_half_raised, + selection_box = box_slope_half_raised, + }, + +--============================================================== + + ["_inner"] = { + mesh = "moreblocks_slope_inner.obj", + collision_box = box_slope_inner, + selection_box = box_slope_inner, + }, + ["_inner_half"] = { + mesh = "moreblocks_slope_inner_half.obj", + collision_box = box_slope_inner_half, + selection_box = box_slope_inner_half, + }, + ["_inner_half_raised"] = { + mesh = "moreblocks_slope_inner_half_raised.obj", + collision_box = box_slope_inner_half_raised, + selection_box = box_slope_inner_half_raised, + }, + +--============================================================== + + ["_outer"] = { + mesh = "moreblocks_slope_outer.obj", + collision_box = box_slope_outer, + selection_box = box_slope_outer, + }, + ["_outer_half"] = { + mesh = "moreblocks_slope_outer_half.obj", + collision_box = box_slope_outer_half, + selection_box = box_slope_outer_half, + }, + ["_outer_half_raised"] = { + mesh = "moreblocks_slope_outer_half_raised.obj", + collision_box = box_slope_outer_half_raised, + selection_box = box_slope_outer_half_raised, + }, + +--============================================================== + + ["_outer_cut"] = { + mesh = "moreblocks_slope_outer_cut.obj", + collision_box = box_slope_outer, + selection_box = box_slope_outer, + }, + ["_outer_cut_half"] = { + mesh = "moreblocks_slope_outer_cut_half.obj", + collision_box = box_slope_outer_half, + selection_box = box_slope_outer_half, + }, + ["_outer_cut_half_raised"] = { + mesh = "moreblocks_slope_outer_cut_half_raised.obj", + collision_box = box_slope_outer_half_raised, + selection_box = box_slope_outer_half_raised, + }, + } + + local desc = S("%s Slope"):format(fields.description) + for alternate, def in pairs(defs) do + def.drawtype = "mesh" + def.paramtype = "light" + def.paramtype2 = "facedir" + def.on_place = minetest.rotate_node + for k, v in pairs(fields) do + def[k] = v + end + def.description = desc + if fields.drop then + def.drop = modname.. ":slope_" ..fields.drop..alternate + end + minetest.register_node(":" ..modname.. ":slope_" ..subname..alternate, def) + end + + -- Some saw-less recipes: + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. " 7", + recipe = { + {modname .. ":panel_" .. subname, "", ""}, + {recipeitem, modname .. ":panel_" .. subname, ""}, + {recipeitem, recipeitem, modname .. ":panel_" .. subname}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. " 7", + recipe = { + {"", "", modname .. ":panel_" .. subname}, + {"", modname .. ":panel_" .. subname, recipeitem}, + {modname .. ":panel_" .. subname, recipeitem, recipeitem}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_half 10", + recipe = { + {modname .. ":panel_" .. subname, "", ""}, + {recipeitem, recipeitem, modname .. ":panel_" .. subname}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_half 10", + recipe = { + {"", "", modname .. ":panel_" .. subname}, + {modname .. ":panel_" .. subname, recipeitem, recipeitem}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_half_raised 7", + recipe = { + {modname .. ":panel_" .. subname, "", ""}, + {recipeitem, recipeitem, modname .. ":panel_" .. subname}, + {recipeitem, recipeitem, recipeitem}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_half_raised 7", + recipe = { + {"", "", modname .. ":panel_" .. subname}, + {modname .. ":panel_" .. subname, recipeitem, recipeitem}, + {recipeitem, recipeitem, recipeitem}, + }, + }) + +--===================================================== Inner == + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_inner 7", + recipe = { + {modname .. ":stair_" .. subname .. "_half", "", ""}, + {recipeitem, modname .. ":stair_" .. subname .. "_half", ""}, + {recipeitem, recipeitem, modname .. ":stair_" .. subname .. "_half"}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_inner 7", + recipe = { + {"", "", modname .. ":stair_" .. subname .. "_half"}, + {"", modname .. ":stair_" .. subname .. "_half", recipeitem}, + {modname .. ":stair_" .. subname .. "_half", recipeitem, recipeitem}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_inner_half 10", + recipe = { + {modname .. ":stair_" .. subname .. "_half", "", ""}, + {recipeitem, recipeitem, modname .. ":stair_" .. subname .. "_half"}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_inner_half 10", + recipe = { + {"", "", modname .. ":stair_" .. subname .. "_half"}, + {modname .. ":stair_" .. subname .. "_half", recipeitem, recipeitem}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_inner_half_raised 7", + recipe = { + {modname .. ":stair_" .. subname .. "_half", "", ""}, + {recipeitem, recipeitem, modname .. ":stair_" .. subname .. "_half"}, + {recipeitem, recipeitem, recipeitem}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_inner_half_raised 7", + recipe = { + {"", "", modname .. ":stair_" .. subname .. "_half"}, + {modname .. ":stair_" .. subname .. "_half", recipeitem, recipeitem}, + {recipeitem, recipeitem, recipeitem}, + }, + }) + +--===================================================== Outer == + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_outer 7", + recipe = { + {modname .. ":micro_" .. subname, "", ""}, + {recipeitem, modname .. ":micro_" .. subname, ""}, + {recipeitem, recipeitem, modname .. ":micro_" .. subname}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_outer 7", + recipe = { + {"", "", modname .. ":micro_" .. subname}, + {"", modname .. ":micro_" .. subname, recipeitem}, + {modname .. ":micro_" .. subname, recipeitem, recipeitem}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_outer_half 10", + recipe = { + {modname .. ":micro_" .. subname, "", ""}, + {recipeitem, recipeitem, modname .. ":micro_" .. subname}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_outer_half 10", + recipe = { + {"", "", modname .. ":micro_" .. subname}, + {modname .. ":micro_" .. subname, recipeitem, recipeitem}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_outer_half_raised 7", + recipe = { + {modname .. ":micro_" .. subname, "", ""}, + {recipeitem, recipeitem, modname .. ":micro_" .. subname}, + {recipeitem, recipeitem, recipeitem}, + }, + }) + + minetest.register_craft({ + output = modname .. ":slope_" .. subname .. "_outer_half_raised 7", + recipe = { + {"", "", modname .. ":micro_" .. subname}, + {modname .. ":micro_" .. subname, recipeitem, recipeitem}, + {recipeitem, recipeitem, recipeitem}, + }, + }) + +--================================================= Shapeless == + + minetest.register_craft({ + type = "shapeless", + output = recipeitem, + recipe = {modname .. ":slope_" .. subname, modname .. ":slope_" .. subname}, + }) + + minetest.register_craft({ + type = "shapeless", + output = recipeitem, + recipe = {modname .. ":slope_" .. subname .. "_outer_cut", modname .. ":slope_" .. subname .. "_outer_cut"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = recipeitem, + recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half_raised"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = recipeitem, + recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half", + modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = modname .. ":slab_" .. subname, + recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = modname .. ":slope_" .. subname .. "_half_raised", + recipe = {modname .. ":slope_" .. subname .. "_half", modname .. ":slope_" .. subname .. "_half", + modname .. ":slope_" .. subname .. "_half"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = modname .. ":slope_" .. subname .. "_half_raised", + recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_half"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = modname .. ":slope_" .. subname .. "_inner_half_raised", + recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_inner_half"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = modname .. ":slope_" .. subname .. "_outer_half_raised", + recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_outer_half"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = modname .. ":slope_" .. subname .. "_outer_cut_half_raised", + recipe = {modname .. ":slab_" .. subname, modname .. ":slope_" .. subname .. "_outer_cut_half"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = modname .. ":slope_" .. subname .. "_outer_cut", + recipe = {modname .. ":slope_" .. subname .. "_outer"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = modname .. ":slope_" .. subname .. "_outer_cut_half", + recipe = {modname .. ":slope_" .. subname .. "_outer_half"}, + }) + + minetest.register_craft({ + type = "shapeless", + output = modname .. ":slope_" .. subname .. "_outer_cut_half_raised", + recipe = {modname .. ":slope_" .. subname .. "_outer_half_raised"}, + }) +end diff --git a/mods/moreblocks/stairsplus/stairs.lua b/mods/moreblocks/stairsplus/stairs.lua old mode 100755 new mode 100644 index a4f54e39..a93cda08 --- a/mods/moreblocks/stairsplus/stairs.lua +++ b/mods/moreblocks/stairsplus/stairs.lua @@ -1,10 +1,11 @@ -local S -- Load translation library if intllib is installed: -if (minetest.get_modpath("intllib")) then - dofile(minetest.get_modpath("intllib").."/intllib.lua") - S = intllib.Getter(minetest.get_current_modname()) -else - S = function(s) return s end -end +--[[ +More Blocks: stair definitions + +Copyright (c) 2011-2015 Calinou and contributors. +Licensed under the zlib license. See LICENSE.md for more information. +--]] + +local S = moreblocks.intllib -- Node will be called :stair_ @@ -116,11 +117,11 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields) end def.description = desc if fields.drop then - def.drop = modname.. ":stair_" ..fields.drop..alternate + def.drop = modname .. ":stair_" .. fields.drop .. alternate end - minetest.register_node(":" ..modname.. ":stair_" ..subname..alternate, def) + minetest.register_node(":" .. modname .. ":stair_" .. subname .. alternate, def) end - minetest.register_alias(":stairs:stair_" ..subname, modname.. ":stair_" ..subname) + minetest.register_alias("stairs:stair_" .. subname, modname .. ":stair_" .. subname) -- Some saw-less recipes: diff --git a/mods/moreblocks/textures/default_brick.png b/mods/moreblocks/textures/default_brick.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/default_fence_overlay.png b/mods/moreblocks/textures/default_fence_overlay.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/invisible.png b/mods/moreblocks/textures/invisible.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_cactus_brick.png b/mods/moreblocks/textures/moreblocks_cactus_brick.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_cactus_checker.png b/mods/moreblocks/textures/moreblocks_cactus_checker.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_circle_stone_bricks.png b/mods/moreblocks/textures/moreblocks_circle_stone_bricks.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_circular_saw_bottom.png b/mods/moreblocks/textures/moreblocks_circular_saw_bottom.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_circular_saw_side.png b/mods/moreblocks/textures/moreblocks_circular_saw_side.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_circular_saw_top.png b/mods/moreblocks/textures/moreblocks_circular_saw_top.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_clean_glass.png b/mods/moreblocks/textures/moreblocks_clean_glass.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_coal_checker.png b/mods/moreblocks/textures/moreblocks_coal_checker.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_coal_glass.png b/mods/moreblocks/textures/moreblocks_coal_glass.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_coal_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_coal_glass_stairsplus.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_coal_stone.png b/mods/moreblocks/textures/moreblocks_coal_stone.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_coal_stone_bricks.png b/mods/moreblocks/textures/moreblocks_coal_stone_bricks.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_empty_bookshelf.png b/mods/moreblocks/textures/moreblocks_empty_bookshelf.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_fence_jungle_wood.png b/mods/moreblocks/textures/moreblocks_fence_jungle_wood.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_fence_wood.png b/mods/moreblocks/textures/moreblocks_fence_wood.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_glass.png b/mods/moreblocks/textures/moreblocks_glass.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_glass_stairsplus.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_glow_glass.png b/mods/moreblocks/textures/moreblocks_glow_glass.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_glow_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_glow_glass_stairsplus.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_grey_bricks.png b/mods/moreblocks/textures/moreblocks_grey_bricks.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_iron_checker.png b/mods/moreblocks/textures/moreblocks_iron_checker.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_iron_glass.png b/mods/moreblocks/textures/moreblocks_iron_glass.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_iron_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_iron_glass_stairsplus.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_iron_stone.png b/mods/moreblocks/textures/moreblocks_iron_stone.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_iron_stone_bricks.png b/mods/moreblocks/textures/moreblocks_iron_stone_bricks.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_junglestick.png b/mods/moreblocks/textures/moreblocks_junglestick.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_obsidian_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_obsidian_glass_stairsplus.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_plankstone.png b/mods/moreblocks/textures/moreblocks_plankstone.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_plankstone_2.png b/mods/moreblocks/textures/moreblocks_plankstone_2.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_rope.png b/mods/moreblocks/textures/moreblocks_rope.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_split_stone_tile.png b/mods/moreblocks/textures/moreblocks_split_stone_tile.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_split_stone_tile_alt.png b/mods/moreblocks/textures/moreblocks_split_stone_tile_alt.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_split_stone_tile_top.png b/mods/moreblocks/textures/moreblocks_split_stone_tile_top.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_stone_tile.png b/mods/moreblocks/textures/moreblocks_stone_tile.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_super_glow_glass.png b/mods/moreblocks/textures/moreblocks_super_glow_glass.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_super_glow_glass_stairsplus.png b/mods/moreblocks/textures/moreblocks_super_glow_glass_stairsplus.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_sweeper.png b/mods/moreblocks/textures/moreblocks_sweeper.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_tar.png b/mods/moreblocks/textures/moreblocks_tar.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_trap_glass.png b/mods/moreblocks/textures/moreblocks_trap_glass.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_trap_glow_glass.png b/mods/moreblocks/textures/moreblocks_trap_glow_glass.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_trap_stone.png b/mods/moreblocks/textures/moreblocks_trap_stone.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_trap_super_glow_glass.png b/mods/moreblocks/textures/moreblocks_trap_super_glow_glass.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_tree_stairsplus.png b/mods/moreblocks/textures/moreblocks_tree_stairsplus.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_wood_tile.png b/mods/moreblocks/textures/moreblocks_wood_tile.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_wood_tile_center.png b/mods/moreblocks/textures/moreblocks_wood_tile_center.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_wood_tile_full.png b/mods/moreblocks/textures/moreblocks_wood_tile_full.png old mode 100755 new mode 100644 diff --git a/mods/moreblocks/textures/moreblocks_wood_tile_up.png b/mods/moreblocks/textures/moreblocks_wood_tile_up.png old mode 100755 new mode 100644