Merge remote-tracking branch 'upstream/master'

nether added technic support on April 29, and technic added nether support on May 1, resulting in them both optionally depending on each other and becoming incompatible with each other.

To resolve this, technic will keep the nether support, the compressor recipe has been moved into technic (https://github.com/minetest-mods/technic/pull/644), and this commit reverts the technic-related parts of a6d1f55f, removing the technic dependency.

.luacheckrc

@@ -27,9 +27,11 @@ read_globals = {
 	"stairsplus",
 	"string.split",
 	table = { fields = { "copy", "getn" } },
+	"toolranks",
 	"vector",
 	"VoxelArea",
 	"VoxelManip",
+	"walls",
 	xpanes = { fields = { "register_pane" } },
 }
 

init.lua

@@ -57,8 +57,8 @@ nether.fogColor = {	           -- only used if climate_api is installed
 
 
 -- Settings
-nether.DEPTH_CEILING              =  -5000 -- The y location of the Nether's celing
-nether.DEPTH_FLOOR                = -11000 -- The y location of the Nether's floor
+nether.DEPTH_CEILING              =  -25000 -- The y location of the Nether's celing
+nether.DEPTH_FLOOR                = -31000 -- The y location of the Nether's floor
 nether.FASTTRAVEL_FACTOR          =      8 -- 10 could be better value for Minetest, since there's no sprint, but ex-Minecraft players will be mathing for 8
 nether.PORTAL_BOOK_LOOT_WEIGHTING =    0.9 -- Likelyhood of finding the Book of Portals (guide) in dungeon chests. Set to 0 to disable.
 nether.NETHER_REALM_ENABLED       =   true -- Setting to false disables the Nether and Nether portal

locale/nether.fr.tr

@@ -1,6 +1,6 @@
 # textdomain: nether
 
-# Translation FR by Louis Royer
+# Translation FR by Louis Royer and JoeEnderman
 
 
 ### init.lua ###
@@ -15,75 +15,76 @@ Nether Portal=Portail du Nether
 
 ### mapgen_mantle.lua ###
 
-, @1m above lava-sea level=
-, @1m below lava-sea level=
-, approaching y boundary of Nether=
+, @1m above lava-sea level=, @1m au-dessus du niveau de la mer de lave
+, @1m below lava-sea level=, @1m en-dessous du niveau de la mer de lave
+, approaching y boundary of Nether=, approchant de la limite y du Nether
 @1@2@3@4=
-Center/Mantle, but outside the caverns=
-Center/Mantle, inside cavern=
-Describes which region of the nether the player is in=
-Negative nether=
-Positive nether=
-Shell between negative nether and center region=
-Shell between positive nether and center region=
-The Overworld=
-Unknown player position=
+Center/Mantle, but outside the caverns=Centre/Manteau, mais à l'extérieur des cavernes
+Center/Mantle, inside cavern=Centre/Manteau, à l'intérieur d'une caverne
+Describes which region of the nether the player is in=Indique dans quelle région du Nether se trouve le joueur
+Negative nether=Nether négatif
+Positive nether=Nether positif
+Shell between negative nether and center region=Coquille entre le Nether négatif et la région centrale
+Shell between positive nether and center region=Coquille entre le Nether positif et la région centrale
+The Overworld=L'Overworld
+Unknown player position=Position du joueur inconnue
 [Perlin @1] =
 
 ### nodes.lua ###
 
-A Deep Netherrack wall=
-A Netherrack wall=
-A finely finished block of solid Nether Basalt.=
-A rough cut solid block of Nether Basalt.=
-A thin crust of cooled lava with liquid lava beneath=
-A vent in the earth emitting steam and gas=
-Can be repurposed to provide puffs of smoke in a chimney=
-Chiselled Basalt=
+A Deep Netherrack Wall=Un mur profond en Netherrack
+A Netherrack Wall=Un mur en Netherrack
+A finely finished block of solid Nether Basalt.=Un bloc fini de basalte du Nether solide.
+A rough cut solid block of Nether Basalt.=Un bloc solide de basalte du Nether taillé à la hache.
+A thin crust of cooled lava with liquid lava beneath=Une croûte fine de lave refroidie avec de la lave liquide en dessous
+A vent in the earth emitting steam and gas=Une fissure dans la terre émettant de la vapeur et du gaz
+Can be repurposed to provide puffs of smoke in a chimney=Peut être réutilisé pour produire des bouffées de fumée dans une cheminée
+Chiselled Basalt=Basalte sculpté
 
-Columns of dark basalt found only in magma oceans deep within the Nether.=
+Columns of dark basalt found only in magma oceans deep within the Nether.=Colonnes de basalte noir que l'on trouve uniquement dans les océans de magma profonds du Nether.
 
-Compressed Netherbrick=
-Cracked Nether Brick=
-Deep Glowstone=
-Deep Nether Brick=
-Deep Nether Slab=
-Deep Nether Stair=
-Deep Netherrack=
-Deep Netherrack slab=
-Deep Netherrack stair=
-Fumarolic Chimney=
-Fumarolic Chimney Corner=
-Fumarolic Chimney Slab=
+Compressed Netherbrick=Briques du Nether compressées
+Cracked Nether Brick=Briques du Nether craquelées
+Deep Glowstone=Pierre lumineuse profonde
+Deep Nether Brick=Briques du Nether profondes
+Deep Nether Slab=Dalle du Nether profonde
+Deep Nether Stair=Escalier du Nether profond
+Deep Netherrack=Netherrack profond
+Deep Netherrack Slab=Dalle de Netherrack profonde
+Deep Netherrack Stair=Escalier de Netherrack profond
+Fumarolic Chimney=Cheminée fumarolique
+Fumarolic Chimney Corner=Coin de cheminée fumarolique
+Fumarolic Chimney Slab=Dalle de cheminée fumarolique
 Glowstone=Pierre lumineuse
-Hewn Basalt=
-Inner Deep Nether Stair=
+Hewn Basalt=Basalte taillé
+Inner Deep Nether Stair=Escalier intérieur du Nether profond
 Inner Nether Stair=Escalier intérieur du Nether
-Lava Crust=
+Lava Crust=Croûte de lave
 
-Lava crust is strong enough to walk on, but still hot enough to inflict burns.=
+Lava crust is strong enough to walk on, but still hot enough to inflict burns.=La croûte de lave est assez solide pour marcher dessus, mais encore assez chaude pour causer des brûlures
 
-Nether Basalt=
-Nether Beryl=
-Nether Berylite=
+Nether Basalt=Basalte du Nether
+Nether Beryl=Béryl du Nether
+Nether Berylite=Bérylite du Nether
 Nether Brick=Brique du Nether
 Nether Brick Fence=Barrière en briques du Nether
-Nether Brick Fence Rail=Clôture en briques du Nether
-Nether Crystal Pane=
+Nether Brick Fence Rail=Rail de barrière en briques du Nether
+Nether Crystal Pane=Panneau de cristal du Nether
 Nether Slab=Dalle du Nether
 Nether Stair=Escalier du Nether
 
-Nether geode crystal, found lining the interior walls of Nether geodes=
+Nether geode crystal, found lining the interior walls of Nether geodes=Cristal de géode du Nether, trouvé le long des parois intérieures des géodes du Nether
 
-Nether geode crystal. A crystalline structure with faint glow found inside large Nether geodes=
+Nether geode crystal. A crystalline structure with faint glow found inside large Nether geodes=Cristal de géode du Nether. Une structure cristalline avec une faible lueur trouvée à l'intérieur des grandes géodes du Nether.
 
 Netherrack=Roche du Nether
-Netherrack from deep in the mantle=
-Netherrack stair=
+Netherrack from deep in the mantle=Roche du Nether provenant des profondeurs du manteau
+Netherrack Slab=Dalle du Nether
+Netherrack Stair=Escalier du Nether
 Nethersand=Sable du Nether
-Outer Deep Nether Stair=
+Outer Deep Nether Stair=Escalier extérieur profond du Nether
 Outer Nether Stair=Escalier extérieur du Nether
-Portal=
+Portal=Portail
 
 ### portal_api.lua ###
 
@@ -100,7 +101,7 @@ In all my travels, and time spent in the Great Libraries, I have encountered no
 
 In all my travels, and time spent in the Great Libraries, I have encountered no shortage of legends surrounding preternatural doorways said to open into other worlds, yet only one can I confirm as being more than merely a story.=Après tous mes voyages, et le temps passé dans les Grandes Bibliothèques, je ne manque pas de légendes sur les portes surnaturelles qui, dit-on s’ouvrent vers d’autres mondes, mais seul une personne peut confirmer que ce sont plus que de simples histoires.
 
-Mysterious forces prevented you from opening that portal. Please try another location=
+Mysterious forces prevented you from opening that portal. Please try another location=Des forces mystérieuses vous empêchent d'ouvrir ce portail. Veuillez essayer un autre emplacement.
 
 Portal wormhole=Vortex du portail
 
@@ -125,16 +126,16 @@ There is a floating land of hills and forests up there, over the edges of which
 
 ### tools.lua ###
 
-Nether Axe=
-Nether Ingot=
-Nether Lump=
-Nether Pickaxe@nWell suited for mining netherrack=
-Nether Shovel=
-Nether Sword=
+Nether Axe=Hache du Nether
+Nether Ingot=Lingot du Nether
+Nether Lump=Morceau du Nether
+Nether Pickaxe@nWell suited for mining netherrack=Pioche du Nether@nBien adaptée pour miner la roche du Nether
+Nether Shovel=Pelle du Nether
+Nether Sword=Épée du Nether
 
-Nether staff of Eternal Light@nCreates glowstone from netherrack=
+Nether staff of Eternal Light@nCreates glowstone from netherrack=Bâton du Nether de lumière éternelle@nCrée des blocs de pierre lumineuse à partir de roche du Nether
 
-Nether staff of Light@nTemporarily transforms the netherrack into glowstone=
+Nether staff of Light@nTemporarily transforms the netherrack into glowstone=Bâton du Nether de lumière@nTransforme temporairement la roche du Nether en blocs de pierre lumineuse
 
-Uniquely suited for mining netherrack, with minimal wear when doing so. Blunts quickly on other materials.=
+Uniquely suited for mining netherrack, with minimal wear when doing so. Blunts quickly on other materials.=Convient parfaitement pour miner la roche du Nether avec une usure minimale. S'émousse rapidement sur les autres matériaux.
 

locale/template.txt

@@ -31,8 +31,8 @@ Unknown player position=
 
 ### nodes.lua ###
 
-A Deep Netherrack wall=
-A Netherrack wall=
+A Deep Netherrack Wall=
+A Netherrack Wall=
 A finely finished block of solid Nether Basalt.=
 A rough cut solid block of Nether Basalt.=
 A thin crust of cooled lava with liquid lava beneath=
@@ -49,8 +49,8 @@ Deep Nether Brick=
 Deep Nether Slab=
 Deep Nether Stair=
 Deep Netherrack=
-Deep Netherrack slab=
-Deep Netherrack stair=
+Deep Netherrack Slab=
+Deep Netherrack Stair=
 Fumarolic Chimney=
 Fumarolic Chimney Corner=
 Fumarolic Chimney Slab=
@@ -78,7 +78,8 @@ Nether geode crystal. A crystalline structure with faint glow found inside large
 
 Netherrack=
 Netherrack from deep in the mantle=
-Netherrack stair=
+Netherrack Slab=
+Netherrack Stair=
 Nethersand=
 Outer Deep Nether Stair=
 Outer Nether Stair=

mapgen.lua

@@ -171,7 +171,11 @@ mapgen.shift_existing_biomes(NETHER_FLOOR, NETHER_CEILING)
 -- Ores and decorations can be registered against "nether:rack" instead, and the lua
 -- on_generate() callback will carve the Nether with nether:rack before invoking
 -- generate_decorations and generate_ores.
-minetest.register_node("nether:native_mapgen", {})
+-- It is disguised as stone to hide any bug where it leaks out of the nether, such as
+-- https://github.com/minetest/minetest/issues/13440 or if on_generated() somehow was aborted.
+local stone_copy_def = table.copy(minetest.registered_nodes["default:stone"] or {})
+stone_copy_def.drop = stone_copy_def.drop or "default:stone" -- probably already defined as cobblestone
+minetest.register_node("nether:native_mapgen", stone_copy_def)
 
 minetest.register_biome({
 	name = "nether_caverns",

mod.conf

@@ -1,4 +1,4 @@
 name = nether
 description = Adds a deep underground realm with different mapgen that you can reach with obsidian portals.
 depends = stairs, default
-optional_depends = moreblocks, mesecons, loot, dungeon_loot, doc_basics, fire, climate_api, ethereal, xpanes, walls
+optional_depends = toolranks, moreblocks, mesecons, loot, dungeon_loot, doc_basics, fire, climate_api, ethereal, xpanes, walls

nodes.lua

@@ -383,7 +383,7 @@ stairs.register_stair(
 	"nether:rack",
 	{cracky = 2, level = 2},
 	{"nether_rack.png"},
-	S("Netherrack stair"),
+	S("Netherrack Stair"),
 	minetest.registered_nodes["nether:rack"].sounds
 )
 stairs.register_slab( -- register a slab without adding inner and outer stairs
@@ -391,7 +391,7 @@ stairs.register_slab( -- register a slab without adding inner and outer stairs
 	"nether:rack",
 	{cracky = 2, level = 2},
 	{"nether_rack.png"},
-	S("Deep Netherrack slab"),
+	S("Netherrack Slab"),
 	minetest.registered_nodes["nether:rack"].sounds
 )
 
@@ -400,7 +400,7 @@ stairs.register_stair(
 	"nether:rack_deep",
 	{cracky = 2, level = 2},
 	{"nether_rack_deep.png"},
-	S("Deep Netherrack stair"),
+	S("Deep Netherrack Stair"),
 	minetest.registered_nodes["nether:rack_deep"].sounds
 )
 stairs.register_slab( -- register a slab without adding inner and outer stairs
@@ -408,14 +408,14 @@ stairs.register_slab( -- register a slab without adding inner and outer stairs
 	"nether:rack_deep",
 	{cracky = 2, level = 2},
 	{"nether_rack_deep.png"},
-	S("Deep Netherrack slab"),
+	S("Deep Netherrack Slab"),
 	minetest.registered_nodes["nether:rack_deep"].sounds
 )
 
 -- Connecting walls
 if minetest.get_modpath("walls") and minetest.global_exists("walls") and walls.register ~= nil then
-	walls.register("nether:rack_wall",      S("A Netherrack wall"),      "nether_rack.png",      "nether:rack",      minetest.registered_nodes["nether:rack"].sounds)
-	walls.register("nether:rack_deep_wall", S("A Deep Netherrack wall"), "nether_rack_deep.png", "nether:rack_deep", minetest.registered_nodes["nether:rack_deep"].sounds)
+	walls.register("nether:rack_wall",      S("A Netherrack Wall"),      "nether_rack.png",      "nether:rack",      minetest.registered_nodes["nether:rack"].sounds)
+	walls.register("nether:rack_deep_wall", S("A Deep Netherrack Wall"), "nether_rack_deep.png", "nether:rack_deep", minetest.registered_nodes["nether:rack_deep"].sounds)
 end
 
 -- StairsPlus

portal_api.lua

@@ -2166,22 +2166,20 @@ function nether.unregister_portal(name)
 end
 
 function nether.register_portal_ignition_item(item_name, ignition_failure_sound)
-
+	local old_on_place = minetest.registered_items[item_name].on_place or minetest.item_place
 	minetest.override_item(item_name, {
-		on_place = function(stack, placer, pt)
-			local done = false
+		on_place = function(stack, placer, pt, ...)
 			if pt.under and nether.is_frame_node[minetest.get_node(pt.under).name] then
-				done = ignite_portal(pt.under, placer:get_player_name())
+				local done = ignite_portal(pt.under, placer:get_player_name())
 				if done and not minetest.settings:get_bool("creative_mode") then
 					stack:take_item()
 				end
+				if not done and ignition_failure_sound ~= nil then
+					minetest.sound_play(ignition_failure_sound, {pos = pt.under, max_hear_distance = 10})
+				end
+				return stack
 			end
-			if not done and ignition_failure_sound ~= nil then
-				minetest.sound_play(ignition_failure_sound, {pos = pt.under, max_hear_distance = 10})
-			end
-
-
-			return stack
+			return old_on_place(stack, placer, pt, ...)
 		end,
 	})
 

tools.lua

@@ -153,6 +153,38 @@ minetest.register_craft({
 })
 
 
+if minetest.get_modpath("toolranks") then
+
+	local function add_toolranks(name)
+		local nethertool_after_use = ItemStack(name):get_definition().after_use
+		toolranks.add_tool(name)
+		local toolranks_after_use  = ItemStack(name):get_definition().after_use
+
+		if nethertool_after_use == nil or nethertool_after_use == toolranks_after_use then
+			return
+		end
+
+		minetest.override_item(name, {
+			after_use = function(itemstack, user, node, digparams)
+				-- combine nethertool_after_use and toolranks_after_use by allowing
+				-- nethertool_after_use() to calculate the wear...
+				local initial_wear = itemstack:get_wear()
+				itemstack = nethertool_after_use(itemstack, user, node, digparams)
+				local wear = itemstack:get_wear() - initial_wear
+				itemstack:set_wear(initial_wear) -- restore/undo the wear
+
+				-- ...and have toolranks_after_use() apply the wear.
+				digparams.wear = wear
+				return toolranks_after_use(itemstack, user, node, digparams)
+			end
+		})
+	end
+
+	add_toolranks("nether:pick_nether")
+	add_toolranks("nether:shovel_nether")
+	add_toolranks("nether:axe_nether")
+	add_toolranks("nether:sword_nether")
+end
 
 
 --===========================--
@@ -352,10 +384,11 @@ minetest.register_tool("nether:lightstaff_eternal", {
 	sound = {breaks = "default_tool_breaks"},
 	stack_max = 1,
 	on_use = function(itemstack, user, pointed_thing)
-		if lightstaff_on_use(user, "#23F", 0) then -- was "#8088FF" or "#13F"
+		if lightstaff_on_use(user, "#23F", 0) -- was "#8088FF" or "#13F"
+		   and not minetest.is_creative_enabled(user) then
 			-- The staff of Eternal Light wears out, to limit how much
 			-- a player can alter the nether with it.
-			itemstack:add_wear(65535 / (nether.lightstaff_uses - 1))
+			itemstack:add_wear_by_uses(nether.lightstaff_uses)
 		end
 		return itemstack
 	end