Version MFF.

aliases.lua

@@ -10,6 +10,37 @@ minetest.register_alias("sweeper", "moreblocks:sweeper")
 minetest.register_alias("circular_saw", "moreblocks:circular_saw")
 minetest.register_alias("jungle_stick", "moreblocks:jungle_stick")
 
+-- Wrong drops
+
+-- //MFF(Mg|10/11/15)
+
+-- Microblocks
+for _,i in pairs({"", "_1", "_2", "_4", "_12", "_14", "_15"}) do
+	minetest.register_alias("moreblocks:micro_clay_brick" .. i, "moreblocks:micro_brick" .. i)
+end
+
+-- Panels
+for _,i in pairs({"", "_1", "_2", "_4", "_12", "_14", "_15"}) do
+	minetest.register_alias("moreblocks:panel_clay_brick" .. i, "moreblocks:panel_brick" .. i)
+end
+
+-- Slabs
+for _,i in pairs({"", "_1", "_2", "_quarter", "_three_quarter", "_14", "_15"}) do
+	minetest.register_alias("moreblocks:slab_clay_brick" .. i, "moreblocks:slab_brick" .. i)
+end
+
+-- Stairs
+for _,i in pairs({"", "_outer", "_inner", "_alt", "_alt_1", "_alt_2", "_alt_4", "_half"}) do
+	minetest.register_alias("moreblocks:stair_clay_brick" .. i, "moreblocks:stair_brick" .. i)
+end
+
+-- Slopes
+for _,i in pairs({"", "_half", "_half_raised", "_outer", "_outer_cut", "_outer_cut_half", "_outer_half", "_outer_half_raised", "_inner", "_inner_half", "_inner_half_raised"}) do
+	minetest.register_alias("moreblocks:slope_clay_brick" .. i, "moreblocks:slope_brick" .. i)
+end
+
+
+
 -- Old block/item replacement:
 minetest.register_alias("moreblocks:oerkkiblock", "default:mossycobble")
 minetest.register_alias("moreblocks:screwdriver", "screwdriver:screwdriver")
@@ -59,20 +90,17 @@ minetest.register_alias("moreblocks:allfacestree","moreblocks:all_faces_tree")
 local horizontal_tree_convert_facedir = {7, 12, 9, 18}
 
 minetest.register_abm({
-	nodenames = {"moreblocks:horizontal_tree","moreblocks:horizontal_jungle_tree"},
+	nodenames = {"moreblocks:horizontal_tree"},
 	interval = 1,
 	chance = 1,
 	action = function(pos, node)
-		if node.name == "moreblocks:horizontal_tree" then
-			node.name = "default:tree"
-		else
-			node.name = "default:jungletree"
-		end
 		node.param2 = node.param2 < 3 and node.param2 or 0
 		minetest.set_node(pos, {
-			name = node.name,
+			name = "default:tree",
 			param2 = horizontal_tree_convert_facedir[node.param2 + 1]
 		})
 	end,
 })
 
+minetest.register_alias("moreblocks:jungle_stick", "default:stick")
+minetest.register_alias("moreblocks:fence_jungle_wood", "default:fence_junglewood")

circular_saw.lua

@@ -31,36 +31,33 @@ circular_saw.cost_in_microblocks = {
 	6, 2, 1, 3, 4,
 }
 
