Move most of mapgen into mapgen thread

* The obsidian portal is the first way for a player to reach the nether,
  so if damage is enabled and `nether.trap_players` is disabled,
  the obsidian portal should teleport the player instead of killing him/her
  since after death he/she respawns in the overworld and not in the nether.
  A small change in `obsi_teleport_player` fixes this problem.
  Fixes #16.
* There exist other mods which need to check if players are in the nether and
  teleport them to/from the nether, so we add four helper functions:
  `nether.is_player_in_nether`, `nether.is_player_trapped_in_nether`.
  `nether.external_nether_teleport` and `nether.registry_update`.
  Fixes #14.
* Add the `in_hell`, `trapped_in_hell` and `update_hells_registry` chat
  commands, which can be used for debugging
* `players_in_nether` has no meaningful effect if `nether.trap_players` is
  disabled, so we rename it to `players_trapped_in_nether`.
* Add `nether.bottom`, which approximately corresponds to the lower end of the
  nether

LICENSE.txt

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

README.md

@@ -1,26 +1,11 @@
-[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…
-
-Thanks a lot to LeMagnesium, crabman77, Ombridride, Gael-de-Sailly, ObaniGemini and other people from server-minetestforfun for working on this mod.
-
-**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)  
-
-a long time ago this happened  
-![I'm a screenshot!](http://i.imgur.com/pMZYqt9.png)  
-I assume other screenshots could represent this mod in more serious ways
-
-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  
+* Mapgen: Find a way to get the perlin noise values inside [-1; 1] or use
-— add something containing items to that buildings  
+  another noise.
-— update leaves visual_scale
+  The problem is visible in the nether forest, where the mapgen code flattens
+  the ceiling if it is very high.
+* Mapgen: Generate more detail inside the simple pyramid-like "buildings",
+  e.g. add a small treasure chest node which contains items

nether/ /Nicht Leere Datei.lua

@@ -1,365 +0,0 @@
---[[ Nether leaves
-minetest.register_node("nether:leaves", {
-	description = "Nether Leaves",
-	drawtype = "allfaces_optional",
---	visual_scale = 1.189, --scale^2=sqrt(2)
-	tiles = {"nether_leaves.png"},
-	paramtype = "light",
-	groups = {snappy=3, leafdecay=2},
-	sounds = default.node_sound_leaves_defaults(),
-})]]
-
---[[ Nether Lava
-minetest.register_node("nether:lava_flowing", {
-	description = "Nether Lava (flowing)",
-	inventory_image = minetest.inventorycube("default_lava.png"),
-	drawtype = "flowingliquid",
-	tiles = {"default_lava.png"},
-	paramtype = "light",
-	light_source = LIGHT_MAX - 1,
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true,
-	liquidtype = "flowing",
-	liquid_alternative_flowing = "nether:lava_flowing",
-	liquid_alternative_source = "default:lava_source",
-	liquid_viscosity = LAVA_VISC,
-	damage_per_second = 4*2,
-	post_effect_color = {a=192, r=255, g=64, b=0},
-	special_materials = {
-		{image="default_lava.png", backface_culling=false},
-		{image="default_lava.png", backface_culling=true},
-	},
-	groups = {lava=3, liquid=2, hot=3},
-})
-
-minetest.register_node("nether:lava_source", {
-	description = "Nether Lava",
-	inventory_image = minetest.inventorycube("default_lava.png"),
-	drawtype = "liquid",
-	tiles = {"default_lava.png"},
-	paramtype = "light",
-	light_source = LIGHT_MAX - 1,
-	walkable = false,
-	pointable = false,
-	diggable = false,
-	buildable_to = true,
-	liquidtype = "source",
-	liquid_alternative_flowing = "nether:lava_flowing",
-	liquid_alternative_source = "default:lava_source",
-	liquid_viscosity = LAVA_VISC,
-	damage_per_second = 4*2,
-	post_effect_color = {a=192, r=255, g=64, b=0},
-	special_materials = {
-		-- New-style lava source material (mostly unused)
-		{image="default_lava.png", backface_culling=false},
-	},
-	groups = {lava=3, liquid=2, hot=3},
-})]]
-
--- Throne of Hades
-HADES_THRONE = {
-	-- Lava Moat
-	{pos={x=-1,y=-1,z=-1}, block="default:lava_source"},
-	{pos={x=-1,y=-1,z=0}, block="default:lava_source"},
-	{pos={x=-1,y=-1,z=1}, block="default:lava_source"},
-	{pos={x=-1,y=-1,z=2}, block="default:lava_source"},
-	{pos={x=-1,y=-1,z=3}, block="default:lava_source"},
-	{pos={x=-1,y=-1,z=4}, block="default:lava_source"},
-	{pos={x=-1,y=-1,z=5}, block="default:lava_source"},
-	{pos={x=-1,y=-1,z=6}, block="default:lava_source"},
-	{pos={x=-1,y=-1,z=7}, block="default:lava_source"},
-	{pos={x=0,y=-1,z=7}, block="default:lava_source"},
-	{pos={x=1,y=-1,z=7}, block="default:lava_source"},
-	{pos={x=2,y=-1,z=7}, block="default:lava_source"},
-	{pos={x=3,y=-1,z=7}, block="default:lava_source"},
-	{pos={x=4,y=-1,z=7}, block="default:lava_source"},
-	{pos={x=5,y=-1,z=7}, block="default:lava_source"},
-	{pos={x=6,y=-1,z=7}, block="default:lava_source"},
-	{pos={x=6,y=-1,z=6}, block="default:lava_source"},
-	{pos={x=6,y=-1,z=5}, block="default:lava_source"},
-	{pos={x=6,y=-1,z=4}, block="default:lava_source"},
-	{pos={x=6,y=-1,z=3}, block="default:lava_source"},
-	{pos={x=6,y=-1,z=2}, block="default:lava_source"},
-	{pos={x=6,y=-1,z=1}, block="default:lava_source"},
-	{pos={x=6,y=-1,z=0}, block="default:lava_source"},
-	{pos={x=6,y=-1,z=-1}, block="default:lava_source"},
-	{pos={x=5,y=-1,z=-1}, block="default:lava_source"},
-	{pos={x=4,y=-1,z=-1}, block="default:lava_source"},
-	{pos={x=3,y=-1,z=-1}, block="default:lava_source"},
-	{pos={x=2,y=-1,z=-1}, block="default:lava_source"},
-	{pos={x=1,y=-1,z=-1}, block="default:lava_source"},
-	{pos={x=0,y=-1,z=-1}, block="default:lava_source"},
-	-- Floor 1
-	{pos={x=0,y=0,z=0}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=1}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=2}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=3}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=4}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=1,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=2,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=4,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=1,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=2,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=4,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=4}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=3}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=2}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=1}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=0}, block="nether:netherrack"},
-	{pos={x=4,y=0,z=0}, block="nether:netherrack"},
-	{pos={x=3,y=0,z=0}, block="nether:netherrack"},
-	{pos={x=2,y=0,z=0}, block="nether:netherrack"},
-	{pos={x=1,y=0,z=0}, block="nether:netherrack"},
-	-- Floor 2
-	{pos={x=0,y=1,z=0}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=1}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=2}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=3}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=4}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=1,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=2,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=4,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=1,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=2,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=4,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=4}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=3}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=2}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=1}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=0}, block="nether:netherrack"},
-	{pos={x=4,y=1,z=0}, block="nether:netherrack"},
-	{pos={x=3,y=1,z=1}, block="nether:netherrack"},
-	{pos={x=2,y=1,z=1}, block="nether:netherrack"},
-	{pos={x=1,y=1,z=0}, block="nether:netherrack"},
-	{pos={x=1,y=1,z=1}, block="nether:netherrack"},
-	{pos={x=4,y=1,z=1}, block="nether:netherrack"},
-	-- Floor 3
-	{pos={x=0,y=2,z=0}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=1}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=2}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=3}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=4}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=1,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=2,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=4,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=1,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=2,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=4,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=4}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=3}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=2}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=1}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=0}, block="nether:netherrack"},
-	{pos={x=4,y=2,z=0}, block="nether:netherrack"},
-	{pos={x=3,y=2,z=2}, block="nether:netherrack"},
-	{pos={x=2,y=2,z=2}, block="nether:netherrack"},
-	{pos={x=1,y=2,z=0}, block="nether:netherrack"},
-	{pos={x=1,y=2,z=1}, block="nether:netherrack"},
-	{pos={x=4,y=2,z=1}, block="nether:netherrack"},
-	{pos={x=1,y=2,z=2}, block="nether:netherrack"},
-	{pos={x=4,y=2,z=2}, block="nether:netherrack"},
-	-- Floor 4
-	{pos={x=0,y=3,z=0}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=1}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=2}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=2,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=2,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=2}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=1}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=0}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=0}, block="nether:netherrack"},
-	{pos={x=3,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=2,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=0}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=1}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=1}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=2}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=2}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=2,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=2,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=3,y=3,z=5}, block="nether:netherrack"},
-	-- Floor 5
-	{pos={x=2,y=4,z=4}, block="nether:netherrack"},
-	{pos={x=2,y=4,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=4,z=4}, block="nether:netherrack"},
-	{pos={x=3,y=4,z=5}, block="nether:netherrack"},
-	{pos={x=2,y=4,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=4,z=6}, block="nether:netherrack"},
-	-- Torches on floor 5
-	{pos={x=0,y=4,z=4}, block="nether:torch_bottom"},
-	{pos={x=1,y=4,z=4}, block="nether:torch_bottom"},
-	{pos={x=0,y=4,z=5}, block="nether:torch_bottom"},
-	{pos={x=1,y=4,z=5}, block="nether:torch_bottom"},
-	{pos={x=4,y=4,z=4}, block="nether:torch_bottom"},
-	{pos={x=5,y=4,z=4}, block="nether:torch_bottom"},
-	{pos={x=4,y=4,z=5}, block="nether:torch_bottom"},
-	{pos={x=5,y=4,z=5}, block="nether:torch_bottom"},
-	{pos={x=0,y=4,z=0}, block="nether:torch_bottom"},
-	{pos={x=1,y=4,z=0}, block="nether:torch_bottom"},
-	{pos={x=0,y=4,z=1}, block="nether:torch_bottom"},
-	{pos={x=1,y=4,z=1}, block="nether:torch_bottom"},
-	{pos={x=4,y=4,z=0}, block="nether:torch_bottom"},
-	{pos={x=5,y=4,z=0}, block="nether:torch_bottom"},
-	{pos={x=4,y=4,z=1}, block="nether:torch_bottom"},
-	{pos={x=5,y=4,z=1}, block="nether:torch_bottom"},
-	{pos={x=0,y=4,z=2}, block="nether:torch_bottom"},
-	{pos={x=1,y=4,z=2}, block="nether:torch_bottom"},
-	{pos={x=0,y=4,z=3}, block="nether:torch_bottom"},
-	{pos={x=1,y=4,z=3}, block="nether:torch_bottom"},
-	{pos={x=4,y=4,z=2}, block="nether:torch_bottom"},
-	{pos={x=5,y=4,z=2}, block="nether:torch_bottom"},
-	{pos={x=4,y=4,z=3}, block="nether:torch_bottom"},
-	{pos={x=5,y=4,z=3}, block="nether:torch_bottom"},
-	{pos={x=4,y=4,z=6}, block="nether:torch_bottom"},
-	{pos={x=5,y=4,z=6}, block="nether:torch_bottom"},
-	{pos={x=0,y=4,z=6}, block="nether:torch_bottom"},
-	{pos={x=1,y=4,z=6}, block="nether:torch_bottom"},
-	-- Nether Portal
-	{pos={x=1,y=5,z=6}, portalblock=true},
-}
-
-
-minetest.register_on_generated(function(minp, maxp, seed)
-	if minp.y <= 99 then
-		return
-	end
-	local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
-	local data = vm:get_data()
-	local area = VoxelArea:new{MinEdge=emin, MaxEdge=emax}
-
-	local perlin1 = minetest.get_perlin(13,3, 0.5, 50)	--Get map specific perlin
-	local perlin2 = minetest.get_perlin(133,3, 0.5, 10)
-	for x=minp.x, maxp.x, 1 do
-		for z=minp.z, maxp.z, 1 do
-			local test = perlin1:get2d({x=x, y=z})+1
-			local test2 = perlin2:get2d({x=x, y=z})
---			print(test)
-			if test2 < 0 then
-				h = 200+math.floor(test2*3+0.5)
-			else
-				h = 203+math.floor(test*3+0.5)
-			end
-			for y=minp.y, maxp.y, 1 do
-				p_addpos = area:index(x, y, z)
-				if y <= h then
-					data[p_addpos] = c_netherrack
-				elseif y <= 201 then
-					data[p_addpos] = c_lava
-				end
-			end
-		end
-	end
-
-	vm:set_data(data)
-	--vm:set_lighting({day=0, night=0})
-	vm:calc_lighting()
-	vm:update_liquids()
-	vm:write_to_map()
-end)
-
-
-We don't want the Throne of Hades to get regenerated (especially since it will screw up portals)
-	if (minp.x <= HADES_THRONE_STARTPOS_ABS.x)
-	and (maxp.x >= HADES_THRONE_STARTPOS_ABS.x)
-	and (minp.y <= HADES_THRONE_STARTPOS_ABS.y)
-	and (maxp.y >= HADES_THRONE_STARTPOS_ABS.y)
-	and (minp.z <= HADES_THRONE_STARTPOS_ABS.z)
-	and (maxp.z >= HADES_THRONE_STARTPOS_ABS.z)
-	and (nether:fileexists(HADES_THRONE_GENERATED) == false) then
-		-- Pass 3: Make way for the Throne of Hades!
-		for x=(HADES_THRONE_STARTPOS_ABS.x - 1), (HADES_THRONE_ENDPOS_ABS.x + 1), 1 do
-			for z=(HADES_THRONE_STARTPOS_ABS.z - 1), (HADES_THRONE_ENDPOS_ABS.z + 1), 1 do
-				-- Notice I did not put a -1 for the beginning. This is because we don't want the throne to float
-				for y=HADES_THRONE_STARTPOS_ABS.y, (HADES_THRONE_ENDPOS_ABS.y + 1), 1 do
-					addpos = {x=x, y=y, z=z}
-					minetest.add_node(addpos, {name="air"})
-				end
-			end
-		end
-		-- Pass 4: Throne of Hades
-		for i,v in ipairs(HADES_THRONE_ABS) do
-			if v.portalblock == true then
-				NETHER_PORTALS_FROM_NETHER[table.getn(NETHER_PORTALS_FROM_NETHER)+1] = v.pos
-				nether:save_portal_from_nether(v.pos)
-				nether:createportal(v.pos)
-			else
-				minetest.add_node(v.pos, {name=v.block})
-			end
-		end
-		nether:touch(HADES_THRONE_GENERATED)
-	end
-
---[[ Create a nether tree
-function nether:grow_nethertree(pos)
-	--TRUNK
-	pos.y=pos.y+1
-	local trunkpos={x=pos.x, z=pos.z}
-	for y=pos.y, pos.y+4+math.random(2) do
-		trunkpos.y=y
-		minetest.add_node(trunkpos, {name="nether:tree"})
-	end
-	--LEAVES
-	local leafpos={}
-	for x=(trunkpos.x-NETHER_TREESIZE), (trunkpos.x+NETHER_TREESIZE), 1 do
-		for y=(trunkpos.y-NETHER_TREESIZE), (trunkpos.y+NETHER_TREESIZE), 1 do
-			for z=(trunkpos.z-NETHER_TREESIZE), (trunkpos.z+NETHER_TREESIZE), 1 do
-				if (x-trunkpos.x)*(x-trunkpos.x)
-				+(y-trunkpos.y)*(y-trunkpos.y)
-				+(z-trunkpos.z)*(z-trunkpos.z)
-				<= NETHER_TREESIZE*NETHER_TREESIZE + NETHER_TREESIZE then
-					leafpos={x=x, y=y, z=z}
-					if minetest.get_node(leafpos).name=="air" then
-						if math.random(NETHER_APPLE_FREQ) == 1 then
-							if math.random(NETHER_HEAL_APPLE_FREQ) == 1 then
-								minetest.add_node(leafpos, {name="default:apple"})
-							else
-								minetest.add_node(leafpos, {name="nether:apple"})
-							end
-						else
-							minetest.add_node(leafpos, {name="nether:leaves"})
-						end				
-					end				
-				end
-			end
-		end
-	end
-end]]

nether/ /temp.txt

