Clean-up this mess and add hedges (fixes #10)

includes updating mod.conf, finally removing unused register.lua and stuff

README.md

@@ -65,6 +65,19 @@ Paths are nearly carpet size blocks, on which you can walk. Uses corresponding f
 
 ![Screenshot](https://i.ibb.co/G53JJhG/Webp-net-gifmaker-7.gif "Crafting")
 
+### Hedges
+This mod has 6 types of them: Oak, Dark Oak, Jungle, Acacia, Spruce and Birch paths.
+Hedges are like normal wooden fences, but made out from leaves.
+Uses corresponding for its' type leaf and sticks for crafting.
+
+**Screenshot:**
+
+*Will be soon...*
+
+**Craft:**
+
+*Will be soon...*
+
 ### Coalquartz Tile
 Coalquartz tile is 1x1 size block, that looks and acts like coal and quartz blocks were combined. Uses coal and quartz items for crafting. Has slab and stair variants too!
 

colored.lua

@@ -3,7 +3,7 @@
 local S = minetest.get_translator(minetest.get_current_modname())
 
 mcl_decor.colors = {
---   color,        wool texture,          armchair desc,            curtains desc,            dyed planks desc,       dye,          colorgroup              hexcolor
+--   color,        wool texture,          armchair desc,            curtains desc,            dyed planks desc,       dye,          colorgroup,             hexcolor
 	{"white",      "wool_white",          S("White Armchair"),      S("White Curtains"),      S("White Planks"),      "white",      "unicolor_white",       "#EDEDED"},
 	{"grey",       "wool_dark_grey",      S("Grey Armchair"),       S("Grey Curtains"),       S("Grey Planks"),       "dark_grey",  "unicolor_darkgrey",    "#5F5F5F"},
 	{"silver",     "wool_grey",           S("Light Grey Armchair"), S("Light Grey Curtains"), S("Light Grey Planks"), "grey",       "unicolor_grey",        "#8C8C8C"},

hedges.lua

@@ -0,0 +1,31 @@
+-- mcl_decor/hedges.lua
+
+local S = minetest.get_translator(minetest.get_current_modname())
+
+-- API
+function mcl_decor.register_hedge(name, desc, material, tiles)
+	mcl_fences.register_fence(name .. "_hedge", desc, tiles, {handy = 1, axey = 1, hedge = 1, deco_block = 1, flammable = 2, fire_encouragement = 10, fire_flammability = 10}, 1, 1, {"group:hedge"}, mcl_sounds.node_sound_wood_defaults())
+	minetest.register_craft({
+		output = "mcl_decor:" .. name .. "_hedge" .. " 6",
+		recipe = {
+			{material, "mcl_core:stick", material},
+			{material, "mcl_core:stick", material},
+		}
+	})
+end
+
+
+
+-- REGISTER
+mcl_decor.register_hedge("oak", S("Oak Hedge"), "mcl_core:leaves", "default_leaves.png")
+mcl_decor.register_hedge("dark", S("Dark Oak Hedge"), "mcl_core:darkleaves", "mcl_core_leaves_big_oak.png")
+mcl_decor.register_hedge("jungle", S("Jungle Hedge"), "mcl_core:jungleleaves", "default_jungleleaves.png")
+mcl_decor.register_hedge("acacia", S("Acacia Hedge"), "mcl_core:acacialeaves", "default_acacia_leaves.png")
+mcl_decor.register_hedge("spruce", S("Spruce Hedge"), "mcl_core:spruceleaves", "mcl_core_leaves_spruce.png")
+mcl_decor.register_hedge("birch", S("Birch Hedge"), "mcl_core:birchleaves", "mcl_core_leaves_birch.png")
+
+minetest.register_craft({
+	type = "fuel",
+	recipe = "group:hedge",
+	burntime = 5,
+})

init.lua

@@ -8,4 +8,5 @@ dofile(modpath.."/api.lua")
 dofile(modpath.."/wooden.lua")
 dofile(modpath.."/colored.lua")
 dofile(modpath.."/paths.lua")
+dofile(modpath.."/hedges.lua")
 dofile(modpath.."/misc.lua")

mod.conf

@@ -1,4 +1,5 @@
+title = MineClone2 Furniture and decorations mod
 name = mcl_decor
 description = Adds more decoration and furniture blocks to MineClone 2 (5)
-depends = mcl_core, mcl_torches, mcl_player, mcl_sounds, mcl_dye, mcl_nether, mcl_stairs, mcl_title
+depends = mcl_core, mcl_torches, mcl_player, mcl_sounds, mcl_dye, mcl_nether, mcl_stairs, mcl_title, mcl_fences
 optional_depends = mcl_cozy, mcl_mushroom, mcl_deepslate

paths.lua

@@ -57,7 +57,6 @@ end
 
 
 
---=-- REGISTER --=--
 mcl_decor.register_path(
 	"gravel",
 	S("Gravel Path"),

register.lua

@@ -1,210 +0,0 @@
--- mcl_decor/register.lua
-
-local S = minetest.get_translator(minetest.get_current_modname())
-
---- Coalquartz Tile ---
-minetest.register_node("mcl_decor:coalquartz_tile", {
-    description = S("Coalquartz Tile"),
-    tiles = {"mcl_decor_coalquartz_tile.png"},
-	is_ground_content = false,
-	groups = {pickaxey=1, flammable=1, quartz_block=1, building_block=1, material_stone=1, fire_encouragement=5, fire_flammability=5},
-	sounds = mcl_sounds.node_sound_stone_defaults(),
-	_mcl_blast_resistance = 4,
-	_mcl_hardness = 3,
-})
-minetest.register_craft({
-	output = "mcl_decor:coalquartz_tile",
-	recipe = {
-		{"mcl_core:coal_lump", "mcl_nether:quartz"},
-		{"mcl_nether:quartz", "mcl_core:coal_lump"}
-	}
-})
-minetest.register_craft({
-	output = "mcl_decor:coalquartz_tile",
-	recipe = {
-		{"mcl_nether:quartz", "mcl_core:coal_lump"},
-		{"mcl_core:coal_lump", "mcl_nether:quartz"}
-	}
-})
-mcl_stairs.register_stair_and_slab_simple("coalquartz_tile", "mcl_decor:coalquartz_tile", S("Coalquartz Stair"), S("Coalquartz Slab"), S("Double Coalquartz Slab"))
-
---- Paths ---
-mcl_decor.register_path(
-	"mcl_decor:gravel_path",
-	S("Gravel Path"),
-	"mcl_core:gravel",
-	"default_gravel.png",
-	"shovely",
-	mcl_sounds.node_sound_dirt_defaults({footstep = {name="default_gravel_footstep", gain=0.45}})
-)
-mcl_decor.register_path(
-	"mcl_decor:cobble_path",
-	S("Cobblestone Path"),
-	"mcl_core:cobble",
-	"default_cobble.png",
-	"pickaxey",
-	mcl_sounds.node_sound_stone_defaults()
-)
-mcl_decor.register_path(
-	"mcl_decor:stone_path",
-	S("Stone Path"),
-	"mcl_core:stone",
-	"default_stone.png",
-	"pickaxey",
-	mcl_sounds.node_sound_stone_defaults()
-)
-mcl_decor.register_path(
-	"mcl_decor:granite_path",
-	S("Granite Path"),
-	"mcl_core:granite",
-	"mcl_core_granite.png",
-	"pickaxey",
-	mcl_sounds.node_sound_stone_defaults()
-)
-mcl_decor.register_path(
-	"mcl_decor:andesite_path",
-	S("Andesite Path"),
-	"mcl_core:andesite",
-	"mcl_core_andesite.png",
-	"pickaxey",
-	mcl_sounds.node_sound_stone_defaults()
-)
-mcl_decor.register_path(
-	"mcl_decor:diorite_path",
-	S("Diorite Path"),
-	"mcl_core:diorite",
-	"mcl_core_diorite.png",
-	"pickaxey",
-	mcl_sounds.node_sound_stone_defaults()
-)
-mcl_decor.register_path(
-	"mcl_decor:netherrack_path",
-	S("Netherrack Path"),
-	"mcl_nether:netherrack",
-	"mcl_nether_netherrack.png",
-	"pickaxey",
-	mcl_sounds.node_sound_stone_defaults()
-)
-
-
-
---- Table Lamp ---
-minetest.register_node("mcl_decor:table_lamp", {
-	description = S("Table Lamp"),
-	tiles = {"mcl_decor_table_lamp.png", "mcl_decor_table_lamp_bottom.png", "mcl_decor_table_lamp_side.png",
-		"mcl_decor_table_lamp_side.png", "mcl_decor_table_lamp_side.png", "mcl_decor_table_lamp_side.png"},
-	drawtype = "nodebox",
-	paramtype = "light",
-	stack_max = 64,
-	node_box = {
-		type = "fixed",
-		fixed = {
-			{-0.25, -0.5, -0.25, 0.25, -0.375, 0.25},
-			{-0.0625, -0.375, -0.0625, 0.0625, 0, 0.0625},
-			{-0.3125, 0, -0.3125, 0.3125, 0.5, 0.3125},
-		}
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.3125, -0.5, -0.3125, 0.3125, 0.5, 0.3125},
-	},
-	is_ground_content = false,
-	light_source = minetest.LIGHT_MAX,
-	groups = {handy=1, axey=1, attached_node=1, material_wood=1, deco_block=1, flammable=-1},
-	sounds = mcl_sounds.node_sound_wood_defaults(),
-	_mcl_blast_resistance = 0.9,
-	_mcl_hardness = 0.9,
-})
-minetest.register_craft({
-	output = "mcl_decor:table_lamp 3",
-	recipe = {
-		{"group:wool", "group:wool", "group:wool"},
-		{"group:wool", "mcl_torches:torch", "group:wool"},
-		{"mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble"}
-	}
-})
-
-
-
---- Tables and Chairs ---
-mcl_decor.register_chair_and_table("wooden", S("Oak Chair"), S("Oak Table"), "mcl_core:wood", "default_wood.png")
-mcl_decor.register_chair_and_table("dark_oak", S("Dark Oak Chair"), S("Dark Oak Table"), "mcl_core:darkwood", "mcl_core_planks_big_oak.png")
-mcl_decor.register_chair_and_table("jungle", S("Jungle Chair"), S("Jungle Table"), "mcl_core:junglewood", "default_junglewood.png")
-mcl_decor.register_chair_and_table("spruce", S("Spruce Chair"), S("Spruce Table"), "mcl_core:sprucewood", "mcl_core_planks_spruce.png")
-mcl_decor.register_chair_and_table("acacia", S("Acacia Chair"), S("Acacia Table"), "mcl_core:acaciawood", "default_acacia_wood.png")
-mcl_decor.register_chair_and_table("birch", S("Birch Chair"), S("Birch Table"), "mcl_core:birchwood", "mcl_core_planks_birch.png")
-
-mcl_decor.register_slab_table("wooden", S("Oak Slab Table"), "mcl_core:wood", "default_wood.png")
-mcl_decor.register_slab_table("dark_oak", S("Dark Oak Slab Table"), "mcl_core:darkwood", "mcl_core_planks_big_oak.png")
-mcl_decor.register_slab_table("jungle", S("Jungle Slab Table"), "mcl_core:junglewood", "default_junglewood.png")
-mcl_decor.register_slab_table("spruce", S("Spruce Slab Table"), "mcl_core:sprucewood", "mcl_core_planks_spruce.png")
-mcl_decor.register_slab_table("acacia", S("Acacia Slab Table"), "mcl_core:acaciawood", "default_acacia_wood.png")
-mcl_decor.register_slab_table("birch", S("Birch Slab Table"), "mcl_core:birchwood", "mcl_core_planks_birch.png")
-
--- support for MineClone 5
-if minetest.get_modpath("mcl_mushroom") then
-	mcl_decor.register_chair_and_table("crimson", S("Crimson Chair"), S("Crimson Table"), "mcl_mushroom:crimson_hyphae_wood", "crimson_hyphae_wood.png", "1")
-	mcl_decor.register_chair_and_table("warped", S("Warped Chair"), S("Warped Table"), "mcl_mushroom:warped_hyphae_wood", "warped_hyphae_wood.png", "1")
-	mcl_decor.register_slab_table("crimson", S("Crimson Slab Table"), "mcl_mushroom:crimson_hyphae_wood", "crimson_hyphae_wood.png", "1")
-	mcl_decor.register_slab_table("warped", S("Warped Slab Table"), "mcl_mushroom:warped_hyphae_wood", "warped_hyphae_wood.png", "1")
-end
-
-
-
---- Armchairs ---
-mcl_decor.register_armchair("white", S("White Armchair"), "wool_white.png", "white", "unicolor_white")
-mcl_decor.register_armchair("grey", S("Grey Armchair"), "wool_dark_grey.png", "dark_grey", "unicolor_darkgrey")
-mcl_decor.register_armchair("silver", S("Light Grey Armchair"), "wool_grey.png", "grey", "unicolor_grey")
-mcl_decor.register_armchair("black", S("Black Armchair"), "wool_black.png", "black", "unicolor_black")
-mcl_decor.register_armchair("red", S("Red Armchair"), "wool_red.png", "red", "unicolor_red")
-mcl_decor.register_armchair("yellow", S("Yellow Armchair"), "wool_yellow.png", "yellow", "unicolor_yellow")
-mcl_decor.register_armchair("green", S("Green Armchair"), "wool_dark_green.png", "dark_green", "unicolor_dark_green")
-mcl_decor.register_armchair("cyan", S("Cyan Armchair"), "wool_cyan.png", "cyan", "unicolor_cyan")
-mcl_decor.register_armchair("blue", S("Blue Armchair"), "wool_blue.png", "blue", "unicolor_blue")
-mcl_decor.register_armchair("magenta", S("Magenta Armchair"), "wool_magenta.png", "magenta", "unicolor_red_violet")
-mcl_decor.register_armchair("orange", S("Orange Armchair"), "wool_orange.png", "orange", "unicolor_orange")
-mcl_decor.register_armchair("purple", S("Purple Armchair"), "wool_violet.png", "violet", "unicolor_violet")
-mcl_decor.register_armchair("brown", S("Brown Armchair"), "wool_brown.png", "brown", "unicolor_dark_orange")
-mcl_decor.register_armchair("pink", S("Pink Armchair"), "wool_pink.png", "pink", "unicolor_light_red")
-mcl_decor.register_armchair("lime", S("Lime Armchair"), "mcl_wool_lime.png", "green", "unicolor_green")
-mcl_decor.register_armchair("light_blue", S("Light Blue Armchair"), "mcl_wool_light_blue.png", "lightblue", "unicolor_light_blue")
-
-
-
---- Curtains ---
-mcl_decor.register_curtains("white", S("White Curtains"), "mcl_wool:white", "wool_white.png", "white", "unicolor_white")
-mcl_decor.register_curtains("grey", S("Grey Curtains"), "mcl_wool:grey", "wool_dark_grey.png", "dark_grey", "unicolor_darkgrey")
-mcl_decor.register_curtains("silver", S("Light Grey Curtains"), "mcl_wool:silver", "wool_grey.png", "grey", "unicolor_grey")
-mcl_decor.register_curtains("black", S("Black Curtains"), "mcl_wool:black", "wool_black.png", "black", "unicolor_black")
-mcl_decor.register_curtains("red", S("Red Curtains"), "mcl_wool:red", "wool_red.png", "red", "unicolor_red")
-mcl_decor.register_curtains("yellow", S("Yellow Curtains"), "mcl_wool:yellow", "wool_yellow.png", "yellow", "unicolor_yellow")
-mcl_decor.register_curtains("green", S("Green Curtains"), "mcl_wool:green", "wool_dark_green.png", "dark_green", "unicolor_dark_green")
-mcl_decor.register_curtains("cyan", S("Cyan Curtains"), "mcl_wool:cyan", "wool_cyan.png", "cyan", "unicolor_cyan")
-mcl_decor.register_curtains("blue", S("Blue Curtains"), "mcl_wool:blue", "wool_blue.png", "blue", "unicolor_blue")
-mcl_decor.register_curtains("magenta", S("Magenta Curtains"), "mcl_wool:magenta", "wool_magenta.png", "magenta", "unicolor_red_violet")
-mcl_decor.register_curtains("orange", S("Orange Curtains"), "mcl_wool:orange", "wool_orange.png", "orange", "unicolor_orange")
-mcl_decor.register_curtains("purple", S("Purple Curtains"), "mcl_wool:purple", "wool_violet.png", "violet", "unicolor_violet")
-mcl_decor.register_curtains("brown", S("Brown Curtains"), "mcl_wool:brown", "wool_brown.png", "brown", "unicolor_dark_orange")
-mcl_decor.register_curtains("pink", S("Pink Curtains"), "mcl_wool:pink", "wool_pink.png", "pink", "unicolor_light_red")
-mcl_decor.register_curtains("lime", S("Lime Curtains"), "mcl_wool:lime", "mcl_wool_lime.png", "green", "unicolor_green")
-mcl_decor.register_curtains("light_blue", S("Light Blue Curtains"), "mcl_wool:light_blue", "mcl_wool_light_blue.png", "lightblue", "unicolor_light_blue")
-
-
-
---- Dyed Planks ---
-mcl_decor.register_dyed_planks("white", S("White Planks"), "#EDEDED", "white", "unicolor_white")
-mcl_decor.register_dyed_planks("grey", S("Grey Planks"), "#5F5F5F", "dark_grey", "unicolor_darkgrey")
-mcl_decor.register_dyed_planks("silver", S("Light Grey Planks"), "#8C8C8C", "grey", "unicolor_grey")
-mcl_decor.register_dyed_planks("black", S("Black Planks"), "#030303", "black", "unicolor_black")
-mcl_decor.register_dyed_planks("red", S("Red Planks"), "#BD0000", "red", "unicolor_red")
-mcl_decor.register_dyed_planks("yellow", S("Yellow Planks"), "#EBD800", "yellow", "unicolor_yellow")
-mcl_decor.register_dyed_planks("green", S("Green Planks"), "#086400", "dark_green", "unicolor_dark_green")
-mcl_decor.register_dyed_planks("cyan", S("Cyan Planks"), "#00C4B4", "cyan", "unicolor_cyan")
-mcl_decor.register_dyed_planks("blue", S("Blue Planks"), "#0B1E80", "blue", "unicolor_blue")
-mcl_decor.register_dyed_planks("magenta", S("Magenta Planks"), "#954395", "magenta", "unicolor_red_violet")
-mcl_decor.register_dyed_planks("orange", S("Orange Planks"), "#E68200", "orange", "unicolor_orange")
-mcl_decor.register_dyed_planks("purple", S("Purple Planks"), "#461A6D", "violet", "unicolor_violet")
-mcl_decor.register_dyed_planks("brown", S("Brown Planks"), "#432209", "brown", "unicolor_dark_orange")
-mcl_decor.register_dyed_planks("pink", S("Pink Planks"), "#ED9BB4", "pink", "unicolor_light_red")
-mcl_decor.register_dyed_planks("lime", S("Lime Planks"), "#B3DF86", "green", "unicolor_green")
-mcl_decor.register_dyed_planks("light_blue", S("Light Blue Planks"), "#72A4D4", "lightblue", "unicolor_light_blue")

wooden.lua

@@ -148,7 +148,6 @@ end
 
 
 
---=-- REGISTER --=--
 mcl_decor.register_chair_and_table("wooden", S("Oak Chair"), S("Oak Table"), "mcl_core:wood", "default_wood.png")
 mcl_decor.register_chair_and_table("dark_oak", S("Dark Oak Chair"), S("Dark Oak Table"), "mcl_core:darkwood", "mcl_core_planks_big_oak.png")
 mcl_decor.register_chair_and_table("jungle", S("Jungle Chair"), S("Jungle Table"), "mcl_core:junglewood", "default_junglewood.png")