Merge ShadowNinja's rewrite.

1 files changed, 15 insertions, 146 deletions

diff --git a/aliases.lua b/aliases.lua
index cabe2d9..ad6fe35 100644
--- a/aliases.lua
+++ b/aliases.lua
@@ -1,149 +1,9 @@
--- Aliases (some of them are about the default mod, some about moreblocks)
-
--- Additional default aliases
-
-minetest.register_alias("woodpick", "default:pick_wood")
-minetest.register_alias("woodenpick", "default:pick_wood")
-minetest.register_alias("stonepick", "default:pick_stone")
-minetest.register_alias("steelpick", "default:pick_steel")
-minetest.register_alias("ironpick", "default:pick_steel")
-minetest.register_alias("mesepick", "default:pick_mese")
-
-minetest.register_alias("woodaxe", "default:axe_wood")
-minetest.register_alias("woodenaxe", "default:axe_wood")
-minetest.register_alias("stoneaxe", "default:axe_stone")
-minetest.register_alias("steelaxe", "default:axe_steel")
-minetest.register_alias("ironaxe", "default:axe_steel")
-
-minetest.register_alias("woodshovel", "default:shovel_wood")
-minetest.register_alias("woodenshovel", "default:shovel_wood")
-minetest.register_alias("stoneshovel", "default:shovel_stone")
-minetest.register_alias("steelshovel", "default:shovel_steel")
-minetest.register_alias("ironshovel", "default:shovel_steel")
-
-minetest.register_alias("woodsword", "default:sword_wood")
-minetest.register_alias("woodensword", "default:sword_wood")
-minetest.register_alias("stonesword", "default:sword_stone")
-minetest.register_alias("steelsword", "default:sword_steel")
-minetest.register_alias("ironsword", "default:sword_steel")
-
-minetest.register_alias("grass", "default:dirt_with_grass")
-minetest.register_alias("grassblock", "default:dirt_with_grass")
-minetest.register_alias("grass_block", "default:dirt_with_grass")
-
-minetest.register_alias("grassfootsteps", "default:dirt_with_grass_footsteps")
-minetest.register_alias("grass_footsteps", "default:dirt_with_grass_footsteps")
-
-minetest.register_alias("jungle_tree", "default:jungletree")
-
-minetest.register_alias("stick", "default:stick")
-minetest.register_alias("sign", "default:sign_wall")
-minetest.register_alias("fence", "default:fence_wood")
-minetest.register_alias("coal", "default:coal_lump")
-minetest.register_alias("iron", "default:iron_lump")
-minetest.register_alias("clay", "default:clay_lump")
-minetest.register_alias("steel", "default:steel_ingot")
-minetest.register_alias("steel_block", "default:steelblock")
-
-minetest.register_alias("stonebrick", "default:stonebrick")
-minetest.register_alias("stonebricks", "default:stonebrick")
-minetest.register_alias("stone_brick", "default:stonebrick")
-minetest.register_alias("stone_bricks", "default:stonebrick")
-
-minetest.register_alias("screwdriver", "screwdriver:screwdriver")
-minetest.register_alias("screw_driver", "screwdriver:screw_driver")
-minetest.register_alias("screwdrive", "screwdriver:screw_driver")
-minetest.register_alias("screw_drive", "screwdriver:screw_driver")
-minetest.register_alias("sd", "screwdriver:screw_driver")
-
-
-minetest.register_alias("obsidian", "default:obsidian")
-minetest.register_alias("obsidianglass", "default:obsidian_glass")
-minetest.register_alias("obsidian_glass", "default:obsidian_glass")
-
 -- More Blocks aliases
 
-minetest.register_alias("circlestonebrick", "moreblocks:circle_stone_bricks")
-minetest.register_alias("circlestonebricks", "moreblocks:circle_stone_bricks")
-minetest.register_alias("circlestone_brick", "moreblocks:circle_stone_bricks")
-minetest.register_alias("circlestone_bricks", "moreblocks:circle_stone_bricks")
-minetest.register_alias("circle_stonebrick", "moreblocks:circle_stone_bricks")
-minetest.register_alias("circle_stonebricks", "moreblocks:circle_stone_bricks")
-minetest.register_alias("circle_stone_brick", "moreblocks:circle_stone_bricks")
-minetest.register_alias("circle_stone_bricks", "moreblocks:circle_stone_bricks")
-
 minetest.register_alias("sweeper", "moreblocks:sweeper")
-minetest.register_alias("circularsaw", "moreblocks:circular_saw")
 minetest.register_alias("circular_saw", "moreblocks:circular_saw")
-minetest.register_alias("cs", "moreblocks:circular_saw")
-
-minetest.register_alias("sweep", "moreblocks:sweeper")
-minetest.register_alias("junglestick", "moreblocks:jungle_stick")
 minetest.register_alias("jungle_stick", "moreblocks:jungle_stick")
 