@@ -1,166 +0,0 @@
-	-- Floor 1
-	{pos={x=0,y=0,z=0}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=1}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=2}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=3}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=4}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=1,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=2,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=4,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=5}, block="nether:netherrack"},
-	{pos={x=0,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=1,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=2,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=4,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=4}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=3}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=2}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=1}, block="nether:netherrack"},
-	{pos={x=5,y=0,z=0}, block="nether:netherrack"},
-	{pos={x=4,y=0,z=0}, block="nether:netherrack"},
-	{pos={x=3,y=0,z=0}, block="nether:netherrack"},
-	{pos={x=2,y=0,z=0}, block="nether:netherrack"},
-	{pos={x=1,y=0,z=0}, block="nether:netherrack"},
-	-- Floor 2
-	{pos={x=0,y=1,z=0}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=1}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=2}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=3}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=4}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=1,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=2,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=4,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=5}, block="nether:netherrack"},
-	{pos={x=0,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=1,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=2,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=4,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=4}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=3}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=2}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=1}, block="nether:netherrack"},
-	{pos={x=5,y=1,z=0}, block="nether:netherrack"},
-	{pos={x=4,y=1,z=0}, block="nether:netherrack"},
-	{pos={x=3,y=1,z=1}, block="nether:netherrack"},
-	{pos={x=2,y=1,z=1}, block="nether:netherrack"},
-	{pos={x=1,y=1,z=0}, block="nether:netherrack"},
-	{pos={x=1,y=1,z=1}, block="nether:netherrack"},
-	{pos={x=4,y=1,z=1}, block="nether:netherrack"},
-	-- Floor 3
-	{pos={x=0,y=2,z=0}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=1}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=2}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=3}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=4}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=1,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=2,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=4,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=5}, block="nether:netherrack"},
-	{pos={x=0,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=1,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=2,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=4,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=4}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=3}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=2}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=1}, block="nether:netherrack"},
-	{pos={x=5,y=2,z=0}, block="nether:netherrack"},
-	{pos={x=4,y=2,z=0}, block="nether:netherrack"},
-	{pos={x=3,y=2,z=2}, block="nether:netherrack"},
-	{pos={x=2,y=2,z=2}, block="nether:netherrack"},
-	{pos={x=1,y=2,z=0}, block="nether:netherrack"},
-	{pos={x=1,y=2,z=1}, block="nether:netherrack"},
-	{pos={x=4,y=2,z=1}, block="nether:netherrack"},
-	{pos={x=1,y=2,z=2}, block="nether:netherrack"},
-	{pos={x=4,y=2,z=2}, block="nether:netherrack"},
-	-- Floor 4
-	{pos={x=0,y=3,z=0}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=1}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=2}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=2,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=0,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=2,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=6}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=2}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=1}, block="nether:netherrack"},
-	{pos={x=5,y=3,z=0}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=0}, block="nether:netherrack"},
-	{pos={x=3,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=2,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=0}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=1}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=1}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=2}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=2}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=3}, block="nether:netherrack"},
-	{pos={x=1,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=4,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=2,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=2,y=3,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=3,z=4}, block="nether:netherrack"},
-	{pos={x=3,y=3,z=5}, block="nether:netherrack"},
-	-- Floor 5
-	{pos={x=2,y=4,z=4}, block="nether:netherrack"},
-	{pos={x=2,y=4,z=5}, block="nether:netherrack"},
-	{pos={x=3,y=4,z=4}, block="nether:netherrack"},
-	{pos={x=3,y=4,z=5}, block="nether:netherrack"},
-	{pos={x=2,y=4,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=4,z=6}, block="nether:netherrack"},
-	-- Torches on floor 5
-	{pos={x=0,y=4,z=4}, block="nether:nether_torch_bottom"},
-	{pos={x=1,y=4,z=4}, block="nether:nether_torch_bottom"},
-	{pos={x=0,y=4,z=5}, block="nether:nether_torch_bottom"},
-	{pos={x=1,y=4,z=5}, block="nether:nether_torch_bottom"},
-	{pos={x=4,y=4,z=4}, block="nether:nether_torch_bottom"},
-	{pos={x=5,y=4,z=4}, block="nether:nether_torch_bottom"},
-	{pos={x=4,y=4,z=5}, block="nether:nether_torch_bottom"},
-	{pos={x=5,y=4,z=5}, block="nether:nether_torch_bottom"},
-	{pos={x=0,y=4,z=0}, block="nether:nether_torch_bottom"},
-	{pos={x=1,y=4,z=0}, block="nether:nether_torch_bottom"},
-	{pos={x=0,y=4,z=1}, block="nether:nether_torch_bottom"},
-	{pos={x=1,y=4,z=1}, block="nether:nether_torch_bottom"},
-	{pos={x=4,y=4,z=0}, block="nether:nether_torch_bottom"},
-	{pos={x=5,y=4,z=0}, block="nether:nether_torch_bottom"},
-	{pos={x=4,y=4,z=1}, block="nether:nether_torch_bottom"},
-	{pos={x=5,y=4,z=1}, block="nether:nether_torch_bottom"},
-	{pos={x=0,y=4,z=2}, block="nether:nether_torch_bottom"},
-	{pos={x=1,y=4,z=2}, block="nether:nether_torch_bottom"},
-	{pos={x=0,y=4,z=3}, block="nether:nether_torch_bottom"},
-	{pos={x=1,y=4,z=3}, block="nether:nether_torch_bottom"},
-	{pos={x=4,y=4,z=2}, block="nether:nether_torch_bottom"},
-	{pos={x=5,y=4,z=2}, block="nether:nether_torch_bottom"},
-	{pos={x=4,y=4,z=3}, block="nether:nether_torch_bottom"},
-	{pos={x=5,y=4,z=3}, block="nether:nether_torch_bottom"},
-	{pos={x=4,y=4,z=6}, block="nether:nether_torch_bottom"},
-	{pos={x=5,y=4,z=6}, block="nether:nether_torch_bottom"},
-	-- Floor 6
-	{pos={x=2,y=5,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=5,z=6}, block="nether:netherrack"},
-	-- Floor 7
-	{pos={x=2,y=6,z=6}, block="nether:netherrack"},
-	{pos={x=3,y=6,z=6}, block="nether:netherrack"},

nether/.luacheckrc

@@ -0,0 +1,17 @@
+read_globals = {
+	-- Defined by Minetest
+	"minetest", "vector", "PseudoRandom", "VoxelArea", "ItemStack", "dump",
+	"string",
+
+	-- Mods
+	"default", "stairs"
+}
+globals = {"nether"}
+ignore = {
+	"212",
+		-- Unused argument
+	"411", "421", "422", "423", "431", "432",
+		-- Shadowing
+}
+-- Allow very long lines in guide.lua for the HTML code
+files["guide.lua"] = {ignore = {"631"}}

nether/common.lua

@@ -0,0 +1,157 @@
+
+dofile(nether.path .. "/settings.lua")
+
+local in_mapgen_env = nether.env_type == "ssm_mapgen"
+
+-- vars
+nether.v = {}
+local v = nether.v
+
+--== EDITABLE OPTIONS ==--
+
+-- Depth of the nether
+v.nether_middle = -20000
+
+-- forest bottom perlin multiplication
+v.f_bottom_scale = 4
+
+-- forest bottom height
+v.f_h_min = v.nether_middle+10
+
+-- forest top height
+v.f_h_max = v.f_h_min+250
+
+-- Frequency of trees in the nether forest (higher is less frequent)
+v.tree_rarity = 200
+
+-- Frequency of glowflowers in the nether forest (higher is less frequent)
+v.glowflower_rarity = 120
+
+-- Frequency of nether grass in the nether forest (higher is less frequent)
+v.grass_rarity = 2
+
+-- Frequency of nether mushrooms in the nether forest (higher is less frequent)
+v.mushroom_rarity = 80
+
+v.abm_tree_interval = 864
+v.abm_tree_chance = 100
+
+-- height of the nether generation's end
+v.nether_start = v.f_h_max+100
+
+-- Height of the nether (bottom of the nether is nether_middle - NETHER_HEIGHT)
+v.NETHER_HEIGHT = 30
+
+-- bottom height of the nether.
+v.nether_bottom = v.nether_middle - v.NETHER_HEIGHT - 100
+
+-- Maximum amount of randomness in the map generation
+v.NETHER_RANDOM = 2
+
+-- Frequency of Glowstone on the "roof" of the Nether (higher is less frequent)
+v.GLOWSTONE_FREQ_ROOF = 500
+
+-- Frequency of lava (higher is less frequent)
+v.LAVA_FREQ = 100
+
+v.nether_structure_freq = 350
+v.NETHER_SHROOM_FREQ = 100
+
+-- Maximum height of lava
+--v.LAVA_HEIGHT = 2
+-- Frequency of Glowstone on lava (higher is less frequent)
+--v.GLOWSTONE_FREQ_LAVA = 2
+-- Height of nether structures
+--v.NETHER_TREESIZE = 2
+-- Frequency of apples in a nether structure (higher is less frequent)
+--v.NETHER_APPLE_FREQ = 5
+-- Frequency of healing apples in a nether structure (higher is less frequent)
+--v.NETHER_HEAL_APPLE_FREQ = 10
+-- Start position for the Throne of Hades (y is relative to the bottom of the
+-- nether)
+--v.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)
+--v.NETHER_SPAWNPOS = {x=0, y=5, z=0}
+-- Structure of the nether portal (all is relative to the nether portal creator
+-- block)
+
+--== END OF EDITABLE OPTIONS ==--
+
+-- Generated variables
+v.NETHER_BOTTOM = (v.nether_middle - v.NETHER_HEIGHT)
+v.nether_buildings = v.NETHER_BOTTOM+12
+
+function nether.query_contents()
+	local c = {
+		ignore = minetest.get_content_id("ignore"),
+		air = minetest.get_content_id("air"),
+		lava = minetest.get_content_id("default:lava_source"),
+		gravel = minetest.get_content_id("default:gravel"),
+		coal = minetest.get_content_id("default:stone_with_coal"),
+		diamond = minetest.get_content_id("default:stone_with_diamond"),
+		mese = minetest.get_content_id("default:mese"),
+
+		--https://github.com/Zeg9/minetest-glow
+		glowstone = minetest.get_content_id("glow:stone"),
+
+		nether_shroom = minetest.get_content_id("riesenpilz:nether_shroom"),
+
+		netherrack = minetest.get_content_id("nether:netherrack"),
+		netherrack_tiled = minetest.get_content_id("nether:netherrack_tiled"),
+		netherrack_black = minetest.get_content_id("nether:netherrack_black"),
+		netherrack_blue = minetest.get_content_id("nether:netherrack_blue"),
+		netherrack_brick = minetest.get_content_id("nether:netherrack_brick"),
+		white = minetest.get_content_id("nether:white"),
+
+		nether_vine = minetest.get_content_id("nether:vine"),
+		blood = minetest.get_content_id("nether:blood"),
+		blood_top = minetest.get_content_id("nether:blood_top"),
+		blood_stem = minetest.get_content_id("nether:blood_stem"),
+		nether_apple = minetest.get_content_id("nether:apple"),
+
+		nether_tree = minetest.get_content_id("nether:tree"),
+		nether_tree_corner = minetest.get_content_id("nether:tree_corner"),
+		nether_leaves = minetest.get_content_id("nether:leaves"),
+		nether_grass = {
+			minetest.get_content_id("nether:grass_small"),
+			minetest.get_content_id("nether:grass_middle"),
+			minetest.get_content_id("nether:grass_big")
+		},
+		glowflower = minetest.get_content_id("nether:glowflower"),
+		nether_dirt = minetest.get_content_id("nether:dirt"),
+		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}
+	local nether_tree_nodes = {}
+	for i = 1,#trn do
+		nether_tree_nodes[trn[i]] = true
+	end
+
+	return c, nether_tree_nodes
+end
+
+if nether.log_level >= 1 then
+	local mod_prefix = in_mapgen_env and "[nether(mg)] " or "[nether] "
+
+	function nether:inform(msg, spam, t)
+		if spam <= self.log_level then
+			local info
+			if t then
+				info = mod_prefix .. msg .. (" after ca. %.3g s"):format(
+					(minetest.get_us_time() - t) / 1000000)
+			else
+				info = mod_prefix .. msg
+			end
+			print(info)
+			if self.log_to_chat then
+				minetest.chat_send_all(info)
+			end
+		end
+	end
+else
+	function nether.inform()
+	end
+end

nether/crafting.lua

@@ -197,7 +197,7 @@ minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv
 	if not sound_allowed then	-- avoid playing the sound multiple times, e.g. when middle mouse click
 		return
 	end
