From 0bf401f8d552547915efc085f02a842618233463 Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 1 Aug 2014 10:20:13 +0200 Subject: [PATCH 1/2] Add more types of fences and move fences to seperate mod --- mods/default/crafting.lua | 14 ----- mods/default/nodes.lua | 17 ------ mods/fence/README.txt | 23 ++++++++ mods/fence/depends.txt | 1 + mods/fence/init.lua | 55 ++++++++++++++++++ .../textures/fence_overlay.png} | Bin 6 files changed, 79 insertions(+), 31 deletions(-) create mode 100644 mods/fence/README.txt create mode 100644 mods/fence/depends.txt create mode 100644 mods/fence/init.lua rename mods/{default/textures/default_fence_overlay.png => fence/textures/fence_overlay.png} (100%) diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index eb150044..2294bf58 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -21,14 +21,6 @@ minetest.register_craft({ } }) -minetest.register_craft({ - output = 'default:fence_wood 2', - recipe = { - {'group:stick', 'group:stick', 'group:stick'}, - {'group:stick', 'group:stick', 'group:stick'}, - } -}) - minetest.register_craft({ output = 'default:sign_wall', recipe = { @@ -705,12 +697,6 @@ minetest.register_craft({ burntime = 30, }) -minetest.register_craft({ - type = "fuel", - recipe = "default:fence_wood", - burntime = 15, -}) - minetest.register_craft({ type = "fuel", recipe = "default:ladder", diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua index 354096e0..aabdec73 100644 --- a/mods/default/nodes.lua +++ b/mods/default/nodes.lua @@ -456,23 +456,6 @@ minetest.register_node("default:glass", { sounds = default.node_sound_glass_defaults(), }) -local fence_texture = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126" -minetest.register_node("default:fence_wood", { - description = "Wooden Fence", - drawtype = "fencelike", - tiles = {"default_wood.png"}, - inventory_image = fence_texture, - wield_image = fence_texture, - paramtype = "light", - is_ground_content = false, - selection_box = { - type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, - groups = {choppy=2,oddly_breakable_by_hand=2,flammable=2}, - sounds = default.node_sound_wood_defaults(), -}) - minetest.register_node("default:rail", { description = "Rail", drawtype = "raillike", diff --git a/mods/fence/README.txt b/mods/fence/README.txt new file mode 100644 index 00000000..7f943e43 --- /dev/null +++ b/mods/fence/README.txt @@ -0,0 +1,23 @@ +Minetest 0.4 mod: fence +======================= + +License of source code: +----------------------- +Copyright (C) 2011-2012 celeron55, Perttu Ahola + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU Lesser General Public License as published by +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +http://www.gnu.org/licenses/lgpl-2.1.html + +License of media (textures and sounds) +-------------------------------------- +Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) +http://creativecommons.org/licenses/by-sa/3.0/ + +Authors of media files +----------------------- +Copyright (C) 2010-2012 celeron55, Perttu Ahola + diff --git a/mods/fence/depends.txt b/mods/fence/depends.txt new file mode 100644 index 00000000..4ad96d51 --- /dev/null +++ b/mods/fence/depends.txt @@ -0,0 +1 @@ +default diff --git a/mods/fence/init.lua b/mods/fence/init.lua new file mode 100644 index 00000000..7dacc043 --- /dev/null +++ b/mods/fence/init.lua @@ -0,0 +1,55 @@ +-- Minetest 0.4 mod: fence +-- See README.txt for licensing and other information. + +fence = {} +function fence.register_fence(name, texture, desc, craftitem, craftoutput, groups, sounds) + local fence_texture = texture .. "^fence_overlay.png^[makealpha:255,126,126" + minetest.register_node(":fence:" .. name, { + description = desc, + drawtype = "fencelike", + tiles = {texture}, + inventory_image = fence_texture, + wield_image = fence_texture, + paramtype = "light", + is_ground_content = false, + selection_box = { + type = "fixed", + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, + }, + groups = groups, + sounds = sounds, + }) + minetest.register_craft({ + output = 'fence:' .. name .. ' ' .. craftoutput, + recipe = { + {craftitem, craftitem, craftitem}, + {craftitem, craftitem, craftitem}, + } + }) +end + + +fence.register_fence("wood", "default_wood.png", "Wooden Fence", "group:stick", 2, + {choppy=2, oddly_breakable_by_hand=2, flammable=2}, default.node_sound_wood_defaults()) +fence.register_fence("cobble", "default_cobble.png", "Cobblestone Fence", "default:cobble", 4, + {cracky=3, stone=2}, default.node_sound_stone_defaults()) +fence.register_fence("desert_cobble", "default_desert_cobble.png", "Desert Cobblestone Fence", "default:desert_cobble", 4, + {cracky=3, stone=2}, default.node_sound_stone_defaults()) +fence.register_fence("sandstone", "default_sandstone.png", "Sandstone Fence", "default:sandstone", 4, + {crumbly=2, cracky=3}, default.node_sound_stone_defaults()) +fence.register_fence("stonebrick", "default_stone_brick.png", "Stone Brick Fence", "default:stonebrick", 4, + {cracky=2, stone=1}, default.node_sound_stone_defaults()) +fence.register_fence("sandstonebrick", "default_sandstone_brick.png", "Sandstone Brick Fence", "default:sandstonebrick", 4, + {cracky=2}, default.node_sound_stone_defaults()) +fence.register_fence("desert_stonebrick", "default_desert_stone_brick.png", "Desert Stone Brick Fence", "default:desert_stonebrick", 4, + {cracky=2, stone=1}, default.node_sound_stone_defaults()) + + +minetest.register_craft({ + type = "fuel", + recipe = "fence:wood", + burntime = 15, +}) + +minetest.register_alias("default:fence_wood", "fence:wood") + diff --git a/mods/default/textures/default_fence_overlay.png b/mods/fence/textures/fence_overlay.png similarity index 100% rename from mods/default/textures/default_fence_overlay.png rename to mods/fence/textures/fence_overlay.png From f5a351a62dc4ad52747db68801ec14b646fcb59b Mon Sep 17 00:00:00 2001 From: sfan5 Date: Fri, 1 Aug 2014 11:47:17 +0200 Subject: [PATCH 2/2] Implement suggestions by @CraigyDavi --- mods/fence/init.lua | 55 ------------------ mods/{fence => fences}/README.txt | 4 +- mods/{fence => fences}/depends.txt | 0 mods/fences/init.lua | 55 ++++++++++++++++++ .../textures/fences_overlay.png} | Bin 5 files changed, 57 insertions(+), 57 deletions(-) delete mode 100644 mods/fence/init.lua rename mods/{fence => fences}/README.txt (93%) rename mods/{fence => fences}/depends.txt (100%) create mode 100644 mods/fences/init.lua rename mods/{fence/textures/fence_overlay.png => fences/textures/fences_overlay.png} (100%) diff --git a/mods/fence/init.lua b/mods/fence/init.lua deleted file mode 100644 index 7dacc043..00000000 --- a/mods/fence/init.lua +++ /dev/null @@ -1,55 +0,0 @@ --- Minetest 0.4 mod: fence --- See README.txt for licensing and other information. - -fence = {} -function fence.register_fence(name, texture, desc, craftitem, craftoutput, groups, sounds) - local fence_texture = texture .. "^fence_overlay.png^[makealpha:255,126,126" - minetest.register_node(":fence:" .. name, { - description = desc, - drawtype = "fencelike", - tiles = {texture}, - inventory_image = fence_texture, - wield_image = fence_texture, - paramtype = "light", - is_ground_content = false, - selection_box = { - type = "fixed", - fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, - }, - groups = groups, - sounds = sounds, - }) - minetest.register_craft({ - output = 'fence:' .. name .. ' ' .. craftoutput, - recipe = { - {craftitem, craftitem, craftitem}, - {craftitem, craftitem, craftitem}, - } - }) -end - - -fence.register_fence("wood", "default_wood.png", "Wooden Fence", "group:stick", 2, - {choppy=2, oddly_breakable_by_hand=2, flammable=2}, default.node_sound_wood_defaults()) -fence.register_fence("cobble", "default_cobble.png", "Cobblestone Fence", "default:cobble", 4, - {cracky=3, stone=2}, default.node_sound_stone_defaults()) -fence.register_fence("desert_cobble", "default_desert_cobble.png", "Desert Cobblestone Fence", "default:desert_cobble", 4, - {cracky=3, stone=2}, default.node_sound_stone_defaults()) -fence.register_fence("sandstone", "default_sandstone.png", "Sandstone Fence", "default:sandstone", 4, - {crumbly=2, cracky=3}, default.node_sound_stone_defaults()) -fence.register_fence("stonebrick", "default_stone_brick.png", "Stone Brick Fence", "default:stonebrick", 4, - {cracky=2, stone=1}, default.node_sound_stone_defaults()) -fence.register_fence("sandstonebrick", "default_sandstone_brick.png", "Sandstone Brick Fence", "default:sandstonebrick", 4, - {cracky=2}, default.node_sound_stone_defaults()) -fence.register_fence("desert_stonebrick", "default_desert_stone_brick.png", "Desert Stone Brick Fence", "default:desert_stonebrick", 4, - {cracky=2, stone=1}, default.node_sound_stone_defaults()) - - -minetest.register_craft({ - type = "fuel", - recipe = "fence:wood", - burntime = 15, -}) - -minetest.register_alias("default:fence_wood", "fence:wood") - diff --git a/mods/fence/README.txt b/mods/fences/README.txt similarity index 93% rename from mods/fence/README.txt rename to mods/fences/README.txt index 7f943e43..98fffc5d 100644 --- a/mods/fence/README.txt +++ b/mods/fences/README.txt @@ -1,5 +1,5 @@ -Minetest 0.4 mod: fence -======================= +Minetest 0.4 mod: fences +======================== License of source code: ----------------------- diff --git a/mods/fence/depends.txt b/mods/fences/depends.txt similarity index 100% rename from mods/fence/depends.txt rename to mods/fences/depends.txt diff --git a/mods/fences/init.lua b/mods/fences/init.lua new file mode 100644 index 00000000..ab6cd7ab --- /dev/null +++ b/mods/fences/init.lua @@ -0,0 +1,55 @@ +-- Minetest 0.4 mod: fences +-- See README.txt for licensing and other information. + +fences = {} +function fences.register_fence(name, texture, desc, craftitem, craftoutput, groups, sounds) + local fence_texture = texture .. "^fences_overlay.png^[makealpha:255,126,126" + minetest.register_node(":fences:" .. name, { + description = desc, + drawtype = "fencelike", + tiles = {texture}, + inventory_image = fence_texture, + wield_image = fence_texture, + paramtype = "light", + is_ground_content = false, + selection_box = { + type = "fixed", + fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7}, + }, + groups = groups, + sounds = sounds, + }) + minetest.register_craft({ + output = 'fences:' .. name .. ' ' .. craftoutput, + recipe = { + {craftitem, craftitem, craftitem}, + {craftitem, craftitem, craftitem}, + } + }) +end + + +fences.register_fence("wood", "default_wood.png", "Wooden Fence", "group:stick", 2, + {choppy=2, oddly_breakable_by_hand=2, flammable=2}, default.node_sound_wood_defaults()) +fences.register_fence("cobble", "default_cobble.png", "Cobblestone Fence", "default:cobble", 4, + {cracky=3, stone=2}, default.node_sound_stone_defaults()) +fences.register_fence("desert_cobble", "default_desert_cobble.png", "Desert Cobblestone Fence", "default:desert_cobble", 4, + {cracky=3, stone=2}, default.node_sound_stone_defaults()) +fences.register_fence("sandstone", "default_sandstone.png", "Sandstone Fence", "default:sandstone", 4, + {crumbly=2, cracky=3}, default.node_sound_stone_defaults()) +fences.register_fence("stonebrick", "default_stone_brick.png", "Stone Brick Fence", "default:stonebrick", 4, + {cracky=2, stone=1}, default.node_sound_stone_defaults()) +fences.register_fence("sandstonebrick", "default_sandstone_brick.png", "Sandstone Brick Fence", "default:sandstonebrick", 4, + {cracky=2}, default.node_sound_stone_defaults()) +fences.register_fence("desert_stonebrick", "default_desert_stone_brick.png", "Desert Stone Brick Fence", "default:desert_stonebrick", 4, + {cracky=2, stone=1}, default.node_sound_stone_defaults()) + + +minetest.register_craft({ + type = "fuel", + recipe = "fences:wood", + burntime = 15, +}) + +minetest.register_alias("default:fence_wood", "fences:wood") + diff --git a/mods/fence/textures/fence_overlay.png b/mods/fences/textures/fences_overlay.png similarity index 100% rename from mods/fence/textures/fence_overlay.png rename to mods/fences/textures/fences_overlay.png