Relicense; WTFPL allows it

Also, update README

LICENSE.txt

@@ -1,2 +1,2 @@
 GPLv3 (lkloel's version)
-WTFPL for the changes
+MIT for the changes

README.md

@@ -1,22 +1,7 @@
-[Mod] nether-pack [nether-pack]
+For a description of this Minetest mod, please refer to the forum topic:
-
+https://forum.minetest.net/viewtopic.php?f=9&t=10265
-This is a modified version of lkjoel's nether mod.  
-Look here if you want to see the differences:  
-https://github.com/HybridDog/minetest-nether/compare/lkjoel:master...master  
-Sadly lkjoel's one disappeared…
-
-**Depends:** see [depends.txt](https://raw.githubusercontent.com/HybridDog/nether-pack/master/nether/depends.txt)  
-**License:** see [LICENSE.txt](https://raw.githubusercontent.com/HybridDog/nether-pack/master/LICENSE.txt)  
-**Download:** [zip](https://github.com/HybridDog/nether-pack/archive/master.zip), [tar.gz](https://github.com/HybridDog/nether-pack/tarball/master)  
-
-this happens really selden to me  
-![I'm a screenshot!](http://i.imgur.com/pMZYqt9.png)
-
-If you got ideas or found bugs, please tell them to me.
-
-[How to install a mod?](http://wiki.minetest.net/Installing_Mods)
 
 
 TODO:
-— find a way to get the perlin noise inside [-1; 1] or use another noise  
+* Find a way to get the perlin noise inside [-1; 1] or use another noise
-— add something containing items to that buildings
+* Add some node which containing items to the simple pyramid "buildings"

modpack.txt

@@ -0,0 +1 @@
+0

nether/crafting.lua

@@ -214,7 +214,7 @@ minetest.register_craft({
 
 minetest.register_craft({
 	type = "cooking",
-	output = "default:coal",
+	output = "default:coal_lump",
 	recipe = "nether:tree",
 })
 

nether/depends.txt

@@ -1,6 +0,0 @@
-default
-glow
-riesenpilz
-stairs
-fence_registration?
-watershed?

nether/furnace.lua

@@ -1,5 +1,5 @@
 -- minetest time speed
-local time_speed = tonumber(minetest.setting_get("time_speed"))
+local time_speed = tonumber(minetest.settings:get("time_speed"))
 if not time_speed then
 	time_speed = 1
 else

nether/guide.lua

@@ -3,15 +3,15 @@ local cube = minetest.inventorycube
 -- the content of the guide
 local guide_infos = {
 	{
-		description = "mushroom",
+		description = "Mushrooms",
-		{"text", "You can find the nether mushroom on the ground of the nether and on netherrack soil, it can be dug by hand."},
+		{"text", "Nether mushrooms can be found on the nether's ground and\n"..
-		{"y", -0.3},
+			"on netherrack soil, it can be dug by hand."},
 		{"image", {1, 1, "riesenpilz_nether_shroom_side.png"}},
 		{"y", 0.2},
-		{"text", "If you drop it without holding aux1 (the fast key), you can split it into its stem and head:"},
+		{"text", "If you drop it without holding the fast key, you can split it into its stem and head:"},
 		{"image", {1, 1, "nether_shroom_top.png", 1}},
 		{"image", {1, 1, "nether_shroom_stem.png"}},
-		{"y", 0.2},
+		{"y", 0.1},
 		{"text", "You can get more mushrooms by using a netherrack soil:\n"..
 			"1. search a dark place and, if necessary, place netherrack with air about it\n"..
 			"2. right click with cooked blood onto the netherrack to make it soiled\n"..
@@ -27,81 +27,89 @@ local guide_infos = {
 		{"image", {1, 1, "nether_netherrack.png"}},
 	},
 	{
-		description = "tools",
+		description = "Tools",
-		{"text", "You can craft 5 types of tools in the nether, which (except the mushroom pick) require sticks to be crafted:"},
+		{"text", "You can craft 5 kinds of tools in the nether,\n"..
-		{"y", 0.4},
+			"which (except the mushroom pick) require sticks to be crafted:"},
 		{"image", {1, 1, "nether_pick_mushroom.png"}},
-		{"text", "strength: 1\n"..
+		{"y", 0.1},
+		{"text", "strength : 1\n"..
 			"The mushroom pick needs mushroom stems and heads to be crafted."},
-		{"y", 0.2},
 		{"image", {1, 1, "nether_pick_wood.png"}},
-		{"text", "strength: 2\n"..
+		{"y", 0.1},
+		{"text", "strength : 2\n"..
 			"The nether wood pick can be crafted with cooked nether blood wood."},
-		{"y", 0.2},
+		{"image", {1, 1, "nether_axe_netherrack.png", 1.5}},
-		{"image", {1, 1, "nether_axe_netherrack.png", 1}},
+		{"image", {1, 1, "nether_shovel_netherrack.png", 3}},
-		{"image", {1, 1, "nether_shovel_netherrack.png", 2}},
+		{"image", {1, 1, "nether_sword_netherrack.png", 4.5}},
-		{"image", {1, 1, "nether_sword_netherrack.png", 3}},
 		{"image", {1, 1, "nether_pick_netherrack.png"}},
-		{"text", "strength: 3\n"..
+		{"y", 0.1},
+		{"text", "strength : 3\n"..
 			"The red netherrack tools can be crafted with usual netherrack."},
-		{"y", 0.2},
+		{"image", {1, 1, "nether_axe_netherrack_blue.png", 1.5}},
-		{"image", {1, 1, "nether_axe_netherrack_blue.png", 1}},
+		{"image", {1, 1, "nether_shovel_netherrack_blue.png", 3}},
-		{"image", {1, 1, "nether_shovel_netherrack_blue.png", 2}},
+		{"image", {1, 1, "nether_sword_netherrack_blue.png", 4.5}},
-		{"image", {1, 1, "nether_sword_netherrack_blue.png", 3}},
 		{"image", {1, 1, "nether_pick_netherrack_blue.png"}},
-		{"text", "strength: 3\n"..
+		{"y", 0.1},
+		{"text", "strength : 3\n"..
 			"The blue netherrack tools can be crafted with blue netherrack."},
-		{"y", 0.2},
+		{"image", {1, 1, "nether_axe_white.png", 1.5}},
-		{"image", {1, 1, "nether_axe_white.png", 1}},
+		{"image", {1, 1, "nether_shovel_white.png", 3}},
-		{"image", {1, 1, "nether_shovel_white.png", 2}},
+		{"image", {1, 1, "nether_sword_white.png", 4.5}},
-		{"image", {1, 1, "nether_sword_white.png", 3}},
 		{"image", {1, 1, "nether_pick_white.png"}},
-		{"text", "strength: 3\n"..
+		{"y", 0.1},
+		{"text", "strength : 3\n"..
 			"The siwtonic tools can be crafted with the siwtonic ore."},
 	},
 	{
-		description = "blood structures",
+		description = "Blood structures",
-		{"text", "You can find blood structures on the ground and dig their nodes even with the bare hand."},
+		{"text", "You can find blood structures on the ground and\n"..
-		{"y", 0.2},
+			"dig their nodes even with the bare hand."},
-		{"text", "One contains 4 kinds of blocks:"},
+		{"y", 0.5},
+		{"text", "One contains 4 kinds of blocks :"},
 		{"image", {1, 1, cube("nether_blood.png"), 1}},
 		{"image", {1, 1,
 			cube("nether_blood_top.png", "nether_blood.png^nether_blood_side.png", "nether_blood.png^nether_blood_side.png"),
 			2}},
 		{"image", {1, 1, "nether_fruit.png", 3}},
 		{"image", {1, 1, cube("nether_blood_stem_top.png", "nether_blood_stem.png", "nether_blood_stem.png")}},
-		{"text", "the blood stem, blood, blood head and nether fruit"},
+		{"y", 0.1},
-		{"y", 0.2},
+		{"text", "Blood stem, blood, blood head and nether fruit"},
-		{"text", "You can craft the stem to 4 blood wood:"},
+		{"y", 0.1},
+		{"text", "You can craft 4 blood wood with the stem :"},
 		{"image", {1, 1, cube("nether_wood.png")}},
-		{"y", 0.2},
+		{"y", 0.1},
-		{"text", "The 4 blood nodes can be cooked and, except blood wood, their blood can be extracted."},
+		{"text", "The 4 blood nodes can be cooked and, except\n"..
+			"blood wood, their blood can be extracted."},
 	},
 	{
-		description = "fruit",
+		description = "Fruits",
-		{"text", "You can find the nether fruit at blood structures and dig it even with the bare hand."},
+		{"text", "You can find the nether fruits on blood structures\n"..
-		{"y", 0.05},
+			"and dig them even with the bare hand."},
 		{"image", {1, 1, "nether_fruit.png"}},
-		{"text", "You can eat it to get a bit blood because of its acid effect:"},
+		{"text", "Eating it will make you lose life but\n"..
+			"it might feed you and give you blood :"},
 		{"image", {1, 1, "nether_blood_extracted.png"}},
 		{"y", 0.2},
-		{"text", "If you eat it at the right place inside a portal, you teleport instead of getting blood."},
+		{"text", "If you eat it at the right place inside a portal,\n"..
+			"you will teleport instead of getting blood."},
 		{"y", 0.2},
-		{"text", "If you drop it without holding aux1 (the fast key), you can split it into its fruit and leaf:"},
+		{"text", "If you drop it without holding the fast key,\n"..
+			"you can split it into its fruit and leaf:"},
 		{"image", {1, 1, "nether_fruit_leaf.png", 1}},
 		{"image", {1, 1, "nether_fruit_no_leaf.png"}},
 		{"y", 0.2},
-		{"text", "9 fruit leaves can be crafted to a fruit leaves block and the fruit without leaf can be used for crafting a nether pearl."},
+		{"text", "Craft a fruit leave block out of 9 fruit leaves\n"..
-		{"y", 0.2},
+			"The fruit can be used to craft a nether pearl."},
 		{"image", {1, 1, cube("nether_fruit_leaves.png")}},
-		{"text", "fruit leaves block"},
+		{"y", 0.2},
+		{"text", "A fruit leaves block"},
 	},
 	{
-		description = "cooking",
+		description = "Cooking",
 		{"text", "To get a furnace you need to dig at least 8 netherrack bricks.\n"..
-			"They can be found at pyramid like constructions and require at least a strength 1 nether pick to be dug.\n"..
+			"They can be found at pyramid like constructions and require at least\n"..
-			"For crafting the furnace, use the netherrack bricks like cobble:"},
+			"a strength 1 nether pick to be dug.\n"..
-		{"y", 0.2},
+			"To craft the furnace, use the netherrack bricks like cobble:"},
 		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 0.5}},
 		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 1}},
 		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png")}},
@@ -113,29 +121,27 @@ local guide_infos = {
 		{"y", 0.2},
 		{"text", "To begin cooking stuff, you can use a mushroom or fruit.\n"..
 			"After that it's recommended to use cooked blood nodes."},
-		{"y", 0.2},
-		{"text", "Some nether items can be cooked:"},
 		{"y", 0.1},
+		{"text", "Some nether items can be cooked:"},
 		{"image", {1, 1, cube("nether_blood_stem_top_cooked.png", "nether_blood_stem_cooked.png", "nether_blood_stem_cooked.png"), 0.35}},
 		{"image", {1, 1, cube("nether_blood_cooked.png"), 1.6}},
 		{"image", {1, 1,
 			cube("nether_blood_top_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png"),
 			2.9}},
 		{"image", {1, 1, cube("nether_wood_cooked.png"), 4.3}},
-		{"y", 1},
+		{"y", 1.2},
-		{"text", "cooked blood stem, cooked blood, cooked blood head, cooked blood wood,"},
+		{"text", "Some cooked blood stem, cooked blood,\n"..
-		{"y", 0.2},
+			"cooked blood head and cooked blood wood,"},
 		{"image", {1, 1, "nether_hotbed.png", 0.3}},
 		{"image", {1, 1, "nether_pearl.png", 2}},
-		{"y", 1},
+		{"y", 1.2},
-		{"text", "cooked extracted blood and nether pearl"},
+		{"text", "Some cooked extracted blood and a nether pearl"},
 	},
 	{
-		description = "extractor",
+		description = "Extractors",
 		{"text", "Here you can find out information about the nether extractor."},
-		{"y", 0.4},
-		{"text", "Here you can see its craft recipe:"},
 		{"y", 0.2},
+		{"text", "Here you can see its craft recipe:"},
 		{"image", {0.5, 0.5, cube("nether_blood_top_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png"), 0.5}},
 		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 1}},
 		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png")}},
@@ -147,7 +153,7 @@ local guide_infos = {
 		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 1}},
 		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png")}},
 		{"y", 0.2},
-		{"text", "You can extract blood from the blood nodes you get from the blood structure.\n"..
+		{"text", "Extract blood from the blood nodes you get from the blood structures.\n"..
 			"You can also get blood with a nether fruit."},
 		{"y", 0.2},
 		{"text", "So you can use it:\n"..
@@ -169,124 +175,132 @@ local guide_infos = {
 		{"image", {1, 1, "nether_blood.png", 0.82, -0.12}},
 		{"image", {1, 1, "nether_blood_empty.png", 3.82, -0.12}},
 		{"y", 1.2},
-		{"text", "The empty blood stem can be crafted to empty nether wood, which can be crafted to nether sticks."},
+		{"text", "The empty blood stem can be crafted into empty nether wood,\n"..
+			"which can be crafted into nether sticks."},
 	},
 	{
-		description = "ores",
+		description = "Ores",
 		{"text", "You can find 5 types of ores:"},
-		{"y", 0.4},
 		{"image", {1, 1, cube("nether_netherrack_black.png"), 4}},
 		{"image", {1, 1, cube("nether_netherrack.png")}},
-		{"text", "The red netherrack is generated like stone and the black netherrack is generated like gravel.\n"..
-			"Both require at least a strength 2 nether pick to be dug."},
 		{"y", 0.2},
+		{"text", "The red netherrack is generated like stone.\n"..
+			"The black netherrack is generated like gravel.\n"..
+			"Both require at least a strength 2 nether pick to be dug."},
 		{"image", {1, 1, cube("nether_white.png"), 4}},
 		{"image", {1, 1, cube("nether_netherrack_blue.png")}},
-		{"text", "The blue netherrack is generated like diamond ore and the siwtonic ore is generated like mese blocks.\n"..
-			"Both require at least a strength 3 nether pick to be dug."},
 		{"y", 0.2},
+		{"text", "The blue netherrack is generated like diamond ore.\n"..
+			"The siwtonic ore is generated like mese blocks.\n"..
+			"Both require at least a strength 3 nether pick to be dug."},
 		{"image", {1, 1, cube("nether_netherrack_tiled.png"), 4}},
 		{"image", {1, 1, cube("glow_stone.png")}},
-		{"text", "The glow stone can be used for lighting and the tiled netherrack is generated like coal ore.\n"..
+		{"y", 0.2},
+		{"text", "Glow stone can be used for lighting.\n"..
+			"Tiled netherrack is generated like coal ore.\n"..
 			"Glow stone requires at least a strength 1 pick to be dug.\n"..
-			"Tiled netherrack requires at least a strength 2 nether pick to be dug."},
+			"Dig tiled netherrack with at least a level 2 pickaxe."},
 	},
 	{
-		description = "vines",
+		description = "Vines",
-		{"text", "The nether vines can be fed with blood.\n"..
+		{"text", "Feed nether vines with blood.\n"..
-			"They can be dug by hand and drop nether children."},
+			"Dig them with anything."},
 		{"image", {1, 1, "nether_vine.png"}},
 		{"y", 0.2},
-		{"text", "To let a nether child grow to a blood structure, place it at a dark place onto a blood structure head node."},
+		{"text", "Grow nether child by placing\n"..
+			"placing it to a dark place onto a\n"..
+			"blood structure head node."},
 		{"image", {1, 1, "nether_sapling.png"}},
-		{"y", -0.11},
+		{"y", -0.10},
 		{"image", {1, 1, "nether_blood.png^nether_blood_side.png"}},
 	},
 	{
-		description = "pearl",
+		description = "Pearls",
-		{"text", "The nether pearl can be thrown for teleporting.\n"..
+		{"text", "The nether pearl can be used to teleport by throwing it.\n"..
-			"So cou can get one:"},
+			"Here is how to get one :"},
-		{"y", 0.4},
+		{"y", 0.2},
-		{"text", "At first you need to craft 2 mushroom heads and 1 nether fruit without leaf together:"},
+		{"text", "First of all craft 2 mushroom heads and 1 nether fruit\n"..
+			"without leaf together :"},
 		{"image", {1, 1, "nether_shroom_top.png"}},
 		{"image", {1, 1, "nether_fim.png", 3}},
 		{"image", {1, 1, "nether_fruit_no_leaf.png"}},
 		{"image", {1, 1, "nether_shroom_top.png"}},
 		{"y", 0.2},
-		{"text", "Then you need to put the result into the furnance to cook it to a nether pearl:"},
+		{"text", "Put the result into the furnace\n"..
+			"to cook it into a nether pearl :"},
 		{"image", {1, 1, "nether_pearl.png"}},
 	},
 	{
-		description = "bricks",
+		description = "Bricks",
-		{"text", "You can craft bricks of red, black and blue netherrack."},
+		{"text", "Craft bricks out of red,\n"..
-		{"y", 0.4},
+			"black and blue netherrack."},
 		{"image", {1, 1, cube("nether_netherrack_brick_black.png"), 1}},
 		{"image", {1, 1, cube("nether_netherrack_brick_blue.png"), 2}},
 		{"image", {1, 1, cube("nether_netherrack_brick.png")}},
+		{"y", 0.4},
+		{"text", "Dig them with at least a level 1 pickaxe."},
 		{"y", 0.2},
-		{"text", "These bricks require at least a strength 1 nether pick to be dug."},
-		{"y", 0.2},
-		{"text", "Because the crafing recipe of bricks is well known, it's not shown here."},
 	},
 	{
-		description = "portal",
+		description = "Portals",
 		{"text", "Here you can find out how to built the nether portal."},
-		{"y", 0.4},
+		{"y", 0.3},
 		{"text", "A nether portal requires following nodes:"},
 		{"y", 0.05},
-		{"text", "21 empty nether wooden planks\n"..
+		{"text", "25 empty nether wooden planks\n"..
+			"16 black netherrack\n"..
 			"12 blue netherrack bricks\n"..
-			"12 black netherrack\n"..
 			"8 red netherrack\n"..
-			"8 cooked nether wood\n"..
+			"8 cooked nether blood\n"..
 			"4 nether fruits\n"..
 			"2 siwtonic blocks"},
 		{"y", 0.2},
 		{"text", "It should look approximately like this one:"},
 		{"image", {5.625, 6, "nether_teleporter.png", 0, -1.5}},
 		{"y", 5.5},
-		{"text", "You can activate it by standing in the middle on a siwtonic block and eating a nether fruit.\n"..
+		{"text", "Activate it by standing in the middle,\n"..
-			"Don't forget to take enough stuff with you to be able to build a portal back."},
+			"on the siwtonic block and eating a nether fruit.\n"..
+			"Take enough stuff with you to build a portal when you'll come back."},
 	},
 	{
-		description = "nether forest",
+		description = "Forests",
-		{"text", "The nether forest is generated in caves above the usual nether."},
+		{"text", "The nether forest is generated in caves,\n"..
+			"above the usual nether."},
 		{"y", 0.2},
 		{"text", "There you can find some plants:"},
-		{"y", 0.2},
 		{"image", {1, 1, "nether_grass_middle.png", 1}},
 		{"image", {1, 1, "nether_grass_big.png", 2}},
 		{"image", {1, 1, "nether_grass_small.png"}},
 		{"y", 0.2},
-		{"text", "The nether forest grass can be used to get paper.\n"..
+		{"text", "Use the nether forest grass to get paper.\n"..
-			"Just dig it, put the grass into the furnace and craft paper out of the dried grass.\n"..
+			"Craft paper out of the dried grass."},
-			"The recipe is similar to the one of crafting paper with papyrus."},
-		{"y", 0.2},
 		{"image", {1, 1, cube("nether_tree_top.png", "nether_tree.png", "nether_tree.png")}},
-		{"text", "Nether trunks can be found at nether trees, you can craft nether wood out of them."},
 		{"y", 0.2},
+		{"text", "Nether trunks can be found at nether trees.\n"..
+			"Craft nether wood out of nether trunk."},
 		{"image", {1, 1, "nether_glowflower.png"}},
-		{"text", "Currently this flower can be used for lighting and decoration."},
+		{"y", 0.2},
+		{"text", "Use it for lighting and decoration."},
 	},
 }
 
 -- the size of guide pages
-local guide_size = {x=15, y=10, cx=0.1, cy=-0.2}
+local guide_size = {x=40, y=10, cx=0.2, cy=0.2}
 
 -- informations about settings and ...
-local formspec_offset = {x=0.25, y=0.55}
+local formspec_offset = {x=0.25, y=0.50}
 local font_size
 if minetest.is_singleplayer() then
-	font_size = tonumber(minetest.setting_get("font_size")) or 13
+	font_size = tonumber(minetest.settings:get("font_size")) or 13
 else
 	font_size = 13
 end
-guide_size.fx = math.floor((guide_size.x-2*(guide_size.cx+formspec_offset.x))*font_size)
+guide_size.fx = math.floor((40*(guide_size.cx+formspec_offset.x))*font_size)
-guide_size.fy = font_size/65
+guide_size.fy = font_size/40
 
 -- the default guide formspecs
 local guide_forms = {
-	contents = "size[3,"..(#guide_infos+1)*0.5 ..";]label["..guide_size.cx+0.8 ..","..guide_size.cy..";Contents:]",
+	contents = "size[3.6,"..(#guide_infos)-2 ..";]label["..guide_size.cx+0.7 ..","..guide_size.cy+0.2 ..";Contents:]",
 }
 
 -- change the infos to formspecs
@@ -301,10 +315,10 @@ for n,data in ipairs(guide_infos) do
 		elseif typ == "x" then
 			x = math.max(x, content)
 		elseif typ == "text" then
-			local tab = minetest.splittext(content, guide_size.fx)
+			local tab = minetest.wrap_text(content, guide_size.fx, true)
 			local l = guide_size.cx
 			for _,str in ipairs(tab) do
-				form = form.."label["..guide_size.cx..","..guide_size.cy+y..";"..str.."]"
+				form = form.."label["..guide_size.cx ..","..guide_size.cy+y..";"..str.."]"
 				y = y+guide_size.fy
 				l = math.max(l, #str)
 			end
@@ -323,7 +337,7 @@ for n,data in ipairs(guide_infos) do
 			end
 		end
 	end
-	form = "size["..x..","..y+1 ..";]"..form.."button["..x/2-0.5 ..","..y ..";1,2;quit;back]"
+	form = "size["..x*1.8 ..","..y+1 ..";]"..form.."button["..x/2-0.5 ..","..y ..";1,2;quit;Back]"
 	guide_forms[n] = {data.description, form}
 end
 
@@ -336,8 +350,8 @@ end
 local y = 0
 for y,i in ipairs(guide_forms) do
 	local desc, form = unpack(i)
-	local s = #desc*1.3/font_size+0.3
+	local s = #desc*1.3/font_size+1.5
-	guide_forms.contents = guide_forms.contents.."button["..guide_size.cx+math.random()..","..guide_size.cy+y/2 ..";"..s..",1;name;"..desc.."]"
+	guide_forms.contents = guide_forms.contents.."button["..guide_size.cx*12/s-0.5 ..","..guide_size.cy+y/1.3 ..";"..s..",1;name;"..desc.."]"
 end
 
 -- shows the contents of the formspec

nether/init.lua

@@ -11,7 +11,7 @@
 -- godkiller447 (ideas)
 -- If I didn't list you, please let me know!
 
-local load_time_start = os.clock()
+local load_time_start = minetest.get_us_time()
 
 if not rawget(_G, "nether") then
 	nether = {}
@@ -52,8 +52,8 @@ local grass_rarity = 2
 -- Frequency of nether mushrooms in the nether forest (higher is less frequent)
 local mushroom_rarity = 80
 
--- Frequency of trees in the nether forest (higher is less frequent)
+local abm_tree_interval = 864
-local tree_rarity = 200
+local abm_tree_chance = 100
 
 -- height of the nether generation's end
 nether.start = f_h_max+100
@@ -83,11 +83,14 @@ local NETHER_SHROOM_FREQ = 100
 --NETHER_APPLE_FREQ = 5
 -- Frequency of healing apples in a nether structure (higher is less frequent)
 --NETHER_HEAL_APPLE_FREQ = 10
--- Start position for the Throne of Hades (y is relative to the bottom of the nether)
+-- Start position for the Throne of Hades (y is relative to the bottom of the
+-- nether)
 --HADES_THRONE_STARTPOS = {x=0, y=1, z=0}
--- Spawn pos for when the nether hasn't been loaded yet (i.e. no portal in the nether) (y is relative to the bottom of the nether)
+-- Spawn pos for when the nether hasn't been loaded yet (i.e. no portal in the
+-- nether) (y is relative to the bottom of the nether)
 --NETHER_SPAWNPOS = {x=0, y=5, z=0}
--- Structure of the nether portal (all is relative to the nether portal creator block)
+-- Structure of the nether portal (all is relative to the nether portal creator
+-- block)
 
 --== END OF EDITABLE OPTIONS ==--
 
@@ -96,9 +99,10 @@ if nether.info then
 		if spam <= self.max_spam then
 			local info
 			if t then
-				info = string.format("[nether] "..msg.." after ca. %.2fs", os.clock() - t)
+				info = "[nether] " .. msg .. (" after ca. %.3g s"):format(
+					(minetest.get_us_time() - t) / 1000000)
 			else
-				info = "[nether] "..msg
+				info = "[nether] " .. msg
 			end
 			print(info)
 			if self.inform_all then
@@ -107,39 +111,30 @@ if nether.info then
 		end
 	end
 else
-	function nether:inform()
+	function nether.inform()
 	end
 end
 
 
-local path = minetest.get_modpath("nether")
+local path = minetest.get_modpath"nether"
 dofile(path.."/weird_mapgen_noise.lua")
 dofile(path.."/items.lua")
 --dofile(path.."/furnace.lua")
 dofile(path.."/pearl.lua")
 
-local function table_contains(t, v)
-	for _,i in pairs(t) do
-		if i == v then
-			return true
-		end
-	end
-	return false
-end
-
 -- Weierstrass function stuff from https://github.com/slemonide/gen
 local SIZE = 1000
 local ssize = math.ceil(math.abs(SIZE))
 local function do_ws_func(depth, a, x)
-	local n = x/(16*SIZE)
+	local n = math.pi * x / (16 * SIZE)
 	local y = 0
 	for k=1,depth do
-		y = y + math.sin(math.pi * k^a * n)/(k^a)
+		y = y + math.sin(k^a * n) / k^a
 	end
-	return SIZE*y/math.pi
+	return SIZE * y / math.pi
 end
 
-local chunksize = minetest.setting_get("chunksize") or 5
+local chunksize = minetest.settings:get"chunksize" or 5
 local ws_lists = {}
 local function get_ws_list(a,x)
         ws_lists[a] = ws_lists[a] or {}
@@ -158,10 +153,6 @@ end
 
 
 local function dif(z1, z2)
-	if z1 < 0
-	and z2 < 0 then
-		z1,z2 = -z1,-z2
-	end
 	return math.abs(z1-z2)
 end
 
@@ -179,42 +170,25 @@ end
 
 local function set_vm_data(manip, nodes, pos, t1, name, generated)
 	manip:set_data(nodes)
-	manip:write_to_map()
+	manip:write_to_map(not generated)
-	local spam = 2
+	nether:inform(name.." grew at " .. minetest.pos_to_string(pos),
-	if generated then
+		generated and 3 or 2, t1)
-		spam = 3
-	end
-	nether:inform(name.." grew at ("..pos.x.."|"..pos.y.."|"..pos.z..")", spam, t1)
-	if not generated then
-		local t1 = os.clock()
-		manip:update_map()
-		nether:inform("map updated", spam, t1)
-	end
-end
-
-local function fix_light(minp, maxp)
-	local manip = minetest.get_voxel_manip()
-	local emerged_pos1, emerged_pos2 = manip:read_from_map(minp, maxp)
-	area = VoxelArea:new({MinEdge=emerged_pos1, MaxEdge=emerged_pos2})
-	nodes = manip:get_data()
-
-	manip:set_data(nodes)
-	manip:write_to_map()
-	manip:update_map()
 end
 
 -- Generated variables
 local NETHER_BOTTOM = (nether_middle - NETHER_HEIGHT)
 nether.buildings = NETHER_BOTTOM+12
-local NETHER_ROOF_ABS = (nether_middle - NETHER_RANDOM)
+--~ local NETHER_ROOF_ABS = (nether_middle - NETHER_RANDOM)
 local f_yscale_top = (f_h_max-f_h_min)/2
 local f_yscale_bottom = f_yscale_top/2
---HADES_THRONE_STARTPOS_ABS = {x=HADES_THRONE_STARTPOS.x, y=(NETHER_BOTTOM + HADES_THRONE_STARTPOS.y), z=HADES_THRONE_STARTPOS.z}
+--HADES_THRONE_STARTPOS_ABS = {x=HADES_THRONE_STARTPOS.x, y=(NETHER_BOTTOM +
+--HADES_THRONE_STARTPOS.y), z=HADES_THRONE_STARTPOS.z}
 --LAVA_Y = (NETHER_BOTTOM + LAVA_HEIGHT)
 --HADES_THRONE_ABS = {}
 --HADES_THRONE_ENDPOS_ABS = {}
 --HADES_THRONE_GENERATED = minetest.get_worldpath() .. "/netherhadesthrone.txt"
---NETHER_SPAWNPOS_ABS = {x=NETHER_SPAWNPOS.x, y=(NETHER_BOTTOM + NETHER_SPAWNPOS.y), z=NETHER_SPAWNPOS.z}
+--NETHER_SPAWNPOS_ABS = {x=NETHER_SPAWNPOS.x, y=(NETHER_BOTTOM +
+--NETHER_SPAWNPOS.y), z=NETHER_SPAWNPOS.z}
 --[[for i,v in ipairs(HADES_THRONE) do
 	v.pos.x = v.pos.x + HADES_THRONE_STARTPOS_ABS.x
 	v.pos.y = v.pos.y + HADES_THRONE_STARTPOS_ABS.y
@@ -237,7 +211,7 @@ for i,v in ipairs(HADES_THRONE_ABS) do
 end
 HADES_THRONE_ENDPOS_ABS = {x=htx, y=hty, z=htz}]]
 
-local c
+local c, nether_tree_nodes
 local function define_contents()
 	c = {
 		ignore = minetest.get_content_id("ignore"),
@@ -248,7 +222,8 @@ local function define_contents()
 		diamond = minetest.get_content_id("default:stone_with_diamond"),
 		mese = minetest.get_content_id("default:mese"),
 
-		glowstone = minetest.get_content_id("glow:stone"), --https://github.com/Zeg9/minetest-glow
+		--https://github.com/Zeg9/minetest-glow
+		glowstone = minetest.get_content_id("glow:stone"),
 
 		nether_shroom = minetest.get_content_id("riesenpilz:nether_shroom"),
 
@@ -278,6 +253,12 @@ local function define_contents()
 		nether_dirt_top = minetest.get_content_id("nether:dirt_top"),
 		nether_dirt_bottom = minetest.get_content_id("nether:dirt_bottom"),
 	}
+	local trn = {c.nether_tree, c.nether_tree_corner, c.nether_leaves,
+		c.nether_fruit}
+	nether_tree_nodes = {}
+	for i = 1,#trn do
+		nether_tree_nodes[trn[i]] = true
+	end
 end
 
 local pr, contents_defined
@@ -304,13 +285,14 @@ end
 
 local f_perlins = {}
 
---local perlin1 = minetest.get_perlin(13,3, 0.5, 50)	--Get map specific perlin
+-- abs(v) < 1-(persistance^octaves))/(1-persistance) = amp
+--local perlin1 = minetest.get_perlin(13,3, 0.5, 50) --Get map specific perlin
 --	local perlin2 = minetest.get_perlin(133,3, 0.5, 10)
 --	local perlin3 = minetest.get_perlin(112,3, 0.5, 5)
 local tmp = f_yscale_top*4
 local tmp2 = tmp/f_bottom_scale
 local perlins = {
-	{
+	{ -- amp 1.75
 		seed = 13,
 		octaves = 3,
 		persist = 0.5,
@@ -318,7 +300,7 @@ local perlins = {
 		scale = 1,
 		offset = 0,
 	},
-	{
+	{-- amp 1.75
 		seed = 133,
 		octaves = 3,
 		persist = 0.5,
@@ -326,7 +308,7 @@ local perlins = {
 		scale = 1,
 		offset = 0,
 	},
-	{
+	{-- amp 1.75
 		seed = 112,
 		octaves = 3,
 		persist = 0.5,
@@ -342,7 +324,7 @@ local perlins = {
 		scale = 1,
 		offset = 0,
 	},]]
-	forest_top = {
+	forest_top = {-- amp 2.44
 		seed = 21,
 		octaves = 3,
 		persist = 0.8,
@@ -352,18 +334,26 @@ local perlins = {
 	},
 }
 
-local info = true
+-- buffers, see https://forum.minetest.net/viewtopic.php?f=18&t=16043
+local pelin_maps
+local pmap1 = {}
+local pmap2 = {}
+local pmap3 = {}
+local pmap_f_top = {}
+local data = {}
+
 local structures_enabled = true
 local vine_maxlength = math.floor(NETHER_HEIGHT/4+0.5)
 -- Create the Nether
 minetest.register_on_generated(function(minp, maxp, seed)
-	if not (maxp.y >= NETHER_BOTTOM-100 and minp.y <= nether.start) then --avoid big map generation
+	--avoid big map generation
+	if not (maxp.y >= NETHER_BOTTOM-100 and minp.y <= nether.start) then
 		return
 	end
-	local addpos = {}
 
-	local t1 = os.clock()
+	local t1 = minetest.get_us_time()
-	nether:inform("generates at: x=["..minp.x.."; "..maxp.x.."]; y=["..minp.y.."; "..maxp.y.."]; z=["..minp.z.."; "..maxp.z.."]", 2)
+	nether:inform("generates at: x=["..minp.x.."; "..maxp.x.."]; y=[" ..
+		minp.y.."; "..maxp.y.."]; z=["..minp.z.."; "..maxp.z.."]", 2)
 
 	if not contents_defined then
 		define_contents()
@@ -378,31 +368,41 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	end
 
 	local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
-	local data = vm:get_data()
+	vm:get_data(data)
 	local area = VoxelArea:new{MinEdge=emin, MaxEdge=emax}
 
 	pr = PseudoRandom(seed+33)
 	local tab,num = {},1
 	local trees,num_trees = {},1
 
-	--local perlin1 = minetest.get_perlin(13,3, 0.5, 50)	--Get map specific perlin
+	--local perlin1 = minetest.get_perlin(13,3, 0.5, 50)
 	--local perlin2 = minetest.get_perlin(133,3, 0.5, 10)
 	--local perlin3 = minetest.get_perlin(112,3, 0.5, 5)
 
-	local side_length = maxp.x - minp.x + 1	-- maybe mistake here
+	local side_length = maxp.x - minp.x + 1
 	local map_lengths_xyz = {x=side_length, y=side_length, z=side_length}
 
-	local pmap1 = minetest.get_perlin_map(perlins[1], map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z})
+	if not pelin_maps then
-	local pmap2 = minetest.get_perlin_map(perlins[2], map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z})
+		pelin_maps = {
-	local pmap3 = minetest.get_perlin_map(perlins[3], map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z})
+			a = minetest.get_perlin_map(perlins[1], map_lengths_xyz),
+			b = minetest.get_perlin_map(perlins[2], map_lengths_xyz),
+			c = minetest.get_perlin_map(perlins[3], map_lengths_xyz),
+			forest_top = minetest.get_perlin_map(perlins.forest_top,
+				map_lengths_xyz),
+		}
+	end
+	pelin_maps.a:get2dMap_flat({x=minp.x, y=minp.z}, pmap1)
+	pelin_maps.b:get2dMap_flat({x=minp.x, y=minp.z}, pmap2)
+	pelin_maps.c:get2dMap_flat({x=minp.x, y=minp.z}, pmap3)
 
 	local forest_possible = maxp.y > f_h_min and minp.y < f_h_max
 
-	--local pmap_f_bottom = minetest.get_perlin_map(perlins.forest_bottom, map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z})
+	--local pmap_f_bottom = minetest.get_perlin_map(perlins.forest_bottom,
-	local perlin_f_bottom, pmap_f_top, strassx, strassz
+	-- map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z})
+	local perlin_f_bottom, strassx, strassz
 	if forest_possible then
 		perlin_f_bottom = minetest.get_perlin(11, 3, 0.8, tmp2)
-		pmap_f_top = minetest.get_perlin_map(perlins.forest_top, map_lengths_xyz):get2dMap_flat({x=minp.x, y=minp.z})
+		pelin_maps.forest_top:get2dMap_flat({x=minp.x, y=minp.z}, pmap_f_top)
 		strassx = get_ws_list(2, minp.x)
 		strassz = get_ws_list(2, minp.z)
 	end
@@ -410,7 +410,8 @@ minetest.register_on_generated(function(minp, maxp, seed)
 	local num2, tab2
 	if buildings >= 1 then
 		num2 = 1
-		tab2 = nether_weird_noise({x=minp.x, y=nether.buildings-79, z=minp.z}, pymg, 200, 8, 10, 79)
+		tab2 = nether_weird_noise({x=minp.x, y=nether.buildings-79, z=minp.z},
+			pymg, 200, 8, 10, side_length-1)
 	end
 
 	local count = 0
@@ -456,17 +457,18 @@ minetest.register_on_generated(function(minp, maxp, seed)
 				py_h_g = nether.buildings-7
 			end
 
+			local vi = area:index(x, minp.y, z)
 			if buildings == 1
 			and noisp then
 				if noisp == 1 then
-					for y=minp.y, maxp.y do
+					for _ = 1,side_length do
-						local p_addpos = area:index(x, y, z)
+						data[vi] = c.netherrack_brick
-						data[p_addpos] = c.netherrack_brick
+						vi = vi + area.ystride
 					end
 				else
-					for y=minp.y, maxp.y do
+					for _ = 1,side_length do
-						local p_addpos = area:index(x, y, z)
+						data[vi] = c.lava
-						data[p_addpos] = c.lava
+						vi = vi + area.ystride
 					end
 				end
 			else
@@ -478,15 +480,19 @@ minetest.register_on_generated(function(minp, maxp, seed)
 
 				local f_bottom, f_top, is_forest, f_h_dirt
 				if forest_possible then
-					local p = {x=math.floor(x/f_bottom_scale), z=math.floor(z/f_bottom_scale)}
+					local p = {x=math.floor(x/f_bottom_scale),
+						z=math.floor(z/f_bottom_scale)}
 					local pstr = p.x.." "..p.z
 					if not f_perlins[pstr] then
-						f_perlins[pstr] = math.floor(f_h_min+(math.abs(perlin_f_bottom:get2d({x=p.x, y=p.z})+1))*f_yscale_bottom+0.5)
+						f_perlins[pstr] = math.floor(f_h_min + (math.abs(
+							perlin_f_bottom:get2d{x=p.x, y=p.z} + 1))
+							* f_yscale_bottom + 0.5)
 					end
 					local top_noise = pmap_f_top[count]+1
 					if top_noise < 0 then
 						top_noise = -top_noise/10
-						--nether:inform("ERROR: (perlin noise) "..pmap_f_top[count].." is not inside [-1; 1]", 1)
+						--nether:inform("ERROR: (perlin noise) "..
+						-- pmap_f_top[count].." is not inside [-1; 1]", 1)
 					end
 					f_top = math.floor(f_h_max - top_noise*f_yscale_top + 0.5)
 					f_bottom = f_perlins[pstr]+pr:next(0,f_bottom_scale-1)
@@ -495,78 +501,74 @@ minetest.register_on_generated(function(minp, maxp, seed)
 				end
 
 				for y=minp.y, maxp.y do
-					local p_addpos = area:index(x, y, z)
+					local d_p_addp = data[vi]
-					local d_p_addp = data[p_addpos]
 					--if py_h >= maxp.y-4 then
 					if y <= py_h
 					and noisp then
 						if noisp == 1 then
-							data[p_addpos] = c.netherrack_brick
+							data[vi] = c.netherrack_brick
 						elseif noisp == 2 then
 							if y == py_h then
-								data[p_addpos] = c.netherrack_brick
+								data[vi] = c.netherrack_brick
 							elseif y == py_h_g
 							and pr:next(1,3) <= 2 then
-								data[p_addpos] = c.netherrack
+								data[vi] = c.netherrack
 							elseif y <= py_h_g then
-								data[p_addpos] = c.lava
+								data[vi] = c.lava
 							else
-								data[p_addpos] = c.air
+								data[vi] = c.air
 							end
 						end
 					elseif d_p_addp ~= c.air then
 
 						if is_forest
 						and y == f_bottom then
-							data[p_addpos] = c.nether_dirt_top
+							data[vi] = c.nether_dirt_top
 						elseif is_forest
 						and y < f_bottom
 						and y >= f_h_dirt then
-							data[p_addpos] = c.nether_dirt
+							data[vi] = c.nether_dirt
 						elseif is_forest
 						and y == f_h_dirt-1 then
-							data[p_addpos] = c.nether_dirt_bottom
+							data[vi] = c.nether_dirt_bottom
 						elseif is_forest
 						and y == f_h_dirt+1 then
 							if pr:next(1,tree_rarity) == 1 then
 								trees[num_trees] = {x=x, y=y, z=z}
 								num_trees = num_trees+1
 							elseif pr:next(1,mushroom_rarity) == 1 then
-								data[p_addpos] = c.nether_shroom
+								data[vi] = c.nether_shroom
 							elseif pr:next(1,glowflower_rarity) == 1 then
-								data[p_addpos] = c.glowflower
+								data[vi] = c.glowflower
 							elseif pr:next(1,grass_rarity) == 1 then
-								data[p_addpos] = c.nether_grass[pr:next(1,3)]
+								data[vi] = c.nether_grass[pr:next(1,3)]
 							else
-								data[p_addpos] = c.air
+								data[vi] = c.air
 							end
 						elseif is_forest
 						and y > f_bottom
 						and y < f_top then
-							if not table_contains(
+							if not nether_tree_nodes[d_p_addp] then
-								{c.nether_tree, c.nether_tree_corner, c.nether_leaves, c.nether_fruit},
+								data[vi] = c.air
-								d_p_addp
-							) then
-								data[p_addpos] = c.air
 							end
 						elseif is_forest
 						and y == f_top then
 							local sel = math.floor(strassx[x]+strassz[z]+0.5)%10
 							if sel <= 5 then
-								data[p_addpos] = return_nether_ore(d_p_addp, true)
+								data[vi] = return_nether_ore(d_p_addp, true)
 							elseif sel == 6 then
-								data[p_addpos] = c.netherrack_black
+								data[vi] = c.netherrack_black
 							elseif sel == 7 then
-								data[p_addpos] = c.glowstone
+								data[vi] = c.glowstone
 							else
-								data[p_addpos] = c.air
+								data[vi] = c.air
 							end
 
 						elseif y <= NETHER_BOTTOM then
 							if y <= bottom then
-								data[p_addpos] = return_nether_ore(d_p_addp, true)
+								data[vi] = return_nether_ore(d_p_addp, true)
 							else
-								data[p_addpos] = c.lava
+								data[vi] = c.lava
 							end
 						elseif r_structure == 1
 						and y == bottom then
@@ -574,26 +576,27 @@ minetest.register_on_generated(function(minp, maxp, seed)
 							num = num+1
 						elseif y <= bottom then
 							if pr:next(1,LAVA_FREQ) == 1 then
-								data[p_addpos] = c.lava
+								data[vi] = c.lava
 							else
-								data[p_addpos] = return_nether_ore(d_p_addp, false)
+								data[vi] = return_nether_ore(d_p_addp, false)
 							end
 						elseif r_shroom == 1
 						and r_structure ~= 1
 						and y == bottom+1 then
-							data[p_addpos] = c.nether_shroom
+							data[vi] = c.nether_shroom
 						elseif (y == top and r_glowstone == 1) then
-							data[p_addpos] = c.glowstone
+							data[vi] = c.glowstone
 						elseif y >= top then
-							data[p_addpos] = return_nether_ore(d_p_addp, true)
+							data[vi] = return_nether_ore(d_p_addp, true)
 						elseif y <= top-1
 						and generate_vine
 						and y >= top-r_vine_length then
-							data[p_addpos] = c.nether_vine
+							data[vi] = c.nether_vine
 						else
-							data[p_addpos] = c.air
+							data[vi] = c.air
 						end
 					end
+					vi = vi + area.ystride
 				end
 			end
 		end
@@ -602,37 +605,42 @@ minetest.register_on_generated(function(minp, maxp, seed)
 --	vm:set_lighting(12)
 --	vm:calc_lighting()
 --	vm:update_liquids()
-	vm:write_to_map()
+	vm:write_to_map(false)
 
 	nether:inform("nodes set", 2, t1)
 
-	local t2 = os.clock()
+	local t2 = minetest.get_us_time()
+	local tr_bl_cnt = 0
 
-	if structures_enabled then	--Trees:
+	if structures_enabled then -- Blood netherstructures
-		for _,v in ipairs(tab) do
+		tr_bl_cnt = #tab
-			nether.grow_netherstructure(v, true)
+		for i = 1,tr_bl_cnt do
+			nether.grow_netherstructure(tab[i], true)
 		end
 	end
 
-	if forest_possible then	--Trees:
+	if forest_possible then -- Forest trees
-		for _,v in ipairs(trees) do
+		tr_bl_cnt = tr_bl_cnt + #trees
-			nether.grow_tree(v, true)
+		for i = 1,#trees do
+			nether.grow_tree(trees[i], true)
 		end
 	end
 
-	nether:inform("trees set", 2, t2)
+	if tr_bl_cnt > 0 then
+		nether:inform(tr_bl_cnt .. " trees and blood structures set", 2, t2)
+	end
 
-	t2 = os.clock()
+	t2 = minetest.get_us_time()
-	fix_light(minp, maxp)
+	minetest.fix_light(minp, maxp)
 
-	nether:inform("map updated", 2, t2)
+	nether:inform("light fixed", 2, t2)
 
 	nether:inform("done", 1, t1)
 end)
 
 
 function nether.grow_netherstructure(pos, generated)
-	local t1 = os.clock()
+	local t1 = minetest.get_us_time()
 
 	if not contents_defined then
 		define_contents()
@@ -649,8 +657,10 @@ function nether.grow_netherstructure(pos, generated)
 	local area = r_area(manip, 2, height, pos)
 	local nodes = manip:get_data()
 
-	for i = 0, height-1 do
+	local vi = area:indexp(pos)
-		nodes[area:index(pos.x, pos.y+i, pos.z)] = c.blood_stem
+	for _ = 0, height-1 do
+		nodes[vi] = c.blood_stem
+		vi = vi + area.ystride
 	end
 
 	for i = -1,1 do
@@ -689,6 +699,9 @@ function nether.grow_netherstructure(pos, generated)
 end
 
 
+local poshash = minetest.hash_node_position
+local pos_from_hash = minetest.get_position_from_hash
+
 local function soft_node(id)
 	return id == c.air or id == c.ignore
 end
@@ -698,7 +711,6 @@ local function update_minmax(min, max, p)
 	max.x = math.max(max.x, p.x)
 	min.z = math.min(min.z, p.z)
 	max.z = math.max(max.z, p.z)
-	return min, max
 end
 
 local fruit_chances = {}
@@ -726,7 +738,7 @@ local leaf_thickness = 3 --a bigger number results in more blank trees
 local h_trunk_max = h_max-h_arm_max
 
 function nether.grow_tree(pos, generated)
-	local t1 = os.clock()
+	local t1 = minetest.get_us_time()
 
 	if not contents_defined then
 		define_contents()
@@ -769,18 +781,20 @@ function nether.grow_tree(pos, generated)
 			for j = 1,r do
 				local x = p.x+j*dir[1]
 				local z = p.z+j*dir[2]
-				trunks[x.." "..p.y.." "..z] = dir[3]
+				trunks[poshash{x=x, y=p.y, z=z}] = dir[3]
 			end
 			r = r+1
 			p.x = p.x+r*dir[1]
 			p.z = p.z+r*dir[2]
-			trunk_corners[p.x.." "..p.y.." "..p.z] = dir[4] or dir[3]
+			trunk_corners[poshash(p)] = dir[4] or dir[3]
 			local h = math.random(h_arm_min, h_arm_max)
 			for i = 1,h do
-				trunks[p.x.." "..p.y+i.." "..p.z] = true
+				p.y = p.y + i
+				trunks[poshash(p)] = true
+				p.y = p.y - i
 			end
 			p.y = p.y+h
-			--n = #todo+1 -- causes small trees
+			--n = #todo+1 -- caused small trees
 			todo[#todo+1] = p
 		end
 		if p.y > pos.y+h_trunk_max then
@@ -793,13 +807,23 @@ function nether.grow_tree(pos, generated)
 	local fruits = {}
 	local trunk_ps = {}
 	local count = 0
-	for n,par in pairs(trunks) do
+
-		local p = {}
+	local ps = {}
-		p.x, p.y, p.z = unpack(string.split(n, " "))
+	local trunk_count = 0
-		if par ~= true then
+	for i,par2 in pairs(trunks) do
-			p.par = par
+		local pos = pos_from_hash(i)
+		update_minmax(min, max, pos)
+		local z,y,x = pos.z, pos.y, pos.x
+		trunk_count = trunk_count+1
+		ps[trunk_count] = {z,y,x, par2}
+	end
+
+	for _,d in pairs(ps) do
+		if d[4] == true then
+			d[4] = nil
 		end
-		table.insert(trunk_ps, p)
+		trunk_ps[#trunk_ps+1] = d
+		local pz, py, px = unpack(d)
 		count = count+1
 		if count > leaf_thickness then
 			count = 0
@@ -807,18 +831,22 @@ function nether.grow_tree(pos, generated)
 				local fruit_chance = fruit_chances[y]
 				for z = -2,2 do
 					for x = -2,2 do
-						local dist = math.sqrt(x*x+y*y+z*z)
+						local distq = x*x+y*y+z*z
-						if math.floor(dist) ~= 0
+						if distq ~= 0
-						and math.random(1, dist) == 1 then
+						and math.random(1, math.sqrt(distq)) == 1 then
-							local pstr = p.x+x.." "..p.y+y.." "..p.z+z
+							local x = x+px
-							if not trunks[pstr] then
+							local y = y+py
-								if math.random(1, fruit_rarity) == 1
+							local z = z+pz
-								and fruit_chance
+							local vi = poshash{x=x, y=y, z=z}
+							if not trunks[vi] then
+								if fruit_chance
+								and math.random(1, fruit_rarity) == 1
 								and math.random(1, fruit_chance) == 1 then
-									fruits[pstr] = true
+									fruits[vi] = true
 								else
-									leaves[pstr] = true
+									leaves[vi] = true
 								end
+								update_minmax(min, max, {x=x, z=z})
 							end
 						end
 					end
@@ -827,37 +855,12 @@ function nether.grow_tree(pos, generated)
 		end
 	end
 
-	local leaf_ps = {}
+	--ps = nil
-	for n,_ in pairs(leaves) do
+	--collectgarbage()
-		local p = {}
-		p.x, p.y, p.z = unpack(string.split(n, " "))
-		table.insert(leaf_ps, p)
-		min, max = update_minmax(min, max, p)
-	end
-
-	for n,_ in pairs(trunks) do
-		local p = {}
-		p.x, _, p.z = unpack(string.split(n, " "))
-		min, max = update_minmax(min, max, p)
-	end
 
 	for i = -1,h_stem+1 do
-		table.insert(trunk_ps, {x=pos.x, y=pos.y+i, z=pos.z, par=0})
+		-- param2 explicitly set 0 due to possibly previous leaves node
-	end
+		trunk_ps[#trunk_ps+1] = {pos.z, pos.y+i, pos.x, 0}
-
-	local trunk_corner_ps = {}
-	for n,par in pairs(trunk_corners) do
-		local p = {}
-		p.x, p.y, p.z = unpack(string.split(n, " "))
-		p.par = par
-		table.insert(trunk_corner_ps, p)
-	end
-
-	local fruit_ps = {}
-	for n,_ in pairs(fruits) do
-		local p = {}
-		p.x, p.y, p.z = unpack(string.split(n, " "))
-		table.insert(fruit_ps, p)
 	end
 
 	local manip = minetest.get_voxel_manip()
@@ -866,8 +869,8 @@ function nether.grow_tree(pos, generated)
 	local nodes = manip:get_data()
 	local param2s = manip:get_param2_data()
 
-	for _,p in pairs(leaf_ps) do
+	for i in pairs(leaves) do
-		p = area:indexp(p)
+		local p = area:indexp(pos_from_hash(i))
 		if soft_node(nodes[p]) then
 			nodes[p] = c.nether_leaves
 			param2s[p] = math.random(0,179)
@@ -875,43 +878,35 @@ function nether.grow_tree(pos, generated)
 		end
 	end
 
-	for _,p in pairs(fruit_ps) do
+	for i in pairs(fruits) do
-		p = area:indexp(p)
+		local p = area:indexp(pos_from_hash(i))
 		if soft_node(nodes[p]) then
 			nodes[p] = c.nether_apple
 		end
 	end
 
-	for _,p in pairs(trunk_ps) do
+	for i = 1,#trunk_ps do
-		local par = p.par
+		local p = trunk_ps[i]
-		p = area:indexp(p)
+		local par = p[4]
+		p = area:index(p[3], p[2], p[1])
 		if par then
 			param2s[p] = par
 		end
 		nodes[p] = c.nether_tree
 	end
 
-	for _,p in pairs(trunk_corner_ps) do
+	for i,par2 in pairs(trunk_corners) do
-		local par = p.par
+		local vi = area:indexp(pos_from_hash(i))
-		p = area:indexp(p)
+		nodes[vi] = c.nether_tree_corner
-		nodes[p] = c.nether_tree_corner
+		param2s[vi] = par2
-		param2s[p] = par
 	end
 
-	--calculating took ca. 0.07 - 0.18 [s]
 	manip:set_data(nodes)
 	manip:set_param2_data(param2s)
-	manip:write_to_map()
+	manip:write_to_map(not generated)
-	local spam = 2
+	nether:inform("a nether tree with " .. trunk_count ..
-	if generated then
+		" branch trunk nodes grew at " .. minetest.pos_to_string(pos),
-		spam = 3
+		generated and 3 or 2, t1)
-	end
-	nether:inform("a nether tree grew at ("..pos.x.."|"..pos.y.."|"..pos.z..")", spam, t1)
-	if not generated then
-		local t1 = os.clock()
-		manip:update_map()
-		nether:inform("map updated", spam, t1)
-	end
 end
 
 
@@ -935,12 +930,13 @@ minetest.register_abm({
 minetest.register_abm({
 	nodenames = {"nether:tree_sapling"},
 	neighbors = {"group:nether_dirt"},
-	interval = 864,
+	interval = abm_tree_interval,
-	chance = 100,
+	chance = abm_tree_chance,
 	action = function(pos)
 		if minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z}).name == "air"
 		and minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name == "air" then
-			local udata = minetest.registered_nodes[minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name]
+			local udata = minetest.registered_nodes[
+				minetest.get_node{x=pos.x, y=pos.y-1, z=pos.z}.name]
 			if udata
 			and udata.groups
 			and udata.groups.nether_dirt then
@@ -961,13 +957,15 @@ minetest.register_abm({
 			return
 		end
 		pos.y = pos.y+1
-		if (minetest.get_node_light(pos) or 16) > 7 then --mushrooms grow at dark places
+		--mushrooms grow at dark places
+		if (minetest.get_node_light(pos) or 16) > 7 then
 			return
 		end
 		if minetest.get_node(pos).name == "air" then
 			minetest.set_node(pos, {name="riesenpilz:nether_shroom"})
 			pos.y = pos.y-1
-			minetest.set_node(pos, {name="nether:netherrack_soil", param2=par2-1})
+			minetest.set_node(pos,
+				{name="nether:netherrack_soil", param2=par2-1})
 		end
 	end
 })
@@ -981,6 +979,10 @@ local function grass_allowed(pos)
 		return 0
 	end
 	local data = minetest.registered_nodes[nd]
+	if not data then
+		-- unknown node
+		return false
+	end
 	local drawtype = data.drawtype
 	if drawtype
 	and drawtype ~= "normal"
@@ -1027,16 +1029,17 @@ minetest.register_abm({
 })
 
 
-minetest.register_privilege("nether", "Allows sending players to nether and extracting them")
+minetest.register_privilege("nether",
+	"Allows sending players to nether and extracting them")
 
 dofile(path.."/crafting.lua")
 dofile(path.."/portal.lua")
 dofile(path.."/guide.lua")
 
 
-local time = math.floor(tonumber(os.clock()-load_time_start)*100+0.5)/100
+local time = (minetest.get_us_time() - load_time_start) / 1000000
-local msg = "[nether] loaded after ca. "..time
+local msg = ("[nether] loaded after ca. %g seconds."):format(time)
-if time > 0.05 then
+if time > 0.01 then
 	print(msg)
 else
 	minetest.log("info", msg)

nether/items.lua

@@ -35,11 +35,17 @@ local function add_fence(name)
 end
 --]]
 
+local creative_installed = minetest.global_exists("creative")
+
 local function digging_allowed(player, v)
 	if not player then
 		return false
 	end
-	local tool = minetest.registered_tools[player:get_wielded_item():get_name()]
+	if creative_installed and creative.is_enabled_for(player:get_player_name()) then
+		return true
+	end
+	local tool = player:get_wielded_item():get_name()
+	tool = minetest.registered_tools[tool] or tool == "" and minetest.registered_items[tool]
 	if not tool
 	or not tool.tool_capabilities then
 		return false
@@ -522,7 +528,7 @@ minetest.register_node("nether:leaves", {
 	description = "Nether Leaves",
 	drawtype = "plantlike",
 	waving = 1,
-	visual_scale = math.sqrt(math.sqrt(2)),
+	visual_scale = math.sqrt(2) + 0.01,
 	tiles = {"nether_leaves.png"},
 	inventory_image = "nether_leaves.png",
 	wield_image = "nether_leaves.png",
@@ -1001,3 +1007,11 @@ minetest.register_tool("nether:sword_white", {
 		damage_groups = {fleshy=11},
 	},
 })
+
+
+-- override creative hand
+if minetest.settings:get_bool("creative_mode") then
+	local capas = minetest.registered_items[""].tool_capabilities
+	capas.groupcaps.nether = capas.groupcaps.cracky
+	minetest.override_item("", {tool_capabilities = capas})
+end

nether/mod.conf

@@ -0,0 +1,3 @@
+name = nether
+depends = default,glow,riesenpilz,stairs,vector_extras
+optional_depends = creative,fence_registration,function_delayer,watershed

nether/pearl.lua

@@ -7,7 +7,7 @@ local function table_contains(t, v)
 	return false
 end
 
-local creative = minetest.setting_getbool("creative_mode")
+local creative = minetest.settings:get_bool("creative_mode")
 local function throw_pearl(item, player)
 	local playerpos = player:getpos()
 	playerpos.y = playerpos.y+1.625

nether/portal.lua

@@ -2,7 +2,7 @@
 
 -- kills the player if he uses PilzAdam portal
 local portal_target = nether.buildings+1
-local nether_prisons = minetest.setting_getbool("enable_damage")
+local nether_prisons = minetest.settings:get_bool("enable_damage")
 local obsidian_portal_kills = nether_prisons and true
 local mclike_portal = false
 
@@ -11,35 +11,34 @@ minetest.after(5, function()
 	abm_allowed = true
 end)
 
-table.icontains = table.icontains or function(t, v)
+local save_path = minetest.get_worldpath() .. "/nether_players"
-	for _,i in ipairs(t) do
-		if i == v then
-			return true
-		end
-	end
-	return false
-end
-
 local players_in_nether = {}
 -- only get info from file if nether prisons
 if nether_prisons then
-	local file = io.open(minetest.get_worldpath()..'/nether_players', "r")
+	local file = io.open(save_path, "r")
-	if file then
+	if not file then
-		local contents = file:read('*all')
+		return
-		io.close(file)
+	end
-		if contents then
+	local contents = file:read"*all"
-			players_in_nether = string.split(contents, " ")
+	io.close(file)
-		end
+	if not contents then
+		return
+	end
+	local playernames = string.split(contents, " ")
+	for i = 1,#playernames do
+		players_in_nether[playernames[i]] = true
 	end
 end
 
 local function save_nether_players()
-	local output = ''
+	local playernames,n = {},1
-	for _,name in ipairs(players_in_nether) do
+	for name in pairs(players_in_nether) do
-		output = output..name..' '
+		playernames[n] = name
+		n = n+1
 	end
-	local f = io.open(minetest.get_worldpath()..'/nether_players', "w")
+	local f = io.open(save_path, "w")
-	f:write(output)
+	assert(f, "Could not open nether_players file for writing.")
+	f:write(table.concat(playernames, " "))
 	io.close(f)
 end
 
@@ -58,80 +57,77 @@ end
 
 -- returns nodename if area is generated, else calls generation function
 local function generated_or_generate(pos)
-	local name = minetest.get_node(pos).name
+	local node = minetest.get_node_or_nil(pos)
-	if name ~= "ignore" then
+	if node then
-		return name
+		return node.name
 	end
 	minetest.get_voxel_manip():read_from_map(pos, pos)
-	name = minetest.get_node_or_nil(pos)
+	node = minetest.get_node_or_nil(pos)
-	if not name then
+	if not node then
 		minetest.emerge_area(vector.subtract(pos, 80), vector.add(pos, 80))
 		return false
 	end
-	return name.name
+	return node.name
 end
 
 -- where the player appears after dying
 local function get_player_died_target(player)
-	local target = vector.add(player:getpos(), {x=math.random(-100,100), y=0, z=math.random(-100,100)})
+	local target = vector.add(player:getpos(),
+		{x=math.random(-100,100), y=0, z=math.random(-100,100)})
 	target.y = portal_target + math.random(4)
 	return target
 end
 
 -- used for obsidian portal
-local function obsidian_teleport(player, pname)
+local function obsidian_teleport(player, pname, target)
-	minetest.chat_send_player(pname, "For any reason you arrived here. Type /nether_help to find out things like craft recipes.")
+	minetest.chat_send_player(pname, "For any reason you arrived here. Type " ..
-	if obsidian_portal_kills then
+		"/nether_help to find out things like craft recipes.")
+	players_in_nether[pname] = true
+	save_nether_players()
+	update_background(player, true)
+	if target then
+		player:set_pos(target)
+	else
 		player:set_hp(0)
-		return true
 	end
-	if not mclike_portal then
-		local target = vector.round(get_player_died_target(player))
-		if generated_or_generate(target) then
-			player:moveto(target)
-			return true
-		end
-	end
-	return false
 end
 
 -- teleports players to nether or helps it
-local function player_to_nether(player, safe)
+local function player_to_nether(player, pos)
 	local pname = player:get_player_name()
-	if table.icontains(players_in_nether, pname) then
+	if players_in_nether[pname] then
 		return
 	end
-	players_in_nether[#players_in_nether+1] = pname
+	players_in_nether[pname] = true
 	save_nether_players()
-	if not safe then
-		minetest.chat_send_player(pname, "For any reason you arrived here. Type /nether_help to find out things like craft recipes.")
-		player:set_hp(0)
-		if not nether_prisons then
-			player:moveto(get_player_died_target(player))
-		end
-	end
 	update_background(player, true)
+	if pos then
+		player:set_pos(pos)
+		return
+	end
+	minetest.chat_send_player(pname, "For any reason you arrived here. " ..
+		"Type /nether_help to find out things like craft recipes.")
+	player:set_hp(0)
+	if not nether_prisons then
+		player:set_pos(get_player_died_target(player))
+	end
 end
 
-local function player_from_nether(player)
+local function player_from_nether(player, pos)
 	local pname = player:get_player_name()
-	local changes
+	if players_in_nether[pname] then
-	for n,i in ipairs(players_in_nether) do
+		players_in_nether[pname] = nil
-		if i == pname then
-			table.remove(players_in_nether, n)
-			changes = true
-		end
-	end
-	if changes then
 		save_nether_players()
 	end
 	update_background(player)
+	player:set_pos(pos)
 end
 
 
 local function player_exists(name)
-	for _,player in pairs(minetest.get_connected_players()) do
+	local players = minetest.get_connected_players()
-		if player:get_player_name() == name then
+	for i = 1,#players do
+		if players[i]:get_player_name() == name then
 			return true
 		end
 	end
@@ -144,7 +140,8 @@ minetest.register_chatcommand("to_hell", {
 	description = "Send someone to hell",
 	func = function(name, pname)
 		if not minetest.check_player_privs(name, {nether=true}) then
-			return false, "You need the nether priv to execute this chatcommand."
+			return false,
+				"You need the nether privilege to execute this chatcommand."
 		end
 		if not player_exists(pname) then
 			pname = name
@@ -164,7 +161,8 @@ minetest.register_chatcommand("from_hell", {
 	description = "Extract from hell",
 	func = function(name, pname)
 		if not minetest.check_player_privs(name, {nether=true}) then
-			return false, "You need the nether priv to execute this chatcommand."
+			return false,
+				"You need the nether priv to execute this chatcommand."
 		end
 		if not player_exists(pname) then
 			pname = name
@@ -174,9 +172,8 @@ minetest.register_chatcommand("from_hell", {
 			return false, "Something went wrong."
 		end
 		minetest.chat_send_player(pname, "You are free now")
-		player_from_nether(player)
 		local pos = player:getpos()
-		player:moveto({x=pos.x, y=100, z=pos.z})
+		player_from_nether(player, {x=pos.x, y=100, z=pos.z})
 		return true, pname.." is now out of the nether."
 	end
 })
@@ -186,11 +183,11 @@ if nether_prisons then
 	-- randomly set player position when he/she dies in nether
 	minetest.register_on_respawnplayer(function(player)
 		local pname = player:get_player_name()
-		if not table.icontains(players_in_nether, pname) then
+		if not players_in_nether[pname] then
 			return
 		end
 		local target = get_player_died_target(player)
-		player:moveto(target)
+		player:set_pos(target)
 		minetest.after(0, function(pname, target)
 			-- fixes respawn bug
 			local player = minetest.get_player_by_name(pname)
@@ -201,65 +198,79 @@ if nether_prisons then
 		return true
 	end)
 
-	-- function for teleporting players where they belong to
+	-- override set_pos etc. to disallow player teleportion by e.g. travelnet
-	local function update_players()
+	local function can_teleport(player, pos)
-		for _,player in pairs(minetest.get_connected_players()) do
+		if not player:is_player() then
-			local pname = player:get_player_name()
+			-- the same metatable is used for entities
-			local ppos = player:getpos()
+			return true
-			if table.icontains(players_in_nether, pname) then
+		end
-				if ppos.y > nether.start then
+		local pname = player:get_player_name()
-					player:moveto({x=ppos.x, y=portal_target, z=ppos.z})
+		local in_nether = players_in_nether[pname] == true
-					update_background(player, true)
+
-					--[[minetest.kick_player(pname, "\n1. Maybe you were not allowed to teleport out of the nether."..
+		-- test if the target is valid
-						"\n2. Maybe the server lagged."..
+		if pos.y < nether.start then
-						"\n3. please rejoin")]]
+			if in_nether then
-				end
+				return true
-			elseif ppos.y < nether.start then
-				update_background(player)
-				player:moveto({x=ppos.x, y=20, z=ppos.z})
-				--[[minetest.kick_player(pname, "\n1. Maybe you were not allowed to teleport to the nether."..
-					"\n2. Maybe the server lagged."..
-					"\n3. please rejoin")]]
 			end
+		elseif not in_nether then
+			return true
 		end
-	end
 
-	-- fix wrong player positions
+		-- test if the current position is valid
-	local timer = 0	--doesn't work if the server lags
+		local current_pos = player:get_pos()
-	minetest.register_globalstep(function(dtime)
+		local now_in_nether = current_pos.y < nether.start
-		timer = timer + dtime;
+		if now_in_nether ~= in_nether then
-		if timer >= 2 then
+			if in_nether then
-			--minetest.after(1, update_players)
+				minetest.log("action", "Player \"" .. pname ..
-			update_players()
+					"\" has to be in the nether, teleporting it!")
-			timer = 0
-		end
-	end)
-
-	-- set background when player joins
-	minetest.register_on_joinplayer(function(player)
-		minetest.after(0, function(player)
-			if player:getpos().y < nether.start then
 				update_background(player, true)
+				current_pos.y = portal_target
+				player:set_pos(current_pos)
+			else
+				minetest.log("action", "Player \"" .. pname ..
+					"\" must not be in the nether, teleporting it!")
+				update_background(player)
+				current_pos.y = 20
+				player:set_pos(current_pos)
 			end
-		end, player)
+			return false
+		end
+
+		minetest.chat_send_player(pname,
+			"You can not simply teleport to or from the nether!")
+		minetest.log("action", "Player \"" .. pname ..
+			"\" attempted to teleport from or to the nether, ignoring.")
+		return false
+	end
+	local methods = {"set_pos", "move_to", "setpos", "moveto"}
+	local metatable_overridden
+	minetest.register_on_joinplayer(function(player)
+		-- set the background when the player joins
+		if player:getpos().y < nether.start then
+			update_background(player, true)
+		end
+
+		-- overide set_pos etc. if not yet done
+		if metatable_overridden then
+			return
+		end
+		metatable_overridden = true
+		local mt = getmetatable(player)
+		for i = 1,#methods do
+			local methodname = methods[i]
+			local origfunc = mt[methodname]
+			mt[methodname] = function(...)
+				if can_teleport(...) then
+					origfunc(...)
+				end
+			end
+		end
 	end)
 else
 	-- test if player is in nether when he/she joins
 	minetest.register_on_joinplayer(function(player)
-		minetest.after(0, function(player)
+		players_in_nether[player:get_player_name()] =
-			if player:getpos().y < nether.start then
+			player:getpos().y < nether.start or nil
-				if not table.icontains(players_in_nether, pname) then
-					players_in_nether[#players_in_nether+1] = pname
-				end
-				return
-			end
-			for i,name in pairs(players_in_nether) do
-				if name == pname then
-					players_in_nether[i] = nil
-					return
-				end
-			end
-		end, player)
 	end)
 end
 
@@ -295,7 +306,7 @@ local particledef = {
 -- teleports player to neter (obsidian portal)
 local function obsi_teleport_player(player, pos, target)
 	local pname = player:get_player_name()
-	if table.icontains(players_in_nether, pname) then
+	if players_in_nether[pname] then
 		return
 	end
 
@@ -305,19 +316,26 @@ local function obsi_teleport_player(player, pos, target)
 		return
 	end
 
-	if not obsidian_teleport(player, pname) then
+	local has_teleported
+	if obsidian_portal_kills then
+		obsidian_teleport(player, pname)
+		has_teleported = true
+	elseif not mclike_portal then
+		local target = vector.round(get_player_died_target(player))
+		if generated_or_generate(target) then
+			obsidian_teleport(player, pname, target)
+			has_teleported = true
+		end
+	end
+
+	if not has_teleported then
 		-- e.g. ungenerated area
 		return
 	end
 
-	players_in_nether[#players_in_nether+1] = pname
-	save_nether_players()
-	update_background(player, true)
-
 	remove_portal_essence(pos)
 
 	minetest.sound_play("nether_portal_usual", {to_player=pname, gain=1})
-	--obj:setpos(target)
 end
 
 -- abm for particles of the obsidian portal essence and for teleporting
@@ -332,7 +350,8 @@ minetest.register_abm({
 		end
 		particledef.minpos = {x=pos.x-0.25, y=pos.y-0.5, z=pos.z-0.25}
 		particledef.maxpos = {x=pos.x+0.25, y=pos.y+0.34, z=pos.z+0.25}
-		particledef.texture = "nether_portal_particle.png^[transform"..math.random(0,7)
+		particledef.texture = "nether_portal_particle.png^[transform" ..
+			math.random(0, 7)
 		minetest.add_particlespawner(particledef)
 		for _,obj in pairs(minetest.get_objects_inside_radius(pos, 1)) do
 			if obj:is_player() then
@@ -544,14 +563,12 @@ minetest.after(0.1, function()
 		on_place = function(stack, player, pt)
 			if pt.under
 			and minetest.get_node(pt.under).name == "default:obsidian" then
-				--print("[nether] tries to enable a portal")
 				local done = make_portal(pt.under)
 				if done then
-					minetest.chat_send_player(
+					minetest.chat_send_player(player:get_player_name(),
-						player:get_player_name(),
+						"Warning: If you are in the nether you may not be " ..
-						"Warning: If you are in the nether you may not be able to find the way out!"
+						"able to find the way out!")
-					)
+					if not minetest.settings:get_bool("creative_mode") then
-					if not minetest.setting_getbool("creative_mode") then
 						stack:take_item()
 					end
 				end
@@ -577,8 +594,7 @@ function(r)
 	return tab
 end
 
--- detects if it's a portal
+local function is_netherportal(pos)
-local function netherport(pos)
 	local x, y, z = pos.x, pos.y, pos.z
 	for _,i in pairs({-1, 3}) do
 		if minetest.get_node({x=x, y=y+i, z=z}).name ~= "nether:white" then
@@ -642,14 +658,13 @@ function nether_port(player, pos)
 		minetest.log("error", "[nether] nether_port: something failed.")
 		return
 	end
-	if not netherport(pos) then
+	if not is_netherportal(pos) then
 		return
 	end
 	minetest.sound_play("nether_teleporter", {pos=pos})
 	local meta = minetest.get_meta({x=pos.x, y=pos.y-1, z=pos.z})
 	if pos.y < nether.start then
 		set_portal(known_portals_d, pos.z,pos.x, pos.y)
-		player_from_nether(player)
 
 		local my = tonumber(meta:get_string("y"))
 		local y = get_portal(known_portals_u, pos.z,pos.x)
@@ -660,9 +675,9 @@ function nether_port(player, pos)
 		else
 			y = my or 100
 		end
-		pos.y = y
+		pos.y = y - 0.3
 
-		player:moveto(pos)
+		player_from_nether(player, pos)
 	else
 		set_portal(known_portals_u, pos.z,pos.x, pos.y)
 
@@ -675,10 +690,9 @@ function nether_port(player, pos)
 		else
 			y = my or portal_target+math.random(4)
 		end
-		pos.y = y
+		pos.y = y - 0.3
 
-		player:moveto(pos)
+		player_to_nether(player, pos)
-		player_to_nether(player, true)
 	end
 	minetest.sound_play("nether_teleporter", {pos=pos})
 	return true