+-- This parameter is legacy node
 circular_saw.names = {
 	{"micro", "_1"},
 	{"panel", "_1"},
-	{"micro", "_2"},
-	{"panel", "_2"},
-	{"micro", "_4"},
-	{"panel", "_4"},
 	{"micro", ""},
 	{"panel", ""},
+
 	{"micro", "_12"},
 	{"panel", "_12"},
-	{"micro", "_14"},
-	{"panel", "_14"},
 	{"micro", "_15"},
 	{"panel", "_15"},
+
 	{"stair", "_outer"},
 	{"stair", ""},
 	{"stair", "_inner"},
+
 	{"slab", "_1"},
-	{"slab", "_2"},
 	{"slab", "_quarter"},
 	{"slab", ""},
 	{"slab", "_three_quarter"},
-	{"slab", "_14"},
 	{"slab", "_15"},
+
 	{"stair", "_half"},
 	{"stair", "_alt_1"},
-	{"stair", "_alt_2"},
 	{"stair", "_alt_4"},
 	{"stair", "_alt"},
+
 	{"slope", ""},
 	{"slope", "_half"},
 	{"slope", "_half_raised"},
@@ -100,6 +97,7 @@ function circular_saw:get_output_inv(modname, material, amount, max)
 
 	for i = 1, #circular_saw.names do
 		local t = circular_saw.names[i]
+		if not t[3] then
 			local cost = circular_saw.cost_in_microblocks[i]
 			local balance = math.min(math.floor(amount/cost), max)
 			local nodename = modname .. ":" .. t[1] .. "_" .. material .. t[2]
@@ -108,6 +106,7 @@ function circular_saw:get_output_inv(modname, material, amount, max)
 				list[pos] = nodename .. " " .. balance
 			end
 		end
+	end
 	return list
 end
 

crafting.lua

@@ -23,16 +23,10 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "default:wood",
 	recipe = {
-		{"default:stick", "default:stick"},
-		{"default:stick", "default:stick"},
-	}
-})
-
-minetest.register_craft({
-	output = "default:junglewood",
-	recipe = {
-		{"moreblocks:jungle_stick", "moreblocks:jungle_stick"},
-		{"moreblocks:jungle_stick", "moreblocks:jungle_stick"},
+		{"default:stick", "default:stick", "default:stick"},
+		{"default:stick", "default:stick", "default:stick"},
+		{"default:stick", "default:stick", "default:stick"}
+		-- MODIFICATION MADE FOR MFF ^
 	}
 })
 
@@ -121,19 +115,6 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "moreblocks:junglestick 4",
-	recipe = {{"default:junglewood"},}
-})
-
-minetest.register_craft({
-	output = "moreblocks:fence_jungle_wood 2",
-	recipe = {
-		{"moreblocks:jungle_stick", "moreblocks:jungle_stick", "moreblocks:jungle_stick"},
-		{"moreblocks:jungle_stick", "moreblocks:jungle_stick", "moreblocks:jungle_stick"},
-	}
-})
-
 minetest.register_craft({
 	output = "moreblocks:circle_stone_bricks 8",
 	recipe = {
@@ -440,14 +421,14 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "moreblocks:cobble_compressed",
 	recipe = {
-		{"default:cobble", "default:cobble", "default:cobble"},
-		{"default:cobble", "default:cobble", "default:cobble"},
-		{"default:cobble", "default:cobble", "default:cobble"},
+		{"default:cobble"},
+		{"default:cobble"},
+		-- MODIFICATION MADE FOR MFF
 	}
 })
 
 minetest.register_craft({
-	output = "default:cobble 9",
+	output = "default:cobble 2", -- MODIFICATION MADE FOR MFF
 	recipe = {
 		{"moreblocks:cobble_compressed"},
 	}
@@ -467,3 +448,30 @@ if minetest.setting_getbool("moreblocks.circular_saw_crafting") ~= false then --
 		}
 	})
 end