-	minetest.sound_play("default_wood_footstep", {pos=player:getpos(),  gain=0.25})
+	minetest.sound_play("default_wood_footstep", {pos=player:get_pos(),  gain=0.25})
 	sound_allowed = false
 	minetest.after(0, function()
 		sound_allowed = true

nether/depends.txt

@@ -1,10 +0,0 @@
-default
-creative?
-glow
-riesenpilz
-stairs
-moreblocks?
-vector_extras
-fence_registration?
-function_delayer?
-watershed?

nether/furnace.lua

@@ -257,7 +257,7 @@ minetest.register_abm({
 		meta:set_float("timedif", timediff-times)
 
 
-		for i = 1,times do
+		for _ = 1,times do
 			for _,name in pairs({
 					"fuel_totaltime",
 					"fuel_time",
@@ -292,7 +292,7 @@ minetest.register_abm({
 						inv:add_item("dst", cooked.item)
 						-- take stuff from "src" list
 						inv:set_stack("src", 1, aftercooked.items[1])
-					else
+					--~ else
 						--print("Could not insert '"..cooked.item:to_string().."'")
 					end
 					meta:set_string("src_time", 0)

nether/grow_structures.lua

@@ -0,0 +1,312 @@
+
+local netherstructure_height = 6
+
+local function vmanip_with_r_area(width, height, pos)
+	local manip = minetest.get_voxel_manip()
+	local emerged_pos1, emerged_pos2 = manip:read_from_map(
+		{x=pos.x-width, y=pos.y, z=pos.z-width},
+		{x=pos.x+width, y=pos.y+height, z=pos.z+width}
+	)
+	return manip, VoxelArea:new({MinEdge=emerged_pos1, MaxEdge=emerged_pos2})
+end
+
+local function inform_grow(pos, t1, name, generated)
+	nether:inform(name.." grew at " .. minetest.pos_to_string(pos),
+		generated and 3 or 2, t1)
+end
+
+local function set_vm_data(manip, nodes, pos, t1, name, generated)
+	manip:set_data(nodes)
+	manip:write_to_map(not generated)
+	inform_grow(pos, t1, name, generated)
+end
+
+local c, contents_defined
+local function define_contents()
+	if not contents_defined then
+		c = nether.query_contents()
+		contents_defined = true
+	end
+end
+
+local function grow_netherstructure_into_raw(area, nodes, pos, generated)
+	define_contents()
+
+	local height = netherstructure_height
+
+	local vi = area:indexp(pos)
+	for _ = 0, height-1 do
+		nodes[vi] = c.blood_stem
+		vi = vi + area.ystride
+	end
+
+	for i = -1,1 do
+		for j = -1,1 do
+			nodes[area:index(pos.x+i, pos.y+height, pos.z+j)] = c.blood_top
+		end
+	end
+
+	for k = -1, 1, 2 do
+		for l = -2+1, 2 do
+			local p1 = {pos.x+2*k, pos.y+height, pos.z-l*k}
+			local p2 = {pos.x+l*k, pos.y+height, pos.z+2*k}
+			local udat = c.blood_top
+			if math.random(2) == 1 then
+				nodes[area:index(p1[1], p1[2], p1[3])] = c.blood_top
+				nodes[area:index(p2[1], p2[2], p2[3])] = c.blood_top
+				udat = c.blood
+			end
+			nodes[area:index(p1[1], p1[2]-1, p1[3])] = udat
+			nodes[area:index(p2[1], p2[2]-1, p2[3])] = udat
+		end
+		for l = 0, 1 do
+			for _,p in ipairs({
+				{pos.x+k, pos.y+height-1, pos.z-l*k},
+				{pos.x+l*k, pos.y+height-1, pos.z+k},
+			}) do
+				if math.random(2) == 1 then
+					nodes[area:index(p[1], p[2], p[3])] = c.nether_apple
+				--elseif math.random(10) == 1 then
+				--	nodes[area:index(p[1], p[2], p[3])] = c.apple
+				end
+			end
+		end
+	end
+end
+
+function nether.grow_netherstructure_into(area, nodes, pos, generated)
+	local t1 = minetest.get_us_time()
+
+	if not pos.x then print(dump(pos))
+		nether:inform("Error: "..dump(pos), 1)
+		return
+	end
+
+	grow_netherstructure_into_raw(area, nodes, pos, generated)
+
+	inform_grow(pos, t1, "blood", generated)
+end
+
+function nether.grow_netherstructure(pos, generated)
+	local t1 = minetest.get_us_time()
+
+	if not pos.x then print(dump(pos))
+		nether:inform("Error: "..dump(pos), 1)
+		return
+	end
+
+	local height = netherstructure_height
+	local manip, area = vmanip_with_r_area(2, height, pos)
+	local nodes = manip:get_data()
+
+	grow_netherstructure_into_raw(area, nodes, pos, generated)
+
+	set_vm_data(manip, nodes, pos, t1, "blood", 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
+
+local function update_minmax(min, max, p)
+	min.x = math.min(min.x, p.x)
+	max.x = math.max(max.x, p.x)
+	min.z = math.min(min.z, p.z)
+	max.z = math.max(max.z, p.z)
+end
+
+local fruit_chances = {}
+for y = -2,1 do --like a hyperbola
+	fruit_chances[y] = math.floor(-4/(y-2)+0.5)
+end
+
+local dirs = {
+	{-1, 0, 12, 19},
+	{1, 0, 12, 13},
+	{0, 1, 4},
+	{0, -1, 4, 10},
+}
+
+local h_max = 26
+local h_stem_min = 3
+local h_stem_max = 7
+local h_arm_min = 2
+local h_arm_max = 6
+local r_arm_min = 1
+local r_arm_max = 5
+local fruit_rarity = 25 --a bigger number results in less fruits
+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 = minetest.get_us_time()
+
+	define_contents()
+
+	local min = vector.new(pos)
+	local max = vector.new(pos)
+	min.y = min.y-1
+	max.y = max.y+h_max
+
+	local trunks = {}
+	local trunk_corners = {}
+	local h_stem = math.random(h_stem_min, h_stem_max)
+	local todo,n = {{x=pos.x, y=pos.y+h_stem, z=pos.z}},1
+	while n do
+		local p = todo[n]
+		todo[n] = nil
+		n = next(todo)
+
+		local used_dirs,u = {},1
+		for _,dir in pairs(dirs) do
+			if math.random(1,2) == 1 then
+				used_dirs[u] = dir
+				u = u+1
+			end
+		end
+		if not used_dirs[1] then
+			local dir1 = math.random(4)
+			local dir2 = math.random(3)
+			if dir1 <= dir2 then
+				dir2 = dir2+1
+			end
+			used_dirs[1] = dirs[dir1]
+			used_dirs[2] = dirs[dir2]
+		end
+		for _,dir in pairs(used_dirs) do
+			local p = vector.new(p)
+			local r = math.random(r_arm_min, r_arm_max)
+			for j = 1,r do
+				local x = p.x+j*dir[1]
+				local z = p.z+j*dir[2]
+				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[poshash(p)] = dir[4] or dir[3]
+			local h = math.random(h_arm_min, h_arm_max)
+			for i = 1,h do
+				p.y = p.y + i
+				trunks[poshash(p)] = true
+				p.y = p.y - i
+			end
+			p.y = p.y+h
+			--n = #todo+1 -- caused small trees
+			todo[#todo+1] = p
+		end
+		if p.y > pos.y+h_trunk_max then
+			break
+		end
+
+		n = n or next(todo)
+	end
+	local leaves = {}
+	local fruits = {}
+	local trunk_ps = {}
+	local count = 0
+
+	local ps = {}
+	local trunk_count = 0
+	for i,par2 in pairs(trunks) do
+		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
+		trunk_ps[#trunk_ps+1] = d
+		local pz, py, px = unpack(d)
+		count = count+1
+		if count > leaf_thickness then
+			count = 0
+			for y = -2,2 do
+				local fruit_chance = fruit_chances[y]
+				for z = -2,2 do
+					for x = -2,2 do
+						local distq = x*x+y*y+z*z
+						if distq ~= 0
+						and math.random(1, math.sqrt(distq)) == 1 then
+							local x = x+px
+							local y = y+py
+							local z = z+pz
+							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[vi] = true
+								else
+									leaves[vi] = true
+								end
+								update_minmax(min, max, {x=x, z=z})
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+
+	--ps = nil
+	--collectgarbage()
+
+	for i = -1,h_stem+1 do
+		-- param2 explicitly set 0 due to possibly previous leaves node
+		trunk_ps[#trunk_ps+1] = {pos.z, pos.y+i, pos.x, 0}
+	end
+
+	local manip = minetest.get_voxel_manip()
+	local emerged_pos1, emerged_pos2 = manip:read_from_map(min, max)
+	local area = VoxelArea:new({MinEdge=emerged_pos1, MaxEdge=emerged_pos2})
+	local nodes = manip:get_data()
+	local param2s = manip:get_param2_data()
+
+	for i in pairs(leaves) do
+		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)
+			--param2s[p] = math.random(0,44)
+		end
+	end
+
+	for i in pairs(fruits) do
+		local p = area:indexp(pos_from_hash(i))
+		if soft_node(nodes[p]) then
+			nodes[p] = c.nether_apple
+		end
+	end
+
+	for i = 1,#trunk_ps do
+		local p = trunk_ps[i]
+		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 i,par2 in pairs(trunk_corners) do
+		local vi = area:indexp(pos_from_hash(i))
+		nodes[vi] = c.nether_tree_corner
+		param2s[vi] = par2
+	end
+
+	manip:set_data(nodes)
+	manip:set_param2_data(param2s)
+	manip:write_to_map(not generated)
+	nether:inform("a nether tree with " .. trunk_count ..
+		" branch trunk nodes grew at " .. minetest.pos_to_string(pos),
+		generated and 3 or 2, t1)
+end

nether/guide.lua

@@ -1,362 +1,238 @@
-local cube = minetest.inventorycube
+-- The content of the guide
-
--- the content of the guide
 local guide_infos = {
-	{
+	{"Nether Mushroom",
-		description = "Mushrooms",
+[[Nether mushrooms can be found on the nether's ground and on Dirty Netherrack. They can be dug by hand.
-		{"text", "Nether mushrooms can be found on the nether's ground and\n"..
+<item name=riesenpilz:nether_shroom width=100>
-			"on netherrack soil, it can be dug by hand."},
+
-		{"image", {1, 1, "riesenpilz_nether_shroom_side.png"}},
+<my_h2><b>Crafting Items</b></my_h2>
-		{"y", 0.2},
+If we drop a Nether mushroom without holding the fast key, we can split it into its stem and head. We can use them to craft a Nether Mushroom Pickaxe, a Nether Blood Extractor, and an uncooked Nether Pearl.
-		{"text", "If you drop it without holding the fast key, you can split it into its stem and head:"},
+<item name=nether:shroom_head width=100> <item name=nether:shroom_stem width=100>
-		{"image", {1, 1, "nether_shroom_top.png", 1}},
+
-		{"image", {1, 1, "nether_shroom_stem.png"}},
+<my_h2><b>Cultivating Mushrooms</b></my_h2>
-		{"y", 0.1},
+We can get more mushrooms using Dirty Netherrack:
-		{"text", "You can get more mushrooms by using a netherrack soil:\n"..
+1. Search a dark place (light level <= 7) and, if necessary, place Netherrack with air above it
-			"1. search a dark place and, if necessary, place netherrack with air about it\n"..
+  <img name=nether_netherrack.png width=100>
-			"2. right click with cooked blood onto the netherrack to make it soiled\n"..
+2. Right click with Cooked Blood onto the Netherrack to turn it into Dirty Netherrack
-			"3. right click onto the netherrack soil with a nether mushroom head to add some spores\n"..
+  <item name=nether:hotbed width=100> <img name=nether_netherrack.png^nether_netherrack_soil.png width=100>
-			"4. dig the mushroom which grew after some time to make place for another one"},
+3. Right click onto the Dirty Netherrack with a Nether mushroom head to add some spores
-		{"image", {1, 1, "riesenpilz_nether_shroom_side.png", 6, 0.12}},
+  <item name=nether:shroom_head width=100> <img name=nether_netherrack.png^nether_netherrack_soil.png width=100>
-		{"y", 1},
+4. Wait
-		{"image", {1, 1, "nether_netherrack.png^nether_netherrack_soil.png", 1.8}},
+5. Dig the Nether mushroom which grew after some time to make place for another one. After some time new spores need to be added (step 3).
-		{"image", {1, 1, "nether_hotbed.png", 1.3, -0.4}},
+  <img name=riesenpilz_nether_shroom_side.png width=100>
-		{"image", {1, 1, "nether_netherrack.png^nether_netherrack_soil.png", 3.6}},
+  <img name=nether_netherrack.png^nether_netherrack_soil.png width=100>
-		{"image", {1, 1, "nether_shroom_top.png", 3.1, -0.5}},
+]]},
-		{"image", {1, 1, "nether_netherrack.png^nether_netherrack_soil.png", 6}},
+
-		{"image", {1, 1, "nether_netherrack.png"}},
+	{"Blood Structures",
-	},
+[[We can find blood structures on the ground and dig their nodes with the bare hand. They contain four kinds of nodes: Nether Blood Stem, Nether Blood, Nether Blood Head, and Nether Fruit.
-	{
+<item name=nether:blood_stem width=100> <item name=nether:blood width=100> <item name=nether:apple width=100>
-		description = "Tools",
+We can craft four Nether Blood Wood nodes with the stem.
-		{"text", "You can craft 5 kinds of tools in the nether,\n"..
+<item name=nether:wood width=100>
-			"which (except the mushroom pick) require sticks to be crafted:"},
+The four red blood nodes can be cooked in a furnace and, except Nether Blood Wood, their blood can be extracted with a Nether Blood Extractor.
-		{"image", {1, 1, "nether_pick_mushroom.png"}},
+
-		{"y", 0.1},
+<my_h2><b>Nether Fruit</b></my_h2>
-		{"text", "strength : 1\n"..
+<item name=nether:apple width=100>
-			"The mushroom pick needs mushroom stems and heads to be crafted."},
+Eating a Nether Fruit decreases life but it might work against hunger and give us blood:
-		{"image", {1, 1, "nether_pick_wood.png"}},
+<item name=nether:blood_extracted width=100>
-		{"y", 0.1},
+If we eat it at the right place inside a portal, we will teleport instead of getting blood.
-		{"text", "strength : 2\n"..
+If we drop it without holding the fast key, we can split it into its fruit and leaf:
-			"The nether wood pick can be crafted with cooked nether blood wood."},
+<item name=nether:fruit_leaf width=100> <item name=nether:fruit_no_leaf width=100>
-		{"image", {1, 1, "nether_axe_netherrack.png", 1.5}},
+We can craft a fruit leave block out of 9 fruit leaves
-		{"image", {1, 1, "nether_shovel_netherrack.png", 3}},
+The fruit can be used to craft a nether pearl.
-		{"image", {1, 1, "nether_sword_netherrack.png", 4.5}},
+<item name=nether:fruit_leaves width=100>
-		{"image", {1, 1, "nether_pick_netherrack.png"}},
+A fruit leaves block
-		{"y", 0.1},
+
-		{"text", "strength : 3\n"..
+<my_h2><b>Cultivating Blood Structures</b></my_h2>
-			"The red netherrack tools can be crafted with usual netherrack."},
+If we dig a Nether vine we get a Nether Blood Child. If this sapling is put in a dark place (light level <= 3) on top of a Nether Blood Head node, it grows into a new blood structure after some time.
-		{"image", {1, 1, "nether_axe_netherrack_blue.png", 1.5}},
+<img name=nether_sapling.png width=100>
-		{"image", {1, 1, "nether_shovel_netherrack_blue.png", 3}},
+<img name=nether_blood.png^nether_blood_side.png width=100>
-		{"image", {1, 1, "nether_sword_netherrack_blue.png", 4.5}},
+]]},
-		{"image", {1, 1, "nether_pick_netherrack_blue.png"}},
+
-		{"y", 0.1},
+	{"Tools",
-		{"text", "strength : 3\n"..
+[[We can craft five kinds of tools in the nether, which (except the Nether Mushroom Pickaxe) require sticks to be crafted. To obtain Nether Sticks we can use the Nether Blood Extractor.
-			"The blue netherrack tools can be crafted with blue netherrack."},
+
-		{"image", {1, 1, "nether_axe_white.png", 1.5}},
+<my_h2><b>Nether Mushroom Pickaxe</b></my_h2>
-		{"image", {1, 1, "nether_shovel_white.png", 3}},
+<item name=nether:pick_mushroom width=100>
-		{"image", {1, 1, "nether_sword_white.png", 4.5}},
+Strength: 1
-		{"image", {1, 1, "nether_pick_white.png"}},
+This pickaxe needs mushroom stems and heads to be crafted.
-		{"y", 0.1},
+
-		{"text", "strength : 3\n"..
+<my_h2><b>Nether Wood Pickaxe</b></my_h2>
-			"The siwtonic tools can be crafted with the siwtonic ore."},
+<item name=nether:pick_wood width=100>
-	},
+Strength: 2
-	{
+This pickaxe can be crafted with Cooked Nether Blood Wood.
-		description = "Blood structures",
+
-		{"text", "You can find blood structures on the ground and\n"..
+<my_h2><b>Netherrack Tools</b></my_h2>
-			"dig their nodes even with the bare hand."},
+<item name=nether:axe_netherrack width=100> <item name=nether:shovel_netherrack width=100> <item name=nether:sword_netherrack width=100> <item name=nether:pick_netherrack width=100>
-		{"y", 0.5},
+Strength: 3
-		{"text", "One contains 4 kinds of blocks :"},
+The red Netherrack tools can be crafted with usual Netherrack.
-		{"image", {1, 1, cube("nether_blood.png"), 1}},
+
-		{"image", {1, 1,
+<my_h2><b>Faster Tools</b></my_h2>
-			cube("nether_blood_top.png", "nether_blood.png^nether_blood_side.png", "nether_blood.png^nether_blood_side.png"),
+<item name=nether:axe_netherrack_blue width=100> <item name=nether:shovel_netherrack_blue width=100> <item name=nether:sword_netherrack_blue width=100> <item name=nether:pick_netherrack_blue width=100>
-			2}},
+Strength: 3
-		{"image", {1, 1, "nether_fruit.png", 3}},
+The blue Netherrack tools can be crafted with Blue Netherrack.
-		{"image", {1, 1, cube("nether_blood_stem_top.png", "nether_blood_stem.png", "nether_blood_stem.png")}},
+
-		{"y", 0.1},
+<item name=nether:axe_white width=100> <item name=nether:shovel_white width=100> <item name=nether:sword_white width=100> <item name=nether:pick_white width=100>
-		{"text", "Blood stem, blood, blood head and nether fruit"},
+Strength: 3
-		{"y", 0.1},
+The Siwtonic tools can be crafted with the Siwtonic block.
-		{"text", "You can craft 4 blood wood with the stem :"},
+]]},
-		{"image", {1, 1, cube("nether_wood.png")}},
+
-		{"y", 0.1},
+	{"Cooking",
-		{"text", "The 4 blood nodes can be cooked and, except\n"..
+[[To get a furnace we need to dig at least 8 Netherrack Bricks. They can be found at pyramid-like constructions and require at least a strength 1 nether pickaxe to be dug.
-			"blood wood, their blood can be extracted."},
+To begin cooking things, we can use a mushroom or fruit to power a furnace. After that it is recommended to use cooked blood nodes.
-	},
+
-	{
+<my_h2><b>Craft Recipe</b></my_h2>
-		description = "Fruits",
+To craft the furnace, we can use the netherrack bricks like cobble:
-		{"text", "You can find the nether fruits on blood structures\n"..
+<item name=nether:netherrack_brick width=100> <item name=nether:netherrack_brick width=100> <item name=nether:netherrack_brick width=100>
-			"and dig them even with the bare hand."},
+<item name=nether:netherrack_brick width=100> <img name=nether_transparent.png width=100> <item name=nether:netherrack_brick width=100>
-		{"image", {1, 1, "nether_fruit.png"}},
+<item name=nether:netherrack_brick width=100> <item name=nether:netherrack_brick width=100> <item name=nether:netherrack_brick width=100>
-		{"text", "Eating it will make you lose life but\n"..
+
-			"it might feed you and give you blood :"},
+<my_h2><b>Cooking Outputs</b></my_h2>
-		{"image", {1, 1, "nether_blood_extracted.png"}},
+Some nether items can be cooked, for example the Blood Structure's nodes.
-		{"y", 0.2},
+<item name=nether:blood_stem_cooked width=100> <item name=nether:blood_cooked width=100> <item name=nether:blood_top_cooked width=100> <item name=nether:wood_cooked width=100>
-		{"text", "If you eat it at the right place inside a portal,\n"..
+Other cookable items are Blood and an item to get a Nether Pearl.
-			"you will teleport instead of getting blood."},
+<item name=nether:hotbed width=100> <item name=nether:pearl width=100>
-		{"y", 0.2},
+]]},
-		{"text", "If you drop it without holding the fast key,\n"..
+
-			"you can split it into its fruit and leaf:"},
+	{"Nether Blood Extractor",
-		{"image", {1, 1, "nether_fruit_leaf.png", 1}},
+[[With this extractor we can separate Blood from the Blood Structure's nodes. An alternative way to get Blood is to eat Nether Fruits. The Nether Blood Extractor enables us to obtain a Nether Blood Stem Extracted, which we can craft to (empty) Nether Wood and then to Nether Sticks.
-		{"image", {1, 1, "nether_fruit_no_leaf.png"}},
+
-		{"y", 0.2},
+<my_h2><b>Craft Recipe</b></my_h2>
-		{"text", "Craft a fruit leave block out of 9 fruit leaves\n"..
+We can craft the Nether Blood Extractor as follows:
-			"The fruit can be used to craft a nether pearl."},
+<item name=nether:netherrack_brick width=100> <item name=nether:blood_top_cooked width=100> <item name=nether:netherrack_brick width=100>
-		{"image", {1, 1, cube("nether_fruit_leaves.png")}},
+<item name=nether:blood_cooked width=100> <item name=nether:shroom_stem width=100> <item name=nether:blood_cooked width=100> <img name=nether_transparent.png width=100> <item name=nether:extractor width=100>
-		{"y", 0.2},
+<item name=nether:netherrack_brick width=100> <item name=nether:blood_stem_cooked width=100> <item name=nether:netherrack_brick width=100>
-		{"text", "A fruit leaves block"},
+
-	},
+<my_h2><b>Usage</b></my_h2>
-	{
+We can feed the extractor with Blood to make it separate Blood from neighbouring nodes:
-		description = "Cooking",
+1. Place the Nether Blood Extractor somewhere
-		{"text", "To get a furnace you need to dig at least 8 netherrack bricks.\n"..
+2. Place four or fewer Blood Structure's nodes next to it. Example viewed from the top:
-			"They can be found at pyramid like constructions and require at least\n"..
+<img name=nether_transparent.png width=100> <img name=nether_blood_stem_top.png width=100> <img name=nether_transparent.png width=100>
-			"a strength 1 nether pick to be dug.\n"..
+<img name=nether_blood.png width=100> <img name=nether_blood_extractor.png width=100> <img name=nether_blood.png width=100>
-			"To craft the furnace, use the netherrack bricks like cobble:"},
+<img name=nether_transparent.png width=100> <img name=nether_blood.png width=100> <img name=nether_transparent.png width=100>
-		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 0.5}},
+3. Right click the extractor with Blood to power it
-		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 1}},
+<img name=nether_transparent.png width=100> <img name=nether_blood_stem_top_empty.png width=100> <img name=nether_transparent.png width=100>
-		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png")}},
+<img name=nether_blood_empty.png width=100> <img name=nether_blood_extractor.png width=100> <img name=nether_blood_empty.png width=100>
-		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 1}},
+<img name=nether_transparent.png width=100> <img name=nether_blood_empty.png width=100> <img name=nether_transparent.png width=100>
-		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png")}},
+4. Take the new extracted blood and dig the extracted nodes
-		{"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")}},
+	{"Ores and Bricks",
-		{"y", 0.2},
+[[Digging ores requires a pickaxe from the nether of a sufficient strength. Pickaxes from the overworld do not work in general.
-		{"text", "To begin cooking stuff, you can use a mushroom or fruit.\n"..
+
-			"After that it's recommended to use cooked blood nodes."},
+<my_h2><b>Strength 1</b></my_h2>
-		{"y", 0.1},
+<item name=glow:stone width=100>
-		{"text", "Some nether items can be cooked:"},
+The Glowing stone can be dug with pickaxes from the overworld or a pickaxe from the nether with a strenght of least one. We can find it on the nether's and nether forest's ceiling and use it for lighting.
-		{"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}},
+<my_h2><b>Strength 2</b></my_h2>
-		{"image", {1, 1,
+<item name=nether:netherrack width=100> <item name=nether:netherrack_tiled width=100> <item name=nether:netherrack_black width=100>
-			cube("nether_blood_top_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png"),
+The (red) Netherrack is generated like stone, Tiled Netherrack is generated like coal ore and the Black Netherrack is generated like gravel.
-			2.9}},
+
-		{"image", {1, 1, cube("nether_wood_cooked.png"), 4.3}},
+<my_h2><b>Strength 3</b></my_h2>
-		{"y", 1.2},
+<item name=nether:netherrack_blue width=100> <item name=nether:white width=100>
-		{"text", "Some cooked blood stem, cooked blood,\n"..
+The Blue Netherrack is generated like diamond ore and the Siwtonic block is generated like mese blocks.
-			"cooked blood head and cooked blood wood,"},
+
-		{"image", {1, 1, "nether_hotbed.png", 0.3}},
+<my_h2><b>Bricks</b></my_h2>
-		{"image", {1, 1, "nether_pearl.png", 2}},
+There are three types of Bricks: red, Blue, and Black Netherrack Brick. We can craft them from the corresponding Netherrack nodes and additionally, the (red) Netherrack Brick is generated in pyramid-like structures in the nether. In comparison to the Netherrack nodes, all three Bricks can be dug with a pickaxe with strength 1.
-		{"y", 1.2},
+<item name=nether:netherrack_brick width=100> <item name=nether:netherrack_brick_blue width=100> <item name=nether:netherrack_brick_black width=100>
-		{"text", "Some cooked extracted blood and a nether pearl"},
+]]},
-	},
+
-	{
+	{"Nether Vines",
-		description = "Extractors",
+[[Nether vines are at the ceiling of the nether and can be dug by hand. They drop Nether Blood Child nodes, from which we can grow Blood Structures. By feeding Blood to a Nether vine with air beneath it, it grows one node.
-		{"text", "Here you can find out information about the nether extractor."},
+<item name=nether:vine width=100>
-		{"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}},
+	{"Portals",
-		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 1}},
+[[This nether mod supports two types of portals: the well-known Minecraft-like one made of Obsidian, and a portal which is specific to this mod. The Obsidian portal allows us to reach the nether from the overworld, but it is one-way and kills us.
-		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png")}},
+
-		{"image", {0.5, 0.5, cube("nether_blood_extractor.png"), 2.5}},
+<my_h2><b>Build Instructions</b></my_h2>
-		{"image", {0.5, 0.5, "nether_shroom_stem.png", 0.5}},
+A nether portal requires the following nodes:
-		{"image", {0.5, 0.5, cube("nether_blood_cooked.png"), 1}},
+<item name=nether:wood_empty width=100> <item name=nether:netherrack_black width=100> <item name=nether:netherrack_brick_blue width=100> <item name=nether:netherrack width=100>  <item name=nether:blood_cooked width=100> <item name=nether:apple width=100> <item name=nether:white width=100>
-		{"image", {0.5, 0.5, cube("nether_blood_cooked.png")}},
+* 25 (empty) Nether Wood (height 5-6)
-		{"image", {0.5, 0.5, cube("nether_blood_stem_top_cooked.png", "nether_blood_stem_cooked.png", "nether_blood_stem_cooked.png"), 0.5}},
+* 16 Black Netherrack (height 1)
-		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png"), 1}},
+* 12 Blue Netherrack Bricks (height 2-4)
-		{"image", {0.5, 0.5, cube("nether_netherrack_brick.png")}},
+* 8 (red) Netherrack (height 1)
-		{"y", 0.2},
+* 8 Cooked Nether Blood (height 5)
-		{"text", "Extract blood from the blood nodes you get from the blood structures.\n"..
+* 4 Nether Fruits (height 4)
-			"You can also get blood with a nether fruit."},
+* 2 Siwtonic blocks (height 1 and 5)
-		{"y", 0.2},
+
-		{"text", "So you can use it:\n"..
+The heights in parenthesis correspond to the relative vertical positions of the nodes. When built, the portal should look approximately like this one:
-			"1. place it somewhere\n"..
+<img name=nether_teleporter.png width=600>
-			"2. place blood blocks next to it (4 or less)\n"..
+
-			"3. right click with extracted blood onto it to power it\n"..
+<my_h2><b>Usage</b></my_h2>
-			"4. take the new extracted blood and dig the extracted nodes"},
+Before using the portal the first time, we may want to fill our inventory with enough items so that we can build a second portal on the overworld to get back.
-		{"y", 0.2},
+We can activate the portal as follows:
-		{"text", "Example (view from the top):"},
+1. Stand in the middle on the Siwtonic block
-		{"y", 0.88},
+2. Eat a Nether Fruit. If the portal was built correctly, we can hear a special sound and are teleported to the overworld.
-		{"image", {1, 1, "nether_blood_stem_top.png", 0.82, -0.88}},
+
-		{"image", {1, 1, "nether_blood.png", 1.63}},
+If two portals in the nether and overworld have the same X and Z coordinates, they teleport us to the centre, i.e. onto the Siwtonic block, of the opposite portal when eating a Nether Fruit.
-		{"image", {1, 1, "nether_blood_extractor.png", 0.82}},
+]]},
-		{"image", {1, 1, "nether_blood_stem_top_empty.png", 3.82, -0.88}},
+
-		{"image", {1, 1, "nether_blood_empty.png", 4.63}},
+	{"Pearls",
-		{"image", {1, 1, "nether_blood_empty.png", 3.001}},
+[[The nether pearl can be used to teleport by throwing it.
-		{"image", {1, 1, "nether_blood_extractor.png", 3.82}},
+
-		{"image", {1, 1, "nether_blood.png"}},
+<my_h2><b>Craft Recipe</b></my_h2>
-		{"image", {1, 1, "nether_blood.png", 0.82, -0.12}},
+First, we need to craft two Nether Mushroom Heads and a Nether Fruit Without Leaf together as follows:
-		{"image", {1, 1, "nether_blood_empty.png", 3.82, -0.12}},
+<item name=nether:shroom_head width=100>
-		{"y", 1.2},
+<item name=nether:fruit_no_leaf width=100>
-		{"text", "The empty blood stem can be crafted into empty nether wood,\n"..
+<item name=nether:shroom_head width=100>
-			"which can be crafted into nether sticks."},
+This gives us the Nether Fruit in Mushroom (FIM), which we can cook in a furnace to obtain a Nether Pearl.
-	},
+<item name=nether:fim width=100> <item name=nether:pearl width=100>
-	{
+]]},
-		description = "Ores",
+
-		{"text", "You can find 5 types of ores:"},
+	{"Nether Forest",
-		{"image", {1, 1, cube("nether_netherrack_black.png"), 4}},
+[[The nether forest is generated in caves above the nether and contains decorative plants.
-		{"image", {1, 1, cube("nether_netherrack.png")}},
+
-		{"y", 0.2},
+<my_h2><b>Grass and Flower</b></my_h2>
-		{"text", "The red netherrack is generated like stone.\n"..
+<item name=nether:grass_big width=100> <item name=nether:grass_middle width=100> <item name=nether:grass_small width=100>
-			"The black netherrack is generated like gravel.\n"..
+We can craft the Nether Grass item to another grass item, which can be cooked to get Dried Nether Grass. We can then craft this dried grass to paper.
-			"Both require at least a strength 2 nether pick to be dug."},
+
-		{"image", {1, 1, cube("nether_white.png"), 4}},
+<item name=nether:glowflower width=100>
-		{"image", {1, 1, cube("nether_netherrack_blue.png")}},
+The Glowing Flower can be used for lighting and decoration.
-		{"y", 0.2},
+
-		{"text", "The blue netherrack is generated like diamond ore.\n"..
+<my_h2><b>Nether Tree</b></my_h2>
-			"The siwtonic ore is generated like mese blocks.\n"..
+<item name=nether:tree width=100>
-			"Both require at least a strength 3 nether pick to be dug."},
+Nether trunks can be found at Nether Trees and be crafted into Nether Wood Blocks via Nether Wood Planks. Furthermore, the Nether Tree Saplings grow even in the overworld if they have Nether Dirt beneath them.
-		{"image", {1, 1, cube("nether_netherrack_tiled.png"), 4}},
+]]}
-		{"image", {1, 1, cube("glow_stone.png")}},
-		{"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"..
-			"Dig tiled netherrack with at least a level 2 pickaxe."},
-	},
-	{
-		description = "Vines",
-		{"text", "Feed nether vines with blood.\n"..
-			"Dig them with anything."},
-		{"image", {1, 1, "nether_vine.png"}},
-		{"y", 0.2},
-		{"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.10},
-		{"image", {1, 1, "nether_blood.png^nether_blood_side.png"}},
-	},
-	{
-		description = "Pearls",
-		{"text", "The nether pearl can be used to teleport by throwing it.\n"..
-			"Here is how to get one :"},
-		{"y", 0.2},
-		{"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", "Put the result into the furnace\n"..
-			"to cook it into a nether pearl :"},
-		{"image", {1, 1, "nether_pearl.png"}},
-	},
-	{
-		description = "Bricks",
-		{"text", "Craft bricks out of red,\n"..
-			"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},
-	},
-	{
-		description = "Portals",
-		{"text", "Here you can find out how to built the nether portal."},
-		{"y", 0.3},
-		{"text", "A nether portal requires following nodes:"},
-		{"y", 0.05},
-		{"text", "25 empty nether wooden planks\n"..
-			"16 black netherrack\n"..
-			"12 blue netherrack bricks\n"..
-			"8 red netherrack\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", "Activate it by standing in the middle,\n"..
-			"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 = "Forests",
-		{"text", "The nether forest is generated in caves,\n"..
-			"above the usual nether."},
-		{"y", 0.2},
-		{"text", "There you can find some plants:"},
-		{"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", "Use the nether forest grass to get paper.\n"..
-			"Craft paper out of the dried grass."},
-		{"image", {1, 1, cube("nether_tree_top.png", "nether_tree.png", "nether_tree.png")}},
-		{"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"}},
-		{"y", 0.2},
-		{"text", "Use it for lighting and decoration."},
-	},
 }
 
--- the size of guide pages
+-- The guide formspecs
-local guide_size = {x=40, y=10, cx=0.2, cy=0.2}
+local guide_forms = {}
 
--- informations about settings and ...
+-- Convert the guide content to formspecs
-local formspec_offset = {x=0.25, y=0.50}
-local font_size
-if minetest.is_singleplayer() then
-	font_size = tonumber(minetest.settings:get("font_size")) or 13
-else
-	font_size = 13
-end
-guide_size.fx = math.floor((40*(guide_size.cx+formspec_offset.x))*font_size)
-guide_size.fy = font_size/40
-
--- the default guide formspecs
-local guide_forms = {
-	contents = "size[3.6,"..(#guide_infos)-2 ..";]label["..guide_size.cx+0.7 ..","..guide_size.cy+0.2 ..";Contents:]",
-}
-
--- change the infos to formspecs
 for n,data in ipairs(guide_infos) do
-	local form = ""
+	local title, html_content = data[1], data[2]
-	local y = 0
+	--~ local html_text = "<global background=#242424 size=24><tag name=my_h1 size=35>" ..
-	local x = guide_size.cx
+	local html_text = "<global size=24><tag name=my_h1 size=35>" ..
-	for _,i in ipairs(data) do
+		"<tag name=my_h2 size=30>" ..
-		local typ, content = unpack(i)
+		"<my_h1><b><center>" .. title .. "</b></center></my_h1>\n" ..
-		if typ == "y" then
+		html_content
-			y = y+content
+	local spec_width = 16
-		elseif typ == "x" then
+	local spec_height = 16
-			x = math.max(x, content)
+	local html_padding = 0.5
-		elseif typ == "text" then
+	local form = ("formspec_version[4]size[%g,%g;]" ..
-			local tab = minetest.wrap_text(content, guide_size.fx, true)
+			"hypertext[%g,%g;%g,%g;html;%s]button[%g,%g;2,0.8;quit;Back]"
-			local l = guide_size.cx
+		):format(
-			for _,str in ipairs(tab) do
+		spec_width, spec_height,
-				form = form.."label["..guide_size.cx ..","..guide_size.cy+y..";"..str.."]"
+		html_padding, html_padding,
-				y = y+guide_size.fy
+		spec_width - 2 * html_padding, spec_height - 1 - 2 * html_padding,
-				l = math.max(l, #str)
+		minetest.formspec_escape(html_text),
-			end
+		0.5 * spec_width - 1, spec_height - 1)
-			x = math.max(x, l/font_size)
+
-		elseif typ == "image" then
+	guide_forms[n] = {title, form}
-			local w, h, texture_name, px, py = unpack(content)
-			if not px then
-				form = form.."image["..guide_size.cx..","..guide_size.cy+y+h*0.3 ..";"..w..","..h..";"..texture_name.."]"
-				y = y+h
-			else
-				px = guide_size.cx+px
-				py = py or 0
-				form = form.."image["..px..","..
-					guide_size.cy+y+h*0.3+py ..";"..w..","..h..";"..texture_name.."]"
-				x = math.max(x, px+w)
-			end
-		end
-	end
-	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
 
-local desc_tab = {}
+local title_to_index = {}
 for n, i in ipairs(guide_forms) do
-	desc_tab[i[1]] = n
+	title_to_index[i[1]] = n
 end
 
--- creates contents formspec
+-- Create the contents formspec
-local y = 0
+guide_forms.contents = "formspec_version[4]size[6," .. (#guide_infos) + 2 ..
-for y,i in ipairs(guide_forms) do
+	";]label[2,0.8;Contents:]"
-	local desc, form = unpack(i)
+for i, data in ipairs(guide_forms) do
-	local s = #desc*1.3/font_size+1.5
+	local desc = data[1]
-	guide_forms.contents = guide_forms.contents.."button["..guide_size.cx*12/s-0.5 ..","..guide_size.cy+y/1.3 ..";"..s..",1;name;"..desc.."]"
+	local y = i + 0.5 + 0.1
-end
+	guide_forms.contents = guide_forms.contents ..
-
+		"button[0.5," .. y .. ";5,0.8;name;" .. desc .. "]"
--- shows the contents of the formspec
-local function show_guide(pname)
-	minetest.show_formspec(pname, "nether_guide_contents", guide_forms["contents"])
 end
 
 minetest.register_on_player_receive_fields(function(player, formname, fields)
@@ -365,14 +241,16 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		local pname = player:get_player_name()
 		if fname
 		and pname then
-			minetest.show_formspec(pname, "nether_guide", guide_forms[desc_tab[fname]][2])
+			minetest.show_formspec(pname, "nether_guide",
+				guide_forms[title_to_index[fname]][2])
 		end
 	elseif formname == "nether_guide" then
 		local fname = fields.quit
 		local pname = player:get_player_name()
 		if fname
 		and pname then
-			minetest.show_formspec(pname, "nether_guide_contents", guide_forms["contents"])
+			minetest.show_formspec(pname, "nether_guide_contents",
+				guide_forms["contents"])
 		end
 	end
 end)
@@ -383,15 +261,16 @@ minetest.register_chatcommand("nether_help", {
 	func = function(name)
 		local player = minetest.get_player_by_name(name)
 		if not player then
-			minetest.chat_send_player(name, "Something went wrong.")
+			return false, "Something went wrong."
-			return false
 		end
-		if player:getpos().y > nether.start then
+		if not nether.overworld_help and player:get_pos().y > nether.v.nether_start then
-			minetest.chat_send_player(name, "Usually you don't neet this guide here. You can view it in the nether.")
+			return false, "Usually you don't neet this guide here. " ..
-			return false
+				"You can view it in the nether."
 		end
 		minetest.chat_send_player(name, "Showing guide...")
-		show_guide(name)
+		-- Show the Contents (overview) page
+		minetest.show_formspec(name, "nether_guide_contents",
+			guide_forms["contents"])
 		return true
 	end
 })

nether/init.lua

@@ -17,898 +17,57 @@ if not rawget(_G, "nether") then
 	nether = {}
 end
 
---== EDITABLE OPTIONS ==--
+-- similar to INIT
+nether.env_type = "ssm" -- server-side-modding
 
---says some information.
+nether.path = minetest.get_modpath("nether")
-nether.info = true
+local path = nether.path
 
--- tell everyone about the generation
+dofile(path .. "/common.lua")
-nether.inform_all = minetest.is_singleplayer()
 
---1:<a bit of information> 2:<acceptable amount of information> 3:<lots of text>
-nether.max_spam = 2
-
--- Depth of the nether
-local nether_middle = -20000
-
--- forest bottom perlin multiplication
-local f_bottom_scale = 4
-
--- forest bottom height
-local f_h_min = nether_middle+10
-
--- forest top height
-local f_h_max = f_h_min+250
-
--- Frequency of trees in the nether forest (higher is less frequent)
-local tree_rarity = 200
-
--- Frequency of glowflowers in the nether forest (higher is less frequent)
-local glowflower_rarity = 120
-
--- Frequency of nether grass in the nether forest (higher is less frequent)
-local grass_rarity = 2
-
--- Frequency of nether mushrooms in the nether forest (higher is less frequent)
-local mushroom_rarity = 80
-
-local abm_tree_interval = 864
-local abm_tree_chance = 100
-
--- height of the nether generation's end
-nether.start = f_h_max+100
-
--- Height of the nether (bottom of the nether is nether_middle - NETHER_HEIGHT)
-local NETHER_HEIGHT = 30
-
--- Maximum amount of randomness in the map generation
-NETHER_RANDOM = 2
-
--- Frequency of Glowstone on the "roof" of the Nether (higher is less frequent)
-local GLOWSTONE_FREQ_ROOF = 500
-
--- Frequency of lava (higher is less frequent)
-local LAVA_FREQ = 100
-
-local nether_structure_freq = 350
-local NETHER_SHROOM_FREQ = 100
-
--- Maximum height of lava
---LAVA_HEIGHT = 2
--- Frequency of Glowstone on lava (higher is less frequent)
---GLOWSTONE_FREQ_LAVA = 2
--- Height of nether structures
---NETHER_TREESIZE = 2
--- Frequency of apples in a nether structure (higher is less frequent)
---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)
---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)
---NETHER_SPAWNPOS = {x=0, y=5, z=0}
--- Structure of the nether portal (all is relative to the nether portal creator
--- block)
-
---== END OF EDITABLE OPTIONS ==--
-
-if nether.info then
-	function nether:inform(msg, spam, t)
-		if spam <= self.max_spam then
-			local info
-			if t then
-				info = "[nether] " .. msg .. (" after ca. %.3g s"):format(
-					(minetest.get_us_time() - t) / 1000000)
-			else
-				info = "[nether] " .. msg
-			end
-			print(info)
-			if self.inform_all then
-				minetest.chat_send_all(info)
-			end
-		end
-	end
-else
-	function nether.inform()
-	end
-end
-
-
-local path = minetest.get_modpath"nether"
-dofile(path.."/weird_mapgen_noise.lua")
 dofile(path .. "/items.lua")
 --dofile(path .. "/furnace.lua")
 dofile(path .. "/pearl.lua")
 
--- Weierstrass function stuff from https://github.com/slemonide/gen
+dofile(path .. "/grow_structures.lua")
-local SIZE = 1000
+
-local ssize = math.ceil(math.abs(SIZE))
+if minetest.register_mapgen_script then
-local function do_ws_func(depth, a, x)
+	minetest.log("info", "nether mapgen running in mapgen env")
-	local n = math.pi * x / (16 * SIZE)
+
-	local y = 0
+	minetest.register_mapgen_script(path .. "/init_emerge.lua")
-	for k=1,depth do
+
-		y = y + math.sin(k^a * n) / k^a
+	minetest.set_gen_notify("custom", nil,
-	end
+			{"nether:please_grow_trees", "nether:please_fix_light"})
-	return SIZE * y / math.pi
+
+	minetest.register_on_generated(function(minp, maxp, blockseed)
+		local t0 = minetest.get_us_time()
+
+		local gennotify = minetest.get_mapgen_object("gennotify")
+
+		-- forest trees
+		local trees_hashed = gennotify.custom["nether:please_grow_trees"] or {}
+		for i = 1, #trees_hashed do
+			local pos = minetest.get_position_from_hash(trees_hashed[i])
+			nether.grow_tree(pos, true)
 		end
 
-local chunksize = minetest.settings:get"chunksize" or 5
+		if #trees_hashed > 0 then
-local ws_lists = {}
+			nether:inform(#trees_hashed .. " trees set", 2, t0)
-local function get_ws_list(a,x)
-        ws_lists[a] = ws_lists[a] or {}
-        local v = ws_lists[a][x]
-        if v then
-                return v
-        end
-        v = {}
-        for x=x,x + (chunksize*16 - 1) do
-		local y = do_ws_func(ssize, a, x)
-                v[x] = y
-        end
-        ws_lists[a][x] = v
-        return v
 		end
 
-
+		-- fix light
-local function dif(z1, z2)
+		local fixlight_area = gennotify.custom["nether:please_fix_light"]
-	return math.abs(z1-z2)
+		if fixlight_area then
+			t0 = minetest.get_us_time()
+			minetest.fix_light(fixlight_area[1], fixlight_area[2])
+			nether:inform("light fixed", 2, t0)
 		end
-
-local function pymg(x1, x2, z1, z2)
-	return math.max(dif(x1, x2), dif(z1, z2))
-end
-
-local function r_area(manip, width, height, pos)
-	local emerged_pos1, emerged_pos2 = manip:read_from_map(
-		{x=pos.x-width, y=pos.y, z=pos.z-width},
-		{x=pos.x+width, y=pos.y+height, z=pos.z+width}
-	)
-	return VoxelArea:new({MinEdge=emerged_pos1, MaxEdge=emerged_pos2})
-end
-
-local function set_vm_data(manip, nodes, pos, t1, name, generated)
-	manip:set_data(nodes)
-	manip:write_to_map(not generated)
-	nether:inform(name.." grew at " .. minetest.pos_to_string(pos),
-		generated and 3 or 2, t1)
-end
-
--- Generated variables
-local NETHER_BOTTOM = (nether_middle - NETHER_HEIGHT)
-nether.buildings = NETHER_BOTTOM+12
---~ 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}
---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}
---[[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
-	v.pos.z = v.pos.z + HADES_THRONE_STARTPOS_ABS.z
-	HADES_THRONE_ABS[i] = v
-end
-local htx = 0
-local hty = 0
-local htz = 0
-for i,v in ipairs(HADES_THRONE_ABS) do
-	if v.pos.x > htx then
-		htx = v.pos.x
-	end
-	if v.pos.y > hty then
-		hty = v.pos.y
-	end
-	if v.pos.z > htz then
-		htz = v.pos.z
-	end
-end
-HADES_THRONE_ENDPOS_ABS = {x=htx, y=hty, z=htz}]]
-
-local c, nether_tree_nodes
-local function define_contents()
-	c = {
-		ignore = minetest.get_content_id("ignore"),
-		air = minetest.get_content_id("air"),
-		lava = minetest.get_content_id("default:lava_source"),
-		gravel = minetest.get_content_id("default:gravel"),
-		coal = minetest.get_content_id("default:stone_with_coal"),
-		diamond = minetest.get_content_id("default:stone_with_diamond"),
-		mese = minetest.get_content_id("default:mese"),
-
-		--https://github.com/Zeg9/minetest-glow
-		glowstone = minetest.get_content_id("glow:stone"),
-
-		nether_shroom = minetest.get_content_id("riesenpilz:nether_shroom"),
-
-		netherrack = minetest.get_content_id("nether:netherrack"),
-		netherrack_tiled = minetest.get_content_id("nether:netherrack_tiled"),
-		netherrack_black = minetest.get_content_id("nether:netherrack_black"),
-		netherrack_blue = minetest.get_content_id("nether:netherrack_blue"),
-		netherrack_brick = minetest.get_content_id("nether:netherrack_brick"),
-		white = minetest.get_content_id("nether:white"),
-
-		nether_vine = minetest.get_content_id("nether:vine"),
-		blood = minetest.get_content_id("nether:blood"),
-		blood_top = minetest.get_content_id("nether:blood_top"),
-		blood_stem = minetest.get_content_id("nether:blood_stem"),
-		nether_apple = minetest.get_content_id("nether:apple"),
-
-		nether_tree = minetest.get_content_id("nether:tree"),
-		nether_tree_corner = minetest.get_content_id("nether:tree_corner"),
-		nether_leaves = minetest.get_content_id("nether:leaves"),
-		nether_grass = {
-			minetest.get_content_id("nether:grass_small"),
-			minetest.get_content_id("nether:grass_middle"),
-			minetest.get_content_id("nether:grass_big")
-		},
-		glowflower = minetest.get_content_id("nether:glowflower"),
-		nether_dirt = minetest.get_content_id("nether:dirt"),
-		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
-
-local function return_nether_ore(id, glowstone)
-	if glowstone
-	and pr:next(0,GLOWSTONE_FREQ_ROOF) == 1 then
-		return c.glowstone
-	end
-	if id == c.coal then
-		return c.netherrack_tiled
-	end
-	if id == c.gravel then
-		return c.netherrack_black
-	end
-	if id == c.diamond then
-		return c.netherrack_blue
-	end
-	if id == c.mese then
-		return c.white
-	end
-	return c.netherrack
-end
-
-local f_perlins = {}
-
--- 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,
-		spread = {x=50, y=50, z=50},
-		scale = 1,
-		offset = 0,
-	},
-	{-- amp 1.75
-		seed = 133,
-		octaves = 3,
-		persist = 0.5,
-		spread = {x=10, y=10, z=10},
-		scale = 1,
-		offset = 0,
-	},
-	{-- amp 1.75
-		seed = 112,
-		octaves = 3,
-		persist = 0.5,
-		spread = {x=5, y=5, z=5},
-		scale = 1,
-		offset = 0,
-	},
-	--[[forest_bottom = {
-		seed = 11,
-		octaves = 3,
-		persist = 0.8,
-		spread = {x=tmp2, y=tmp2, z=tmp2},
-		scale = 1,
-		offset = 0,
-	},]]
-	forest_top = {-- amp 2.44
-		seed = 21,
-		octaves = 3,
-		persist = 0.8,
-		spread = {x=tmp, y=tmp, z=tmp},
-		scale = 1,
-		offset = 0,
-	},
-}
-
--- 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)
-	--avoid big map generation
-	if not (maxp.y >= NETHER_BOTTOM-100 and minp.y <= nether.start) then
-		return
-	end
-
-	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)
-
-	if not contents_defined then
-		define_contents()
-		contents_defined = true
-	end
-
-	local buildings = 0
-	if maxp.y <= NETHER_BOTTOM then
-		buildings = 1
-	elseif minp.y <= nether.buildings then
-		buildings = 2
-	end
-
-	local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
-	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)
-	--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
-	local map_lengths_xyz = {x=side_length, y=side_length, z=side_length}
-
-	if not pelin_maps then
-		pelin_maps = {
-			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 perlin_f_bottom, strassx, strassz
-	if forest_possible then
-		perlin_f_bottom = minetest.get_perlin(11, 3, 0.8, tmp2)
-		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
-
-	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, side_length-1)
-	end
-
-	local count = 0
-	for z=minp.z, maxp.z do
-		for x=minp.x, maxp.x do
-
-			count = count+1
-
-			local test = pmap1[count]+1
-			local test2 = pmap2[count]
-			local test3 = math.abs(pmap3[count])
-
-			local t = math.floor(test*3+0.5)
-
-			local h
-			if test2 < 0 then
-				h = math.floor(test2*3+0.5)-1
-			else
-				h = 3+t+pr:next(0,NETHER_RANDOM)
-			end
-
-			local generate_vine = false
-			if test3 >= 0.72+pr:next(0,NETHER_RANDOM)/10
-			and pr:next(0,NETHER_RANDOM) == 1 then
-				generate_vine = true
-			end
-
-			local bottom = NETHER_BOTTOM+h
-			local top = nether_middle-pr:next(0,NETHER_RANDOM)+t
-
-			local py_h = 0
-			local difn, noisp, py_h_g
-			if buildings >= 1 then
-				py_h = tab2[num2].y
-				num2 = num2+1
-
-				difn = nether.buildings-py_h
-				if difn == 5 then
-					noisp = 1
-				elseif difn < 5 then
-					noisp = 2
-				end
-				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 _ = 1,side_length do
-						data[vi] = c.netherrack_brick
-						vi = vi + area.ystride
-					end
-				else
-					for _ = 1,side_length do
-						data[vi] = c.lava
-						vi = vi + area.ystride
-					end
-				end
-			else
-
-				local r_structure = pr:next(1,nether_structure_freq)
-				local r_shroom = pr:next(1,NETHER_SHROOM_FREQ)
-				local r_glowstone = pr:next(0,GLOWSTONE_FREQ_ROOF)
-				local r_vine_length = pr:next(1,vine_maxlength)
-
-				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 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)
-					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)
-					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)
-					is_forest = f_bottom < f_top
-					f_h_dirt = f_bottom-pr:next(0,1)
-				end
-
-				for y=minp.y, maxp.y do
-					local d_p_addp = data[vi]
-					--if py_h >= maxp.y-4 then
-					if y <= py_h
-					and noisp then
-						if noisp == 1 then
-							data[vi] = c.netherrack_brick
-						elseif noisp == 2 then
-							if y == py_h then
-								data[vi] = c.netherrack_brick
-							elseif y == py_h_g
-							and pr:next(1,3) <= 2 then
-								data[vi] = c.netherrack
-							elseif y <= py_h_g then
-								data[vi] = c.lava
-							else
-								data[vi] = c.air
-							end
-						end
-					elseif d_p_addp ~= c.air then
-
-						if is_forest
-						and y == f_bottom then
-							data[vi] = c.nether_dirt_top
-						elseif is_forest
-						and y < f_bottom
-						and y >= f_h_dirt then
-							data[vi] = c.nether_dirt
-						elseif is_forest
-						and y == f_h_dirt-1 then
-							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[vi] = c.nether_shroom
-							elseif pr:next(1,glowflower_rarity) == 1 then
-								data[vi] = c.glowflower
-							elseif pr:next(1,grass_rarity) == 1 then
-								data[vi] = c.nether_grass[pr:next(1,3)]
-							else
-								data[vi] = c.air
-							end
-						elseif is_forest
-						and y > f_bottom
-						and y < f_top then
-							if not nether_tree_nodes[d_p_addp] then
-								data[vi] = 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[vi] = return_nether_ore(d_p_addp, true)
-							elseif sel == 6 then
-								data[vi] = c.netherrack_black
-							elseif sel == 7 then
-								data[vi] = c.glowstone
-							else
-								data[vi] = c.air
-							end
-
-						elseif y <= NETHER_BOTTOM then
-							if y <= bottom then
-								data[vi] = return_nether_ore(d_p_addp, true)
-							else
-								data[vi] = c.lava
-							end
-						elseif r_structure == 1
-						and y == bottom then
-							tab[num] = {x=x, y=y-1, z=z}
-							num = num+1
-						elseif y <= bottom then
-							if pr:next(1,LAVA_FREQ) == 1 then
-								data[vi] = c.lava
-							else
-								data[vi] = return_nether_ore(d_p_addp, false)
-							end
-						elseif r_shroom == 1
-						and r_structure ~= 1
-						and y == bottom+1 then
-							data[vi] = c.nether_shroom
-						elseif (y == top and r_glowstone == 1) then
-							data[vi] = c.glowstone
-						elseif y >= top then
-							data[vi] = return_nether_ore(d_p_addp, true)
-						elseif y <= top-1
-						and generate_vine
-						and y >= top-r_vine_length then
-							data[vi] = c.nether_vine
-						else
-							data[vi] = c.air
-						end
-					end
-					vi = vi + area.ystride
-				end
-			end
-		end
-	end
-	vm:set_data(data)
---	vm:set_lighting(12)
---	vm:calc_lighting()
---	vm:update_liquids()
-	vm:write_to_map(false)
-
-	nether:inform("nodes set", 2, t1)
-
-	local t2 = minetest.get_us_time()
-	local tr_bl_cnt = 0
-
-	if structures_enabled then -- Blood netherstructures
-		tr_bl_cnt = #tab
-		for i = 1,tr_bl_cnt do
-			nether.grow_netherstructure(tab[i], true)
-		end
-	end
-
-	if forest_possible then -- Forest trees
-		tr_bl_cnt = tr_bl_cnt + #trees
-		for i = 1,#trees do
-			nether.grow_tree(trees[i], true)
-		end
-	end
-
-	if tr_bl_cnt > 0 then
-		nether:inform(tr_bl_cnt .. " trees and blood structures set", 2, t2)
-	end
-
-	t2 = minetest.get_us_time()
-	minetest.fix_light(minp, maxp)
-
-	nether:inform("light fixed", 2, t2)
-
-	nether:inform("done", 1, t1)
 	end)
 
-
-function nether.grow_netherstructure(pos, generated)
-	local t1 = minetest.get_us_time()
-
-	if not contents_defined then
-		define_contents()
-		contents_defined = true
-	end
-
-	if not pos.x then print(dump(pos))
-		nether:inform("Error: "..dump(pos), 1)
-		return
-	end
-
-	local height = 6
-	local manip = minetest.get_voxel_manip()
-	local area = r_area(manip, 2, height, pos)
-	local nodes = manip:get_data()
-
-	local vi = area:indexp(pos)
-	for _ = 0, height-1 do
-		nodes[vi] = c.blood_stem
-		vi = vi + area.ystride
-	end
-
-	for i = -1,1 do
-		for j = -1,1 do
-			nodes[area:index(pos.x+i, pos.y+height, pos.z+j)] = c.blood_top
-		end
-	end
-
-	for k = -1, 1, 2 do
-		for l = -2+1, 2 do
-			local p1 = {pos.x+2*k, pos.y+height, pos.z-l*k}
-			local p2 = {pos.x+l*k, pos.y+height, pos.z+2*k}
-			local udat = c.blood_top
-			if math.random(2) == 1 then
-				nodes[area:index(p1[1], p1[2], p1[3])] = c.blood_top
-				nodes[area:index(p2[1], p2[2], p2[3])] = c.blood_top
-				udat = c.blood
-			end
-			nodes[area:index(p1[1], p1[2]-1, p1[3])] = udat
-			nodes[area:index(p2[1], p2[2]-1, p2[3])] = udat
-		end
-		for l = 0, 1 do
-			for _,p in ipairs({
-				{pos.x+k, pos.y+height-1, pos.z-l*k},
-				{pos.x+l*k, pos.y+height-1, pos.z+k},
-			}) do
-				if math.random(2) == 1 then
-					nodes[area:index(p[1], p[2], p[3])] = c.nether_apple
-				--elseif math.random(10) == 1 then
-				--	nodes[area:index(p[1], p[2], p[3])] = c.apple
-				end
-			end
-		end
-	end
-	set_vm_data(manip, nodes, pos, t1, "blood", 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
-
-local function update_minmax(min, max, p)
-	min.x = math.min(min.x, p.x)
-	max.x = math.max(max.x, p.x)
-	min.z = math.min(min.z, p.z)
-	max.z = math.max(max.z, p.z)
-end
-
-local fruit_chances = {}
-for y = -2,1 do --like a hyperbola
-	fruit_chances[y] = math.floor(-4/(y-2)+0.5)
-end
-
-local dirs = {
-	{-1, 0, 12, 19},
-	{1, 0, 12, 13},
-	{0, 1, 4},
-	{0, -1, 4, 10},
-}
-
-local h_max = 26
-local h_stem_min = 3
-local h_stem_max = 7
-local h_arm_min = 2
-local h_arm_max = 6
-local r_arm_min = 1
-local r_arm_max = 5
-local fruit_rarity = 25 --a bigger number results in less fruits
-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 = minetest.get_us_time()
-
-	if not contents_defined then
-		define_contents()
-		contents_defined = true
-	end
-
-	local min = vector.new(pos)
-	local max = vector.new(pos)
-	min.y = min.y-1
-	max.y = max.y+h_max
-
-	local trunks = {}
-	local trunk_corners = {}
-	local h_stem = math.random(h_stem_min, h_stem_max)
-	local todo,n = {{x=pos.x, y=pos.y+h_stem, z=pos.z}},1
-	while n do
-		local p = todo[n]
-		todo[n] = nil
-		n = next(todo)
-
-		local used_dirs,u = {},1
-		for _,dir in pairs(dirs) do
-			if math.random(1,2) == 1 then
-				used_dirs[u] = dir
-				u = u+1
-			end
-		end
-		if not used_dirs[1] then
-			local dir1 = math.random(4)
-			local dir2 = math.random(3)
-			if dir1 <= dir2 then
-				dir2 = dir2+1
-			end
-			used_dirs[1] = dirs[dir1]
-			used_dirs[2] = dirs[dir2]
-		end
-		for _,dir in pairs(used_dirs) do
-			local p = vector.new(p)
-			local r = math.random(r_arm_min, r_arm_max)
-			for j = 1,r do
-				local x = p.x+j*dir[1]
-				local z = p.z+j*dir[2]
-				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[poshash(p)] = dir[4] or dir[3]
-			local h = math.random(h_arm_min, h_arm_max)
-			for i = 1,h do
-				p.y = p.y + i
-				trunks[poshash(p)] = true
-				p.y = p.y - i
-			end
-			p.y = p.y+h
-			--n = #todo+1 -- caused small trees
-			todo[#todo+1] = p
-		end
-		if p.y > pos.y+h_trunk_max then
-			break
-		end
-
-		n = n or next(todo)
-	end
-	local leaves = {}
-	local fruits = {}
-	local trunk_ps = {}
-	local count = 0
-
-	local ps = {}
-	local trunk_count = 0
-	for i,par2 in pairs(trunks) do
-		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
-		trunk_ps[#trunk_ps+1] = d
-		local pz, py, px = unpack(d)
-		count = count+1
-		if count > leaf_thickness then
-			count = 0
-			for y = -2,2 do
-				local fruit_chance = fruit_chances[y]
-				for z = -2,2 do
-					for x = -2,2 do
-						local distq = x*x+y*y+z*z
-						if distq ~= 0
-						and math.random(1, math.sqrt(distq)) == 1 then
-							local x = x+px
-							local y = y+py
-							local z = z+pz
-							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[vi] = true
 else
-									leaves[vi] = true
+	minetest.log("info", "nether mapgen running in main env")
+	dofile(path .. "/mapgen.lua")
 end
-								update_minmax(min, max, {x=x, z=z})
-							end
-						end
-					end
-				end
-			end
-		end
-	end
-
-	--ps = nil
-	--collectgarbage()
-
-	for i = -1,h_stem+1 do
-		-- param2 explicitly set 0 due to possibly previous leaves node
-		trunk_ps[#trunk_ps+1] = {pos.z, pos.y+i, pos.x, 0}
-	end
-
-	local manip = minetest.get_voxel_manip()
-	local emerged_pos1, emerged_pos2 = manip:read_from_map(min, max)
-	local area = VoxelArea:new({MinEdge=emerged_pos1, MaxEdge=emerged_pos2})
-	local nodes = manip:get_data()
-	local param2s = manip:get_param2_data()
-
-	for i in pairs(leaves) do
-		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)
-			--param2s[p] = math.random(0,44)
-		end
-	end
-
-	for i in pairs(fruits) do
-		local p = area:indexp(pos_from_hash(i))
-		if soft_node(nodes[p]) then
-			nodes[p] = c.nether_apple
-		end
-	end
-
-	for i = 1,#trunk_ps do
-		local p = trunk_ps[i]
-		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 i,par2 in pairs(trunk_corners) do
-		local vi = area:indexp(pos_from_hash(i))
-		nodes[vi] = c.nether_tree_corner
-		param2s[vi] = par2
-	end
-
-	manip:set_data(nodes)
-	manip:set_param2_data(param2s)
-	manip:write_to_map(not generated)
-	nether:inform("a nether tree with " .. trunk_count ..
-		" branch trunk nodes grew at " .. minetest.pos_to_string(pos),
-		generated and 3 or 2, t1)
-end
-
 
 --abms
 
@@ -930,8 +89,8 @@ minetest.register_abm({
 minetest.register_abm({
 	nodenames = {"nether:tree_sapling"},
 	neighbors = {"group:nether_dirt"},
-	interval = abm_tree_interval,
+	interval = nether.v.abm_tree_interval,
-	chance = abm_tree_chance,
+	chance = nether.v.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
@@ -1042,5 +201,5 @@ local msg = ("[nether] loaded after ca. %g seconds."):format(time)
 if time > 0.01 then
 	print(msg)
 else
-	minetest.log("action", msg)
+	minetest.log("info", msg)
 end

nether/init_emerge.lua

@@ -0,0 +1,13 @@
+
+-- This is run in mapgen env (see register_mapgen_script)
+
+nether = {}
+nether.env_type = "ssm_mapgen"
+
+nether.path = minetest.get_modpath("nether")
+local path = nether.path
+
+dofile(path .. "/common.lua")
+dofile(path .. "/grow_structures.lua")
+
+dofile(path .. "/mapgen.lua")

nether/items.lua

@@ -4,25 +4,20 @@ local nether_sound = default.node_sound_stone_defaults({
 	footstep = {name="nether_footstep", gain=0.4}
 })
 
+-- The fence registration function from fence_registration
 local add_fence = minetest.register_fence
+local stairs_exist = minetest.global_exists("stairs")
+
+-- A function which registers a fence and stairs nodes for a nether node if the
+-- mods for these node registrations are available
 local function add_more_nodes(name)
 	local nd = "nether:"..name
 	if not string.find(name, "nether") then
 		name = "nether_"..name
 	end
 	local data = minetest.registered_nodes[nd]
-	if stairsplus then
+	if stairs_exist then
-		stairsplus:register_all(
+		stairs.register_stair_and_slab(name, nd,
-			"nether",
-			name,
-			nd,
-			data
-		)
-		minetest.register_alias("stairs:stair_"..name, "nether"..":stair_"..name)
-		minetest.register_alias("stairs:slab_"..name, "nether"..":slab_"..name)
-	else
-		stairs.register_stair_and_slab(
-			name, nd,
 			data.groups,
 			data.tiles,
 			data.description.." Stair",
@@ -47,17 +42,16 @@ 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
-	if creative_installed and creative.is_enabled_for(player:get_player_name()) then
+	if minetest.is_creative_enabled(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]
+	tool = minetest.registered_tools[tool] or tool == ""
+		and minetest.registered_items[tool]
 	if not tool
 	or not tool.tool_capabilities then
 		return false
@@ -222,7 +216,8 @@ add_more_nodes("blood_empty")
 
 minetest.register_node("nether:blood_top", {
 	description = "Nether Blood Head",
-	tiles = {"nether_blood_top.png", "nether_blood.png", "nether_blood.png^nether_blood_side.png"},
+	tiles = {"nether_blood_top.png", "nether_blood.png",
+		"nether_blood.png^nether_blood_side.png"},
 	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -230,7 +225,8 @@ add_more_nodes("blood_top")
 
 minetest.register_node("nether:blood_top_cooked", {
 	description = "Cooked Nether Blood Head",
-	tiles = {"nether_blood_top_cooked.png", "nether_blood_cooked.png", "nether_blood_cooked.png^nether_blood_side_cooked.png"},
+	tiles = {"nether_blood_top_cooked.png", "nether_blood_cooked.png",
+		"nether_blood_cooked.png^nether_blood_side_cooked.png"},
 	groups = {nether=3},
 	sounds = nether_sound,
 	furnace_burntime = 10,
@@ -242,7 +238,8 @@ add_more_nodes("blood_top_cooked")
 
 minetest.register_node("nether:blood_top_empty", {
 	description = "Nether Blood Head Extracted",
-	tiles = {"nether_blood_top_empty.png", "nether_blood_empty.png", "nether_blood_empty.png^nether_blood_side_empty.png"},
+	tiles = {"nether_blood_top_empty.png", "nether_blood_empty.png",
+		"nether_blood_empty.png^nether_blood_side_empty.png"},
 	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -251,7 +248,8 @@ add_more_nodes("blood_top_empty")
 
 minetest.register_node("nether:blood_stem", {
 	description = "Nether Blood Stem",
-	tiles = {"nether_blood_stem_top.png", "nether_blood_stem_top.png", "nether_blood_stem.png"},
+	tiles = {"nether_blood_stem_top.png", "nether_blood_stem_top.png",
+		"nether_blood_stem.png"},
 	groups = {snappy=2, choppy=2, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -259,7 +257,8 @@ add_more_nodes("blood_stem")
 
 minetest.register_node("nether:blood_stem_cooked", {
 	description = "Cooked Nether Blood Stem",
-	tiles = {"nether_blood_stem_top_cooked.png", "nether_blood_stem_top_cooked.png", "nether_blood_stem_cooked.png"},
+	tiles = {"nether_blood_stem_top_cooked.png",
+		"nether_blood_stem_top_cooked.png", "nether_blood_stem_cooked.png"},
 	groups = {nether=3},
 	sounds = nether_sound,
 	furnace_burntime = 30,
@@ -271,7 +270,8 @@ add_more_nodes("blood_stem_cooked")
 
 minetest.register_node("nether:blood_stem_empty", {
 	description = "Nether Blood Stem Extracted",
-	tiles = {"nether_blood_stem_top_empty.png", "nether_blood_stem_top_empty.png", "nether_blood_stem_empty.png"},
+	tiles = {"nether_blood_stem_top_empty.png",
+		"nether_blood_stem_top_empty.png", "nether_blood_stem_empty.png"},
 	groups = {tree=1, choppy=2, oddly_breakable_by_hand=1},
 	sounds = default.node_sound_wood_defaults(),
 })
@@ -363,7 +363,10 @@ minetest.override_item("riesenpilz:nether_shroom", {
 minetest.register_node("nether:apple", {
 	description = "Nether Fruit",
 	drawtype = "nodebox",
-	tiles = {"nether_fruit_top.png", "nether_fruit_bottom.png", "nether_fruit.png", "nether_fruit.png^[transformFX", "nether_fruit.png^[transformFX", "nether_fruit.png"},
+	tiles = {"nether_fruit_top.png", "nether_fruit_bottom.png",
+		"nether_fruit.png", "nether_fruit.png^[transformFX",
+		"nether_fruit.png^[transformFX", "nether_fruit.png"},
+	use_texture_alpha = "opaque",
 	node_box = {
 		type = "fixed",
 		fixed = {
@@ -391,7 +394,7 @@ minetest.register_node("nether:apple", {
 			return
 		end
 		itemstack:take_item()
-		if nether_port(user, vector.round(user:getpos())) then
+		if nether.teleport_player(user) then
 			return itemstack
 		end
 		local amount = math.random(4, 6)
@@ -518,8 +521,10 @@ minetest.register_node("nether:tree", {
 
 minetest.register_node("nether:tree_corner", {
 	description = "Nether Trunk Corner",
-	tiles = {"nether_tree.png^[transformR180", "nether_tree_top.png", "nether_tree_corner.png^[transformFY",
+	tiles = {"nether_tree.png^[transformR180", "nether_tree_top.png",
-		"nether_tree_corner.png^[transformR180", "nether_tree.png", "nether_tree_top.png"},
+		"nether_tree_corner.png^[transformFY",
+		"nether_tree_corner.png^[transformR180", "nether_tree.png",
+		"nether_tree_top.png"},
 	paramtype2 = "facedir",
 	is_ground_content = false,
 	groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,not_in_creative_inventory=1},
@@ -540,7 +545,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",
@@ -641,7 +646,7 @@ minetest.register_node("nether:portal", {
 	light_source = 12,
 	paramtype = "light",
 	sunlight_propagates = true,
-	use_texture_alpha = true,
+	use_texture_alpha = "blend",
 	walkable = false,
 	pointable = false,
 	buildable_to = false,

nether/mapgen.lua

@@ -0,0 +1,519 @@
+
+local path = nether.path
+local in_mapgen_env = nether.env_type == "ssm_mapgen"
+
+-- vars
+local v = nether.v
+local nether_middle = v.nether_middle
+local f_bottom_scale = v.f_bottom_scale
+local f_h_min = v.f_h_min
+local f_h_max = v.f_h_max
+local tree_rarity = v.tree_rarity
+local glowflower_rarity = v.glowflower_rarity
+local grass_rarity = v.grass_rarity
+local mushroom_rarity = v.mushroom_rarity
+local nether_start = v.nether_start
+local NETHER_HEIGHT = v.NETHER_HEIGHT
+local NETHER_RANDOM = v.NETHER_RANDOM
+local GLOWSTONE_FREQ_ROOF = v.GLOWSTONE_FREQ_ROOF
+local LAVA_FREQ = v.LAVA_FREQ
+local nether_structure_freq = v.nether_structure_freq
+local NETHER_SHROOM_FREQ = v.NETHER_SHROOM_FREQ
+local NETHER_BOTTOM = v.NETHER_BOTTOM
+local nether_buildings = v.nether_buildings
+
+local nether_weird_noise = dofile(path .. "/weird_mapgen_noise.lua")
+
+-- Weierstrass function stuff from https://github.com/slemonide/gen
+local get_ws_list
+do
+	local SIZE = 1000
+	local ssize = math.ceil(math.abs(SIZE))
+	local function do_ws_func(depth, a, x)
+		local n = math.pi * x / (16 * SIZE)
+		local y = 0
+		for k=1,depth do
+			y = y + math.sin(k^a * n) / k^a
+		end
+		return SIZE * y / math.pi
+	end
+
+	local chunksize = minetest.settings:get"chunksize" or 5
+	local ws_lists = {}
+	get_ws_list = function(a,x)
+			ws_lists[a] = ws_lists[a] or {}
+			local v = ws_lists[a][x]
+			if v then
+					return v
+			end
+			v = {}
+			for x=x,x + (chunksize*16 - 1) do
+			local y = do_ws_func(ssize, a, x)
+					v[x] = y
+			end
+			ws_lists[a][x] = v
+			return v
+	end
+end
+
+local function dif(z1, z2)
+	return math.abs(z1-z2)
+end
+
+local function pymg(x1, x2, z1, z2)
+	return math.max(dif(x1, x2), dif(z1, z2))
+end
+
+-- Generated variables
+--~ 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}
+--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}
+--[[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
+	v.pos.z = v.pos.z + HADES_THRONE_STARTPOS_ABS.z
+	HADES_THRONE_ABS[i] = v
+end
+local htx = 0
+local hty = 0
+local htz = 0
+for i,v in ipairs(HADES_THRONE_ABS) do
+	if v.pos.x > htx then
+		htx = v.pos.x
+	end
+	if v.pos.y > hty then
+		hty = v.pos.y
+	end
+	if v.pos.z > htz then
+		htz = v.pos.z
+	end
+end
+HADES_THRONE_ENDPOS_ABS = {x=htx, y=hty, z=htz}]]
+
+local c, nether_tree_nodes, contents_defined
+local function define_contents()
+	if not contents_defined then
+		c, nether_tree_nodes = nether.query_contents()
+		contents_defined = true
+	end
+end
+
+local pr
+
+local function return_nether_ore(id, glowstone)
+	if glowstone
+	and pr:next(0,GLOWSTONE_FREQ_ROOF) == 1 then
+		return c.glowstone
+	end
+	if id == c.coal then
+		return c.netherrack_tiled
+	end
+	if id == c.gravel then
+		return c.netherrack_black
+	end
+	if id == c.diamond then
+		return c.netherrack_blue
+	end
+	if id == c.mese then
+		return c.white
+	end
+	return c.netherrack
+end
+
+local f_perlins = {}
+
+-- 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,
+		spread = {x=50, y=50, z=50},
+		scale = 1,
+		offset = 0,
+	},
+	{-- amp 1.75
+		seed = 133,
+		octaves = 3,
+		persist = 0.5,
+		spread = {x=10, y=10, z=10},
+		scale = 1,
+		offset = 0,
+	},
+	{-- amp 1.75
+		seed = 112,
+		octaves = 3,
+		persist = 0.5,
+		spread = {x=5, y=5, z=5},
+		scale = 1,
+		offset = 0,
+	},
+	--[[forest_bottom = {
+		seed = 11,
+		octaves = 3,
+		persist = 0.8,
+		spread = {x=tmp2, y=tmp2, z=tmp2},
+		scale = 1,
+		offset = 0,
+	},]]
+	forest_top = {-- amp 2.44
+		seed = 21,
+		octaves = 3,
+		persist = 0.8,
+		spread = {x=tmp, y=tmp, z=tmp},
+		scale = 1,
+		offset = 0,
+	},
+}
+
+-- 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
+local function on_generated(minp, maxp, seed)
+	--avoid big map generation
+	if not (maxp.y >= NETHER_BOTTOM-100 and minp.y <= nether_start) then
+		return
+	end
+
+	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)
+
+	define_contents()
+
+	local buildings = 0
+	if maxp.y <= NETHER_BOTTOM then
+		buildings = 1
+	elseif minp.y <= nether_buildings then
+		buildings = 2
+	end
+
+	local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
+	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)
+	--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
+	local map_lengths_xyz = {x=side_length, y=side_length, z=side_length}
+
+	if not pelin_maps then
+		pelin_maps = {
+			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:get_2d_map_flat({x=minp.x, y=minp.z}, pmap1)
+	pelin_maps.b:get_2d_map_flat({x=minp.x, y=minp.z}, pmap2)
+	pelin_maps.c:get_2d_map_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):get_2d_map_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)
+		pelin_maps.forest_top:get_2d_map_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
+
+	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, side_length-1)
+	end
+
+	local count = 0
+	for z=minp.z, maxp.z do
+		for x=minp.x, maxp.x do
+
+			count = count+1
+
+			local test = pmap1[count]+1
+			local test2 = pmap2[count]
+			local test3 = math.abs(pmap3[count])
+
+			local t = math.floor(test*3+0.5)
+
+			local h
+			if test2 < 0 then
+				h = math.floor(test2*3+0.5)-1
+			else
+				h = 3+t+pr:next(0,NETHER_RANDOM)
+			end
+
+			local generate_vine = false
+			if test3 >= 0.72+pr:next(0,NETHER_RANDOM)/10
+			and pr:next(0,NETHER_RANDOM) == 1 then
+				generate_vine = true
+			end
+
+			local bottom = NETHER_BOTTOM+h
+			local top = nether_middle-pr:next(0,NETHER_RANDOM)+t
+
+			local py_h = 0
+			local difn, noisp, py_h_g
+			if buildings >= 1 then
+				py_h = tab2[num2].y
+				num2 = num2+1
+
+				difn = nether_buildings-py_h
+				if difn == 5 then
+					noisp = 1
+				elseif difn < 5 then
+					noisp = 2
+				end
+				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 _ = 1,side_length do
+						data[vi] = c.netherrack_brick
+						vi = vi + area.ystride
+					end
+				else
+					for _ = 1,side_length do
+						data[vi] = c.lava
+						vi = vi + area.ystride
+					end
+				end
+			else
+
+				local r_structure = pr:next(1,nether_structure_freq)
+				local r_shroom = pr:next(1,NETHER_SHROOM_FREQ)
+				local r_glowstone = pr:next(0,GLOWSTONE_FREQ_ROOF)
+				local r_vine_length = pr:next(1,vine_maxlength)
+
+				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 pstr = p.x.." "..p.z
+					if not f_perlins[pstr] then
+						f_perlins[pstr] = math.floor(f_h_min + (math.abs(
+							perlin_f_bottom:get_2d{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)
+					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)
+					is_forest = f_bottom < f_top
+					f_h_dirt = f_bottom-pr:next(0,1)
+				end
+
+				for y=minp.y, maxp.y do
+					local d_p_addp = data[vi]
+					--if py_h >= maxp.y-4 then
+					if y <= py_h
+					and noisp then
+						if noisp == 1 then
+							data[vi] = c.netherrack_brick
+						elseif noisp == 2 then
+							if y == py_h then
+								data[vi] = c.netherrack_brick
+							elseif y == py_h_g
+							and pr:next(1,3) <= 2 then
+								data[vi] = c.netherrack
+							elseif y <= py_h_g then
+								data[vi] = c.lava
+							else
+								data[vi] = c.air
+							end
+						end
+					elseif d_p_addp ~= c.air then
+
+						if is_forest
+						and y == f_bottom then
+							data[vi] = c.nether_dirt_top
+						elseif is_forest
+						and y < f_bottom
+						and y >= f_h_dirt then
+							data[vi] = c.nether_dirt
+						elseif is_forest
+						and y == f_h_dirt-1 then
+							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[vi] = c.nether_shroom
+							elseif pr:next(1,glowflower_rarity) == 1 then
+								data[vi] = c.glowflower
+							elseif pr:next(1,grass_rarity) == 1 then
+								data[vi] = c.nether_grass[pr:next(1,3)]
+							else
+								data[vi] = c.air
+							end
+						elseif is_forest
+						and y > f_bottom
+						and y < f_top then
+							if not nether_tree_nodes[d_p_addp] then
+								data[vi] = 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[vi] = return_nether_ore(d_p_addp, true)
+							elseif sel == 6 then
+								data[vi] = c.netherrack_black
+							elseif sel == 7 then
+								data[vi] = c.glowstone
+							else
+								data[vi] = c.air
+							end
+
+						elseif y <= NETHER_BOTTOM then
+							if y <= bottom then
+								data[vi] = return_nether_ore(d_p_addp, true)
+							else
+								data[vi] = c.lava
+							end
+						elseif r_structure == 1
+						and y == bottom then
+							tab[num] = {x=x, y=y-1, z=z}
+							num = num+1
+						elseif y <= bottom then
+							if pr:next(1,LAVA_FREQ) == 1 then
+								data[vi] = c.lava
+							else
+								data[vi] = return_nether_ore(d_p_addp, false)
+							end
+						elseif r_shroom == 1
+						and r_structure ~= 1
+						and y == bottom+1 then
+							data[vi] = c.nether_shroom
+						elseif (y == top and r_glowstone == 1) then
+							data[vi] = c.glowstone
+						elseif y >= top then
+							data[vi] = return_nether_ore(d_p_addp, true)
+						elseif y <= top-1
+						and generate_vine
+						and y >= top-r_vine_length then
+							data[vi] = c.nether_vine
+						else
+							data[vi] = c.air
+						end
+					end
+					vi = vi + area.ystride
+				end
+			end
+		end
+	end
+
+	nether:inform("most stuff set", 2, t1)
+
+	local t2 = minetest.get_us_time()
+	local bl_cnt = 0
+	local tr_cnt = 0
+	local tr_snd_cnt = 0
+
+	if structures_enabled then -- Blood netherstructures
+		bl_cnt = #tab
+		for i = 1, #tab do
+			nether.grow_netherstructure_into(area, data, tab[i], true)
+		end
+	end
+
+	if bl_cnt > 0 then
+		nether:inform(bl_cnt .. " blood structures set", 2, t2)
+	end
+
+	t2 = minetest.get_us_time()
+	vm:set_data(data)
+--	vm:set_lighting(12)
+--	vm:calc_lighting()
+--	vm:update_liquids()
+	if not in_mapgen_env then
+		vm:write_to_map(false)
+	end
+	nether:inform("data written", 2, t2)
+
+	t2 = minetest.get_us_time()
+	if forest_possible then -- Forest trees
+		if in_mapgen_env then
+			-- Trees can get too big (>16 nodes in one direction) for usual
+			-- overgeneration onion layer. nether.grow_tree will make new vmanips
+			-- to emerge blank (= ignore-filled) blocks to overcome this. But the
+			-- main server thread needs to do this.
+			tr_snd_cnt = #trees
+			local trees_hashed = {}
+			for i = 1, #trees do
+				trees_hashed[i] = minetest.hash_node_position(trees[i])
+			end
+			assert(minetest.save_gen_notify("nether:please_grow_trees", trees_hashed))
+		else
+			tr_cnt = #trees
+			for i = 1, #trees do
+				nether.grow_tree(trees[i], true)
+			end
+		end
+	end
+
+	if tr_cnt + tr_snd_cnt > 0 then
+		nether:inform(string.format("%s trees set, %s trees sent",
+				tr_cnt, tr_snd_cnt), 2, t2)
+	end
+
+	if in_mapgen_env then
+		assert(minetest.save_gen_notify("nether:please_fix_light", {minp, maxp}))
+	else
+		t2 = minetest.get_us_time()
+		minetest.fix_light(minp, maxp)
+
+		nether:inform("light fixed", 2, t2)
+	end
+
+	nether:inform("done", 1, t1)
+end
+
+if in_mapgen_env then
+	minetest.register_on_generated(function(_, minp, maxp, blockseed)
+		return on_generated(minp, maxp, blockseed)
+	end)
+else
+	minetest.register_on_generated(on_generated)
+end

nether/mod.conf

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

nether/pearl.lua

@@ -1,22 +1,14 @@
-local function table_contains(t, v)
-	for _,i in pairs(t) do
-		if v == i then
-			return true
-		end
-	end
-	return false
-end
 
-local creative = minetest.settings:get_bool("creative_mode")
 local function throw_pearl(item, player)
-	local playerpos = player:getpos()
+	local playerpos = player:get_pos()
 	playerpos.y = playerpos.y+1.625
 	local obj = minetest.add_entity(playerpos, "nether:pearl_entity")
 	local dir = player:get_look_dir()
-	obj:setvelocity(vector.multiply(dir, 30))
+	obj:set_velocity(vector.multiply(dir, 30))
-	obj:setacceleration({x=dir.x*-3, y=-dir.y^8*80-10, z=dir.z*-3})
+	obj:set_acceleration({x=dir.x*-3, y=-dir.y^8*80-10, z=dir.z*-3})
-	obj:get_luaentity().player = player:get_player_name()
+	local pname = player:get_player_name()
-	if not creative then
+	obj:get_luaentity().player = pname
+	if not minetest.is_creative_enabled(pname) then
 		item:take_item()
 		return item
 	end
@@ -64,7 +56,7 @@ local function teleport_player(pos, player)
 		return false
 	end
 	pos.y = pos.y+0.05
-	player:moveto(pos)
+	player:move_to(pos)
 	return true
 end
 
@@ -107,7 +99,7 @@ minetest.register_entity("nether:pearl_entity", {
 		self.player = tmp.player
 	end,
 	get_staticdata = function(self)
-		--forceload(vector.round(self.object:getpos()))
+		--forceload(vector.round(self.object:get_pos()))
 		return minetest.serialize({
 			player = self.player,
 		})
@@ -129,7 +121,7 @@ minetest.register_entity("nether:pearl_entity", {
 			return
 		end
 
-		local pos = self.object:getpos()
+		local pos = self.object:get_pos()
 		local rpos = vector.round(pos)
 		local lastpos = self.lastpos
 		if not lastpos then

nether/portal.lua

@@ -1,9 +1,12 @@
 --code copied from Pilzadam's nether mod and edited
 
+local nether_start = nether.v.nether_start
+local nether_bottom = nether.v.nether_bottom
+local nether_buildings = nether.v.nether_buildings
+
 -- kills the player if he uses PilzAdam portal
-local portal_target = nether.buildings+1
+local portal_target = nether_buildings+1
-local nether_prisons = minetest.settings:get_bool("enable_damage")
+local damage_enabled = minetest.settings:get_bool"enable_damage"
-local obsidian_portal_kills = nether_prisons and true
 local mclike_portal = false
 
 local abm_allowed
@@ -12,27 +15,27 @@ minetest.after(5, function()
 end)
 
 local save_path = minetest.get_worldpath() .. "/nether_players"
-local players_in_nether = {}
+local players_trapped_in_nether = {}
--- only get info from file if nether prisons
+
-if nether_prisons then
+-- Load the list of players which are trapped in the nether
+-- (or would be trapped if nether.trap_players was true)
+do
 	local file = io.open(save_path, "r")
-	if not file then
+	if file then
-		return
-	end
 		local contents = file:read"*all"
 		io.close(file)
-	if not contents then
+		if contents then
-		return
-	end
 			local playernames = string.split(contents, " ")
 			for i = 1,#playernames do
-		players_in_nether[playernames[i]] = true
+				players_trapped_in_nether[playernames[i]] = true
+			end
+		end
 	end
 end
 
 local function save_nether_players()
 	local playernames,n = {},1
-	for name in pairs(players_in_nether) do
+	for name in pairs(players_trapped_in_nether) do
 		playernames[n] = name
 		n = n+1
 	end
@@ -42,8 +45,19 @@ local function save_nether_players()
 	io.close(f)
 end
 
+-- Nether aware mods will need to know if a player is in the nether.
+function nether.is_player_in_nether(player)
+	local pos = player:get_pos()
+	return (pos.y < nether_start) and (pos.y >= nether_bottom)
+end
+
+-- For testing nether trap state tracking.
+function nether.is_player_trapped_in_nether(player)
+	return players_trapped_in_nether[player:get_player_name()]
+end
+
 local update_background
-if nether_prisons then
+if nether.trap_players then
 	function update_background(player, down)
 		if down then
 			player:set_sky({r=15, g=0, b=0}, "plain")
@@ -55,6 +69,36 @@ else
 	function update_background()end
 end
 
+-- Nether aware mods may have other means of moving players between the Nether
+-- and Overworld, and if so, they should tell us about it so we can keep track
+-- of the player state.
+function nether.external_nether_teleport(player, pos)
+	if not nether.trap_players then
+		player:set_pos(pos)
+		return
+	end
+	local destination_in_nether = (pos.y < nether_start) and (pos.y >= nether_bottom)
+	update_background(player, destination_in_nether)
+	local pname = player:get_player_name()
+	players_trapped_in_nether[pname] = destination_in_nether or nil
+	player:set_pos(pos)
+end
+
+-- Has the player dug their way out of the nether?
+-- Has nether.trap_players been disabled?
+function nether.registry_update(player)
+	local pos = player:get_pos()
+	local in_nether = (pos.y < nether_start) and (pos.y >= nether_bottom)
+	local pname = player:get_player_name()
+	if nether.trap_players then
+		players_trapped_in_nether[pname] = in_nether or nil
+		update_background(player, in_nether)
+	elseif players_trapped_in_nether[pname] then
+		players_trapped_in_nether[pname] = nil
+		update_background(player, false)
+	end
+end
+
 -- returns nodename if area is generated, else calls generation function
 local function generated_or_generate(pos)
 	local node = minetest.get_node_or_nil(pos)
@@ -72,7 +116,7 @@ end
 
 -- where the player appears after dying
 local function get_player_died_target(player)
-	local target = vector.add(player:getpos(),
+	local target = vector.add(player:get_pos(),
 		{x=math.random(-100,100), y=0, z=math.random(-100,100)})
 	target.y = portal_target + math.random(4)
 	return target
@@ -80,11 +124,12 @@ end
 
 -- used for obsidian portal
 local function obsidian_teleport(player, pname, target)
-	minetest.chat_send_player(pname, "For any reason you arrived here. Type " ..
+	minetest.chat_send_player(pname, "For some reason you arrived here. Type " ..
 		"/nether_help to find out things like craft recipes.")
-	players_in_nether[pname] = true
+	players_trapped_in_nether[pname] = true
 	save_nether_players()
 	update_background(player, true)
+
 	if target then
 		player:set_pos(target)
 	else
@@ -95,31 +140,30 @@ end
 -- teleports players to nether or helps it
 local function player_to_nether(player, pos)
 	local pname = player:get_player_name()
-	if players_in_nether[pname] then
+	players_trapped_in_nether[pname] = true
-		return
-	end
-	players_in_nether[pname] = true
 	save_nether_players()
 	update_background(player, true)
 	if pos then
 		player:set_pos(pos)
 		return
 	end
-	minetest.chat_send_player(pname, "For any reason you arrived here. " ..
+	minetest.chat_send_player(pname, "For some reason you arrived here. " ..
 		"Type /nether_help to find out things like craft recipes.")
+	if nether.trap_players then
 		player:set_hp(0)
-	if nether_prisons then
+	end
+	if not damage_enabled or not nether.trap_players then
 		player:set_pos(get_player_died_target(player))
 	end
 end
 
 local function player_from_nether(player, pos)
 	local pname = player:get_player_name()
-	if players_in_nether[pname] then
+	if players_trapped_in_nether[pname] then
-		players_in_nether[pname] = nil
+		players_trapped_in_nether[pname] = nil
 		save_nether_players()
 	end
-	update_background(player)
+	update_background(player, false)
 	player:set_pos(pos)
 end
 
@@ -172,18 +216,104 @@ minetest.register_chatcommand("from_hell", {
 			return false, "Something went wrong."
 		end
 		minetest.chat_send_player(pname, "You are free now")
-		local pos = player:getpos()
+		local pos = player:get_pos()
 		player_from_nether(player, {x=pos.x, y=100, z=pos.z})
 		return true, pname.." is now out of the nether."
 	end
 })
 
+-- Useful for debugging Nether player state tracking. Written by Deathwing777
+minetest.register_chatcommand("in_hell", {
+	params = "[<player_name>]",
+	description = "Is the player in 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."
+		end
+		if not player_exists(pname) then
+			pname = name
+		end
+		local player = minetest.get_player_by_name(pname)
+		if not player then
+			return false, "Something went wrong."
+		end
 
-if nether_prisons then
+		local status = pname.." is in the "
+		if nether.is_player_in_nether(player) then
+			status = status.."NETHER!"
+		else
+			status = status.."OVERWORLD!"
+		end
+
+		return true, status
+	end
+})
+
+-- Useful for debugging Nether player state tracking. Written by Deathwing777
+minetest.register_chatcommand("trapped_in_hell", {
+	params = "[<player_name>]",
+	description = "Is the player trapped in 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."
+		end
+		if not player_exists(pname) then
+			pname = name
+		end
+		local player = minetest.get_player_by_name(pname)
+		if not player then
+			return false, "Something went wrong."
+		end
+
+		local status = pname
+		if nether.is_player_trapped_in_nether(player) then
+			status = status.." is TRAPPED in nether!"
+		else
+			status = status.." is NOT trapped in nether!"
+		end
+
+		return true, status
+	end
+})
+
+-- Useful for debugging Nether player state tracking. Written by Deathwing777
+minetest.register_chatcommand("update_hells_registry", {
+	params = "[<player_name>]",
+	description = "Update player state if they got to or from the nether in another way.",
+	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."
+		end
+		if not player_exists(pname) then
+			pname = name
+		end
+		local player = minetest.get_player_by_name(pname)
+		if not player then
+			return false, "Something went wrong."
+		end
+
+		nether.registry_update(player)
+		local status = pname
+		if nether.is_player_trapped_in_nether(player) then
+			status = status.." is TRAPPED in nether!"
+		else
+			status = status.." is NOT trapped in nether!"
+		end
+
+		return true, status
+	end
+})
+
+
+-- Disallow teleportation and change spawn positions if the nether traps players
+if nether.trap_players 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 players_in_nether[pname] then
+		if not players_trapped_in_nether[pname] then
 			return
 		end
 		local target = get_player_died_target(player)
@@ -192,23 +322,23 @@ if nether_prisons then
 			-- fixes respawn bug
 			local player = minetest.get_player_by_name(pname)
 			if player then
-				player:moveto(target)
+				player:move_to(target)
 			end
 		end, pname, target)
 		return true
 	end)
 
-	-- override set_pos etc. to disallow player teleportion by e.g. travelnet
+	-- override set_pos etc, to disallow player teleportion by e.g. travelnet
 	local function can_teleport(player, pos)
 		if not player:is_player() then
 			-- the same metatable is used for entities
 			return true
 		end
 		local pname = player:get_player_name()
-		local in_nether = players_in_nether[pname] == true
+		local in_nether = players_trapped_in_nether[pname] == true
 
 		-- test if the target is valid
-		if pos.y < nether.start then
+		if pos.y < nether_start then
 			if in_nether then
 				return true
 			end
@@ -218,7 +348,7 @@ if nether_prisons then
 
 		-- test if the current position is valid
 		local current_pos = player:get_pos()
-		local now_in_nether = current_pos.y < nether.start
+		local now_in_nether = current_pos.y < nether_start
 		if now_in_nether ~= in_nether then
 			if in_nether then
 				minetest.log("action", "Player \"" .. pname ..
@@ -229,7 +359,7 @@ if nether_prisons then
 			else
 				minetest.log("action", "Player \"" .. pname ..
 					"\" must not be in the nether, teleporting it!")
-				update_background(player)
+				update_background(player, false)
 				current_pos.y = 20
 				player:set_pos(current_pos)
 			end
@@ -246,7 +376,7 @@ if nether_prisons then
 	local metatable_overridden
 	minetest.register_on_joinplayer(function(player)
 		-- set the background when the player joins
-		if player:getpos().y < nether.start then
+		if player:get_pos().y < nether_start then
 			update_background(player, true)
 		end
 
@@ -266,12 +396,6 @@ if nether_prisons then
 			end
 		end
 	end)
-else
-	-- test if player is in nether when he/she joins
-	minetest.register_on_joinplayer(function(player)
-		players_in_nether[player:get_player_name()] =
-			player:getpos().y < nether.start or nil
-	end)
 end
 
 -- removes the violet stuff from the obsidian portal
@@ -306,18 +430,18 @@ local particledef = {
 -- teleports player to neter (obsidian portal)
 local function obsi_teleport_player(player, pos, target)
 	local pname = player:get_player_name()
-	if players_in_nether[pname] then
+	if players_trapped_in_nether[pname] then
 		return
 	end
 
-	local objpos = player:getpos()
+	local objpos = player:get_pos()
 	objpos.y = objpos.y+0.1 -- Fix some glitches at -8000
 	if minetest.get_node(vector.round(objpos)).name ~= "nether:portal" then
 		return
 	end
 
 	local has_teleported
-	if obsidian_portal_kills then
+	if (damage_enabled and nether.trap_players) then
 		obsidian_teleport(player, pname)
 		has_teleported = true
 	elseif not mclike_portal then
@@ -439,7 +563,7 @@ local function make_portal(pos)
 		return false
 	end
 
-	local in_nether = p1.y < nether.start
+	local in_nether = p1.y < nether_start
 
 	if in_nether
 	and not mclike_portal then
@@ -484,7 +608,7 @@ local function make_portal(pos)
 
 	for d=0,3 do
 	for y=p1.y,p2.y do
-		local p = {}
+		local p
 		if param2 == 0 then
 			p = {x=p1.x+d, y=y, z=p1.z}
 		else
@@ -565,10 +689,11 @@ minetest.after(0.1, function()
 			and minetest.get_node(pt.under).name == "default:obsidian" then
 				local done = make_portal(pt.under)
 				if done then
-					minetest.chat_send_player(player:get_player_name(),
+					local pname = player:get_player_name()
+					minetest.chat_send_player(pname,
 						"Warning: If you are in the nether you may not be " ..
 						"able to find the way out!")
-					if not minetest.settings:get_bool("creative_mode") then
+					if not minetest.is_creative_enabled(pname) then
 						stack:take_item()
 					end
 				end
@@ -579,14 +704,13 @@ minetest.after(0.1, function()
 end)
 
 
--- a not filled square
+-- Get positions for an empty square around the origin
-vector.square = vector.square or
+local function vector_square(r)
-function(r)
 	local tab, n = {}, 1
 	for i = -r+1, r do
 		for j = -1, 1, 2 do
 			local a, b = r*j, i*j
-			tab[n] = {a, b}
+			tab[n] = {a, -b}
 			tab[n+1] = {b, a}
 			n=n+2
 		end
@@ -601,13 +725,13 @@ local function is_netherportal(pos)
 			return
 		end
 	end
-	for _,sn in pairs(vector.square(1)) do
+	for _,sn in pairs(vector_square(1)) do
 		if minetest.get_node({x=x+sn[1], y=y-1, z=z+sn[2]}).name ~= "nether:netherrack"
 		or minetest.get_node({x=x+sn[1], y=y+3, z=z+sn[2]}).name ~= "nether:blood_cooked" then
 			return
 		end
 	end
-	for _,sn in pairs(vector.square(2)) do
+	for _,sn in pairs(vector_square(2)) do
 		if minetest.get_node({x=x+sn[1], y=y-1, z=z+sn[2]}).name ~= "nether:netherrack_black"
 		or minetest.get_node({x=x+sn[1], y=y+3, z=z+sn[2]}).name ~= "nether:wood_empty" then
 			return
@@ -650,20 +774,25 @@ local function set_portal(t, z,x, y)
 	t[z][x] = y
 end
 
+local function get_player_nodepos(player)
+	local pos = player:get_pos()
+	pos.y = pos.y + player:get_properties().collisionbox[2] + 0.5
+	return vector.round(pos)
+end
+
 -- used when a player eats that fruit in a portal
-function nether_port(player, pos)
+function nether.teleport_player(player)
-	if not player
+	if not player then
-	or not pos
+		minetest.log("error", "[nether] Missing player.")
-	or not pos.x then
-		minetest.log("error", "[nether] nether_port: something failed.")
 		return
 	end
+	local pos = get_player_nodepos(player)
 	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
+	if pos.y < nether_start then
 		set_portal(known_portals_d, pos.z,pos.x, pos.y)
 
 		local my = tonumber(meta:get_string("y"))

nether/settings.lua

@@ -0,0 +1,24 @@
+local default_settings = {
+	trap_players = true,
+	log_to_chat = false,
+	log_level = 2,
+	overworld_help = true,
+}
+
+nether.settings = {} -- FIXME: unused field. store settings in here?
+
+for name,dv in pairs(default_settings) do
+	local setting
+	local setting_name = "nether." .. name
+	if type(dv) == "boolean" then
+		setting = minetest.settings:get_bool(setting_name)
+	elseif type(dv) == "number" then
+		setting = tonumber(minetest.settings:get(setting_name))
+	else
+		error"[nether] Only boolean and number settings are available"
+	end
+	if setting == nil then
+		setting = dv
+	end
+	nether[name] = setting
+end

nether/settingtypes.txt

@@ -0,0 +1,23 @@
+#    If enabled, regular players which are in the nether can leave it only with
+#    a nether portal and other ways of teleportation, e.g. the /spawn
+#    chatcommand, are blocked. Similarly, the nether can only be entered with a
+#    portal.
+#    This forces the players to investigate the nether and build a portal with
+#    hellish effort to go back to their home in the overworld.
+#    It is recommended to disable this setting in creative mode or if damage is
+#    disabled.
+nether.trap_players (Trap players) bool true
+
+#    If enabled, show log messages in the chat and not only in debug.txt
+nether.log_to_chat (Log messages to chat) bool false
+
+#    Specify how much text is printed for debugging purposes
+#    0: Disabled
+#    1: A bit of information
+#    2: Acceptable amount of information
+#    3: Lots of text
+nether.log_level (Log level) int 2 0 3
+
+#    If disabled, players cannot view the nether guide with /nether_help
+#    in the overworld.
+nether.overworld_help (Overworld help) bool true

nether/weird_mapgen_noise.lua

@@ -5,7 +5,7 @@ end
 
 local r_chs = {}
 
-function nether_weird_noise(minp, fct, s, seed, range, scale)
+local function nether_weird_noise(minp, fct, s, seed, range, scale)
 	if not r_chs[s] then
 		r_chs[s] = math.floor(s/3+0.5)
 	end
@@ -86,3 +86,5 @@ minetest.register_node("ac:wmg", {
 		end
 	end,
 })]]
+
+return nether_weird_noise