-minetest.register_alias("stonesquare", "moreblocks:stone_tile")
-minetest.register_alias("stonesquares", "moreblocks:stone_tile")
-minetest.register_alias("stone_square", "moreblocks:stone_tile")
-minetest.register_alias("stone_squares", "moreblocks:stone_tile")
-minetest.register_alias("stonetile", "moreblocks:stone_tile")
-minetest.register_alias("stonetiles", "moreblocks:stone_tile")
-minetest.register_alias("stone_tile", "moreblocks:stone_tile")
-minetest.register_alias("stone_tiles", "moreblocks:stone_tile")
-
-minetest.register_alias("splitstonesquare", "moreblocks:split_stone_tile")
-minetest.register_alias("splitstonesquares", "moreblocks:split_stone_tile")
-minetest.register_alias("split_stone_square", "moreblocks:split_stone_tile")
-minetest.register_alias("split_stone_squares", "moreblocks:split_stone_tile")
-minetest.register_alias("split_stonesquare", "moreblocks:split_stone_tile")
-minetest.register_alias("split_stonesquares", "moreblocks:split_stone_tile")
-
-minetest.register_alias("coalstone", "moreblocks:coal_stone")
-minetest.register_alias("coal_stone", "moreblocks:coal_stone")
-
-minetest.register_alias("ironstone", "moreblocks:iron_stone")
-minetest.register_alias("iron_stone", "moreblocks:iron_stone")
-
-minetest.register_alias("coalglass", "moreblocks:coal_glass")
-minetest.register_alias("coal_glass", "moreblocks:coal_glass")
-
-minetest.register_alias("ironglass", "moreblocks:iron_glass")
-minetest.register_alias("iron_glass", "moreblocks:iron_glass")
-
-minetest.register_alias("glowglass", "moreblocks:glow_glass")
-minetest.register_alias("glow_glass", "moreblocks:glow_glass")
-
-minetest.register_alias("superglowglass", "moreblocks:super_glow_glass")
-minetest.register_alias("super_glowglass", "moreblocks:super_glow_glass")
-minetest.register_alias("super_glow_glass", "moreblocks:super_glow_glass")
-
-minetest.register_alias("plankstone", "moreblocks:plankstone")
-
-minetest.register_alias("cactusbrick", "moreblocks:cactus_brick")
-minetest.register_alias("cactus_brick", "moreblocks:cactus_brick")
-
-minetest.register_alias("cactuschecker", "moreblocks:cactus_checker")
-minetest.register_alias("cactus_checker", "moreblocks:cactus_checker")
-
-minetest.register_alias("coalchecker", "moreblocks:coal_checker")
-minetest.register_alias("coal_checker", "moreblocks:coal_checker")
-
-minetest.register_alias("ironchecker", "moreblocks:iron_checker")
-minetest.register_alias("iron_checker", "moreblocks:iron_checker")
-
-minetest.register_alias("woodtile", "moreblocks:wood_tile")
-minetest.register_alias("woodentile", "moreblocks:wood_tile")
-minetest.register_alias("wood_tile", "moreblocks:wood_tile")
-minetest.register_alias("wooden_tile", "moreblocks:wood_tile")
-
-minetest.register_alias("woodtile_full", "moreblocks:wood_tile_full")
-minetest.register_alias("woodentile_full", "moreblocks:wood_tile_full")
-minetest.register_alias("wood_tile_full", "moreblocks:wood_tile_full")
-minetest.register_alias("wooden_tile_full", "moreblocks:wood_tile_full")
-minetest.register_alias("full_woodtile", "moreblocks:wood_tile_full")
-minetest.register_alias("full_woodentile", "moreblocks:wood_tile_full")
-minetest.register_alias("full_wood_tile", "moreblocks:wood_tile_full")
-minetest.register_alias("full_wooden_tile", "moreblocks:wood_tile_full")
-
 -- Old block/item replacement
 
 minetest.register_alias("moreblocks:oerkkiblock", "default:mossycobble")
@@ -156,6 +16,10 @@ 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])
+end
 minetest.register_alias("moreblocks:horizontaltree", "moreblocks:horizontal_tree")
 minetest.register_alias("moreblocks:horizontaljungletree", "moreblocks:horizontal_jungle_tree")
 minetest.register_alias("moreblocks:stonesquare", "moreblocks:stone_tile")
@@ -187,20 +51,25 @@ 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_tree (fix facedir).
+-- ABM for horizontal trees (fix facedir).
+
+local horizontal_tree_convert_facedir = {7, 12, 9, 18}
 
 minetest.register_abm({
 	nodenames = {"moreblocks:horizontal_tree","moreblocks:horizontal_jungle_tree"},
 	interval = 1,
 	chance = 1,
 	action = function(pos, node)
-		local convert_facedir={7,12,9,18}
-		if node.name=="moreblocks:horizontal_tree" then
-			node.name="default:tree"
+		if node.name == "moreblocks:horizontal_tree" then
+			node.name = "default:tree"
 		else
-			node.name="default:jungletree"
+			node.name = "default:jungletree"
 		end
-		minetest.set_node(pos, {name=node.name,param2=convert_facedir[node.param2+1]})
+		node.param2 = node.param2 < 3 and node.param2 or 0
+		minetest.set_node(pos, {
+			name = node.name,
+			param2 = horizontal_tree_convert_facedir[node.param2 + 1]
+		})
 	end,
 })