+
+-- MODIFICATION MADE FOR MFF //MFF(Mg|08/09/15)
+
+
+minetest.register_craft({
+	output = "moreblocks:horizontal_jungle_tree 2",
+	recipe = {
+		{"default:jungletree", "", "default:jungletree"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:jungletree 2",
+	recipe = {
+		{"moreblocks:horizontal_jungle_tree"},
+		{"moreblocks:horizontal_jungle_tree"},
+	}
+})
+
+minetest.register_craft({
+	output = "default:junglewood 4",
+	recipe = {
+		{"moreblocks:horizontal_jungle_tree"},
+	}
+})
+
+-- END OF MODIFICATIONS

nodes.lua

@@ -137,8 +137,7 @@ local nodes = {
 	["iron_glass"] = {
 		description = S("Iron Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_iron_glass.png", "moreblocks_iron_glass_detail.png"},
-		tiles = {"moreblocks_iron_glass.png"},
+		tiles = {"moreblocks_iron_glass.png", "moreblocks_iron_glass_detail.png"}, --MFF connected glass
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -147,8 +146,7 @@ local nodes = {
 	["coal_glass"] = {
 		description = S("Coal Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_coal_glass.png", "moreblocks_coal_glass_detail.png"},
-		tiles = {"moreblocks_coal_glass.png"},
+		tiles = {"moreblocks_coal_glass.png", "moreblocks_coal_glass_detail.png"}, --MFF connected glass
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -157,8 +155,7 @@ local nodes = {
 	["clean_glass"] = {
 		description = S("Clean Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"},
-		tiles = {"moreblocks_clean_glass.png"},
+		tiles = {"moreblocks_clean_glass.png", "moreblocks_clean_glass_detail.png"}, --MFF connected glass
 		paramtype = "light",
 		sunlight_propagates = true,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
@@ -230,8 +227,7 @@ local nodes = {
 	["trap_glass"] = {
 		description = S("Trap Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"},
-		tiles = {"moreblocks_trap_glass.png"},
+		tiles = {"moreblocks_trap_glass.png", "default_glass_detail.png"}, --MFF connected glass
 		paramtype = "light",
 		sunlight_propagates = true,
 		walkable = false,
@@ -239,21 +235,6 @@ local nodes = {
 		sounds = sound_glass,
 		no_stairs = true,
 	},
-	["fence_jungle_wood"] = {
-		description = S("Jungle Wood Fence"),
-		drawtype = "fencelike",
-		tiles = {"default_junglewood.png"},
-		inventory_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126",
-		wield_image = "default_fence_overlay.png^default_junglewood.png^default_fence_overlay.png^[makealpha:255,126,126",
-		paramtype = "light",
-		selection_box = {
-			type = "fixed",
-			fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
-		},
-		groups = {snappy = 2, choppy = 2, oddly_breakable_by_hand = 2, flammable = 2},
-		sounds = sound_wood,
-		no_stairs = true,
-	},
 	["all_faces_tree"] = {
 		description = S("All-faces Tree"),
 		tiles = {"default_tree_top.png"},
@@ -268,11 +249,23 @@ local nodes = {
 		sounds = sound_wood,
 		furnace_burntime = 30,
 	},
+	["horizontal_jungle_tree"] = {
+		description = S("Horizontal Jungle Tree"),
+		tiles = {"default_jungletree.png",
+		"default_jungletree.png",
+		"default_jungletree.png^[transformR90",
+		"default_jungletree.png^[transformR90",
+		"default_jungletree_top.png",
+		"default_jungletree_top.png"},
+		paramtype2 = "facedir",
+		groups = {tree=1,snappy=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
+		sounds = sound_wood,
+		furnace_burntime = 30,
+	},
 	["glow_glass"] = {
 		description = S("Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_glow_glass.png", "moreblocks_glow_glass_detail.png"},
-		tiles = {"moreblocks_glow_glass.png"},
+		tiles = {"moreblocks_glow_glass.png", "moreblocks_glow_glass_detail.png"}, --MFF connected glass
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 11,
@@ -282,8 +275,7 @@ local nodes = {
 	["trap_glow_glass"] = {
 		description = S("Trap Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_trap_glass.png", "moreblocks_glow_glass_detail.png"},
-		tiles = {"moreblocks_trap_glass.png"},
+		tiles = {"moreblocks_trap_glass.png", "moreblocks_glow_glass_detail.png"}, --MFF connected glass
 		paramtype = "light",
 		sunlight_propagates = true,
 		light_source = 11,
@@ -295,22 +287,20 @@ local nodes = {
 	["super_glow_glass"] = {
 		description = S("Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
-		tiles = {"moreblocks_super_glow_glass.png"},
+		tiles = {"moreblocks_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"}, --MFF connected glass
 		paramtype = "light",
 		sunlight_propagates = true,
-		light_source = 15,
+		light_source = default.LIGHT_MAX,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
 	},
 	["trap_super_glow_glass"] = {
 		description = S("Trap Super Glow Glass"),
 		drawtype = "glasslike_framed_optional",
-		--tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"},
-		tiles = {"moreblocks_trap_super_glow_glass.png"},
+		tiles = {"moreblocks_trap_super_glow_glass.png", "moreblocks_super_glow_glass_detail.png"}, --MFF connected glass
 		paramtype = "light",
 		sunlight_propagates = true,
-		light_source = 15,
+		light_source = default.LIGHT_MAX,
 		walkable = false,
 		groups = {snappy = 2, cracky = 3, oddly_breakable_by_hand = 3},
 		sounds = sound_glass,
@@ -359,12 +349,6 @@ minetest.register_craftitem("moreblocks:sweeper", {
 	inventory_image = "moreblocks_sweeper.png",
 })
 
-minetest.register_craftitem("moreblocks:jungle_stick", {
-	description = S("Jungle Stick"),
-	inventory_image = "moreblocks_junglestick.png",
-	groups = {stick= 1},
-})
-
 minetest.register_craftitem("moreblocks:nothing", {
 	inventory_image = "invisible.png",
 	on_use = function() end,

redefinitions.lua

@@ -10,9 +10,9 @@ Licensed under the zlib license. See LICENSE.md for more information.
 minetest.register_craft({
 	output = "default:sign_wall 4",
 	recipe = {
-		{"default:wood", "default:wood", "default:wood"},
-		{"default:wood", "default:wood", "default:wood"},
-		{"", "default:stick", ""},
+		{"group:wood", "group:wood", "group:wood"},
+		{"group:wood", "group:wood", "group:wood"},
+		{"", "group:stick", ""},
 	}
 })
 
@@ -32,14 +32,14 @@ minetest.register_craft({
 	}
 })
 
-minetest.register_craft({
-	output = "default:rail 24",
+--[[minetest.register_craft({
+	output = "default:rail 16", -- /MFF (Mg|06/10/15) => (Ombridride|26/07/15)
 	recipe = {
 		{"default:steel_ingot", "", "default:steel_ingot"},
 		{"default:steel_ingot", "default:stick", "default:steel_ingot"},
 		{"default:steel_ingot", "", "default:steel_ingot"},
 	}
-})
+})--]]
 
 minetest.register_craft({
 	type = "toolrepair",

stairsplus/microblocks.lua

@@ -34,30 +34,15 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
 				fixed = {-0.5, -0.5, 0, 0, -0.4375, 0.5},
 			},
 		},
-		["_2"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0, -0.375, 0.5},
-			},
-		},
-		["_4"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0, -0.25, 0.5},
-			},
-		},
+		["_2"] = {legacy = "_1"},
+		["_4"] = {legacy = ""},
 		["_12"] = {
 			node_box = {
 				type = "fixed",
 				fixed = {-0.5, -0.5, 0, 0, 0.25, 0.5},
 			},
 		},
-		["_14"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0, 0.375, 0.5},
-			},
-		},
+		["_14"] = {legacy = "_15"},
 		["_15"] = {
 			node_box = {
 				type = "fixed",
@@ -68,6 +53,10 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
 
 	local desc = S("%s Microblock"):format(fields.description)
 	for alternate, def in pairs(defs) do
+		if def.legacy then
+			minetest.register_alias(modname .. ":micro_" .. subname .. alternate,
+				modname .. ":micro_" .. subname .. def.legacy)
+		else
 			for k, v in pairs(fields) do
 				def[k] = v
 			end
@@ -82,6 +71,7 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
 			end
 			minetest.register_node(":" ..modname.. ":micro_" ..subname..alternate, def)
 		end
+	end
 	minetest.register_alias(modname.. ":micro_" ..subname.. "_bottom", modname.. ":micro_" ..subname)
 
 	circular_saw.known_nodes[recipeitem] = {modname, subname}

stairsplus/panels.lua

@@ -34,30 +34,15 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 				fixed = {-0.5, -0.5, 0, 0.5, -0.4375, 0.5},
 			},
 		},
-		["_2"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0.5, -0.375, 0.5},
-			},
-		},
-		["_4"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0.5, -0.25, 0.5},
-			},
-		},
+		["_2"] = {legacy = "_1"},
+		["_4"] = {legacy = ""},
 		["_12"] = {
 			node_box = {
 				type = "fixed",
 				fixed = {-0.5, -0.5, 0, 0.5, 0.25, 0.5},
 			},
 		},
-		["_14"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {-0.5, -0.5, 0, 0.5, 0.375, 0.5},
-			},
-		},
+		["_14"] = {legacy = "_15"},
 		["_15"] = {
 			node_box = {
 				type = "fixed",
@@ -68,6 +53,10 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 
 	local desc = S("%s Panel"):format(fields.description)
 	for alternate, def in pairs(defs) do
+		if def.legacy then
+			minetest.register_alias(modname .. ":panel_" .. subname .. alternate,
+				modname .. ":panel_" .. subname .. def.legacy)
+		else
 			for k, v in pairs(fields) do
 				def[k] = v
 			end
@@ -82,6 +71,7 @@ function stairsplus:register_panel(modname, subname, recipeitem, fields)
 			end
 			minetest.register_node(":" ..modname.. ":panel_" ..subname..alternate, def)
 		end
+	end
 	minetest.register_alias(modname.. ":panel_" ..subname.. "_bottom", modname.. ":panel_" ..subname)
 
 	circular_saw.known_nodes[recipeitem] = {modname, subname}

stairsplus/registrations.lua

@@ -26,6 +26,8 @@ local default_nodes = { -- Default stairs/slabs/panels/microblocks:
 	"junglewood",
 	"pine_tree",
 	"pine_wood",
+	"cherry_tree",
+	"cherry_plank",
 	"acacia_tree",
 	"acacia_wood",
 	"obsidian",
@@ -42,7 +44,7 @@ for _, name in pairs(default_nodes) do
 	if ndef then
 		local drop
 		if type(ndef.drop) == "string" then
-			drop = ndef.drop:sub(9)
+			drop = ndef.drop:split(" ")[1]:sub(9)
 		end
 
 		local tiles = ndef.tiles

stairsplus/slabs.lua

@@ -26,13 +26,17 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
 		["_quarter"] = 4,
 		["_three_quarter"] = 12,
 		["_1"] = 1,
-		["_2"] = 2,
-		["_14"] = 14,
+		["_2"] = "_1",
+		["_14"] = "_three_quarter",
 		["_15"] = 15,
 	}
 
 	local desc_base = S("%s Slab"):format(fields.description)
 	for alternate, num in pairs(defs) do
+		if type(num) == type("moo") then
+			minetest.register_alias(modname .. ":slab_" .. subname .. alternate,
+				modname .. ":slab_" .. subname .. num)
+		else
 			local def = {
 				node_box = {
 					type = "fixed",
@@ -53,6 +57,7 @@ function stairsplus:register_slab(modname, subname, recipeitem, fields)
 			end
 			minetest.register_node(":" .. modname .. ":slab_" .. subname .. alternate, def)
 		end
+	end
 	minetest.register_alias("stairs:slab_" .. subname, modname .. ":slab_" .. subname)
 
 	circular_saw.known_nodes[recipeitem] = {modname, subname}

stairsplus/stairs.lua

@@ -86,15 +86,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 				},
 			},
 		},
-		["_alt_2"] = {
-			node_box = {
-				type = "fixed",
-				fixed = {
-					{-0.5, -0.125, -0.5, 0.5, 0, 0},
-					{-0.5, 0.375, 0, 0.5, 0.5, 0.5},
-				},
-			},
-		},
+		["_alt_2"] = {legacy = "_alt_1"},
 		["_alt_4"] = {
 			node_box = {
 				type = "fixed",
@@ -108,6 +100,10 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 
 	local desc = S("%s Stairs"):format(fields.description)
 	for alternate, def in pairs(defs) do
+		if def.legacy then
+			minetest.register_alias(modname .. ":stair_" .. subname .. alternate,
+				modname .. ":stair_" .. subname .. def.legacy)
+		else
 			for k, v in pairs(fields) do
 				def[k] = v
 			end
@@ -122,6 +118,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 			end
 			minetest.register_node(":" .. modname .. ":stair_" .. subname .. alternate, def)
 		end
+	end
 	minetest.register_alias("stairs:stair_" .. subname, modname .. ":stair_" .. subname)
 
 	circular_saw.known_nodes[recipeitem] = {modname, subname}
@@ -129,7 +126,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 	-- Some saw-less recipes:
 
 	minetest.register_craft({
-		output = modname .. ":stair_" .. subname .. " 8",
+		output = modname .. ":stair_" .. subname .. " 6",
 		recipe = {
 			{recipeitem, "", ""},
 			{recipeitem, recipeitem, ""},
@@ -138,7 +135,7 @@ function stairsplus:register_stair(modname, subname, recipeitem, fields)
 	})
 
 	minetest.register_craft({
-		output = modname .. ":stair_" .. subname .. " 8",
+		output = modname .. ":stair_" .. subname .. " 6",
 		recipe = {
 			{"", "", recipeitem},
 			{"", recipeitem, recipeitem},