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,7 +27,6 @@ read_globals = {
 	"stairsplus",
 	"string.split",
 	table = { fields = { "copy", "getn" } },
-	"technic",
 	"toolranks",
 	"vector",
 	"VoxelArea",

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
@@ -144,9 +144,7 @@ if nether.NETHER_REALM_ENABLED then
 	end
 end
 dofile(nether.path .. "/portal_examples.lua")
-if minetest.get_modpath("technic") then
-	dofile(nether.path .. "/nether-compressor-recipe.lua")
-end
+
 
 -- Portals are ignited by right-clicking with a mese crystal fragment
 nether.register_portal_ignition_item(

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 = toolranks, technic, 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

nether-compressor-recipe.lua

@@ -1,40 +0,0 @@
-local S = minetest.get_translator("nether")
-
-technic.register_recipe_type("compressing", { description = S("Compressing") })
-
-function register_compressor_recipe(data)
-	data.time = data.time or 4
-	technic.register_recipe("compressing", data)
-end
-
-local recipes = {
-	{"nether:rack",                    "nether:brick",},
-	{"nether:rack_deep",               "nether:brick_deep"},
-	{"nether:brick 9",                 "nether:brick_compressed", 12},
-	{"nether:brick_compressed 9",      "nether:nether_lump", 12}
-
-}
--- clear craft recipe
--- But allow brick blocks to be crafted like the other bricks from Minetest Game
-
-minetest.clear_craft({
-	recipe = {
-		{"nether:brick","nether:brick","nether:brick"},
-		{"nether:brick","nether:brick","nether:brick"},
-		{"nether:brick","nether:brick","nether:brick"},
-	}
-})
-
-minetest.clear_craft({
-	recipe = {
-		{"nether:brick_compressed","nether:brick_compressed","nether:brick_compressed"},
-		{"nether:brick_compressed","nether:brick_compressed","nether:brick_compressed"},
-		{"nether:brick_compressed","nether:brick_compressed","nether:brick_compressed"},
-	}
-})
-
-for _, data in pairs(recipes) do
-	register_compressor_recipe({input = {data[1]}, output = data[2], time = data[3]})
-end
-
-

tools.lua

@@ -384,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