Merge remote-tracking branch 'upstream/master'

This typo didn't affect the actual function of the crafting recipe
since `moreblocks:cactuschecker` is aliased to
`moreblocks:cactus_checker`.

This closes #185.

circular_saw.lua

@@ -337,6 +337,10 @@ function circular_saw.on_metadata_inventory_take(
 	local input_stack = inv:get_stack(listname,  index)
 	if not input_stack:is_empty() and input_stack:get_name()~=stack:get_name() then
 		local player_inv = player:get_inventory()
+
+		-- Prevent arbitrary item duplication.
+		inv:remove_item(listname, input_stack)
+
 		if player_inv:room_for_item("main", input_stack) then
 			player_inv:add_item("main", input_stack)
 		end
@@ -363,9 +367,15 @@ function circular_saw.on_metadata_inventory_take(
 	-- The recycle field plays no role here since it is processed immediately.
 end
 
+local has_default_mod = minetest.get_modpath("default")
+
 function circular_saw.on_construct(pos)
 	local meta = minetest.get_meta(pos)
-	local fancy_inv = default.gui_bg..default.gui_bg_img..default.gui_slots
+	local fancy_inv = ""
+	if has_default_mod then
+		-- prepend background and slot styles from default if available
+		fancy_inv = default.gui_bg..default.gui_bg_img..default.gui_slots
+	end
 	meta:set_string(
 		"formspec", "size[11,10]"..fancy_inv..
 		"label[0,0;" ..F(S("Input\nmaterial")).. "]" ..
@@ -437,7 +447,7 @@ minetest.register_node("moreblocks:circular_saw",  {
 	sunlight_propagates = true,
 	paramtype2 = "facedir",
 	groups = {choppy = 2,oddly_breakable_by_hand = 2},
-	sounds = default.node_sound_wood_defaults(),
+	sounds = moreblocks.node_sound_wood_defaults(),
 	on_construct = circular_saw.on_construct,
 	can_dig = circular_saw.can_dig,
 	-- Set the owner of this circular saw.

crafting.lua

@@ -554,7 +554,7 @@ minetest.register_craft({
 })
 
 minetest.register_craft({
-	output = "moreblocks:cactuschecker 4",
+	output = "moreblocks:cactus_checker 4",
 	recipe = {
 		{"default:stone", "default:cactus"},
 		{"default:cactus", "default:stone"},

init.lua

@@ -17,9 +17,14 @@ moreblocks.S = S
 moreblocks.NS = NS
 
 dofile(modpath .. "/config.lua")
+dofile(modpath .. "/sounds.lua")
 dofile(modpath .. "/circular_saw.lua")
 dofile(modpath .. "/stairsplus/init.lua")
-dofile(modpath .. "/nodes.lua")
-dofile(modpath .. "/redefinitions.lua")
-dofile(modpath .. "/crafting.lua")
-dofile(modpath .. "/aliases.lua")
+
+if minetest.get_modpath("default") then
+    dofile(modpath .. "/nodes.lua")
+    dofile(modpath .. "/crafting.lua")
+    dofile(modpath .. "/aliases.lua")
+end
+
+minetest.log("action", "[moreblocks] loaded.")

mod.conf

@@ -1,5 +1,4 @@
 name = moreblocks
 description = Adds various miscellaneous blocks to the game.
-depends = default
-optional_depends = intllib,stairs,farming,wool,basic_materials
+optional_depends = default,intllib,stairs,farming,wool,basic_materials
 min_minetest_version = 5.0.0

nodes.lua

@@ -7,15 +7,15 @@ Licensed under the zlib license. See LICENSE.md for more information.
 
 local S = moreblocks.S
 
-local sound_dirt = default.node_sound_dirt_defaults()
-local sound_wood = default.node_sound_wood_defaults()
-local sound_stone = default.node_sound_stone_defaults()
-local sound_glass = default.node_sound_glass_defaults()
-local sound_leaves = default.node_sound_leaves_defaults()
+local sound_dirt = moreblocks.node_sound_dirt_defaults()
+local sound_wood = moreblocks.node_sound_wood_defaults()
+local sound_stone = moreblocks.node_sound_stone_defaults()
+local sound_glass = moreblocks.node_sound_glass_defaults()
+local sound_leaves = moreblocks.node_sound_leaves_defaults()
 
 -- Don't break on 0.4.14 and earlier.
-local sound_metal = (default.node_sound_metal_defaults
-		and default.node_sound_metal_defaults() or sound_stone)
+local sound_metal = (moreblocks.node_sound_metal_defaults
+		and moreblocks.node_sound_metal_defaults() or sound_stone)
 
 local function tile_tiles(name)
 	local tex = "moreblocks_" ..name.. ".png"

redefinitions.lua

@@ -1,94 +0,0 @@
---[[
-More Blocks: redefinitions of default stuff
-
-Copyright © 2011-2020 Hugo Locurcio and contributors.
-Licensed under the zlib license. See LICENSE.md for more information.
---]]
-
-local modname = minetest.get_current_modname()
-
--- Redefine some of the default crafting recipes to be more productive
-
--- Auxiliary function: take a recipe as returned by get_all_craft_recipes
--- and turn it into a table that can be used to clear a craft or declare a new one
-local reconstruct_internal_craft = function(recipe)
-	local recp = {
-		{ "", "", "" },
-		{ "", "", "" },
-		{ "", "", "" },
-	}
-	local width = recipe.width
-	for idx, item in pairs(recipe.items) do
-		local row = math.ceil(idx / width)
-		local col = idx - (row-1)*width
-		recp[row][col] = item
-	end
-	return recp
-end
-
--- Change the amount produced by recipe by apply func to the old amount
-local change_recipe_amount = function(product, recipe, func)
-	-- if width == 0, this is a shapeless recipe, for which the
-	-- internal and Lua API recipe table is the same.
-	-- Otherwise we need to reconstruct the table for the shaped recipe.
-	local shapeless = (recipe.width == 0)
-	local recp = shapeless and recipe.items or reconstruct_internal_craft(recipe)
-
-	local oldamount = tonumber(recipe.output:match(" [0-9]+$") or "1")
-
-	local newamount = func(oldamount)
-
-	-- remove old crafting recipe
-	local redo = { recipe = recp }
-	-- preserve shapelessness
-	if shapeless then
-		redo.type = "shapeless"
-	end
-	minetest.clear_craft(redo)
-
-	-- new output
-	redo.output = ("%s %d"):format(product, newamount)
-	minetest.register_craft(redo)
-
-	minetest.log("action", ("[MOD]%s: recipe for %s production: %d => %d"):format(modname, product, oldamount, newamount))
-end
-
-local increase_craft_production = function(product, func)
-	local recipes = minetest.get_all_craft_recipes(product)
-	for _, r in pairs(recipes) do
-		if r.type == "normal" or r.method == "normal" then
-			change_recipe_amount(product, r, func)
-		end
-	end
-end
-
--- Increase the crafting production according to the rules from the table, which is in the form:
--- {
---   { detector, amount changing function }
---   { detector, amount changing function }
--- }
--- TODO: consider exporting this function to other mods
-local increase_craft_production_table = function(map_table)
-	for product, _ in pairs(minetest.registered_items) do
-		for _, tab in pairs(map_table) do
-			local detector = tab[1]
-			local func = tab[2]
-			if detector(product) then
-				increase_craft_production(product, func)
-				-- only apply one boost
-				break
-			end
-		end
-	end
-end
-
-increase_craft_production_table({
-	{ function(n) return n:match('^default:sign_wall') end, function(old) return old + 1 end },
-	{ function(n) return n == 'default:paper' end, function(old) return old*4 end },
-	{ function(n) return n:match('^carts:.*rail$') or n:match('^default:.*rail$') end, function(old) return old + old/2 end },
-})
-
-minetest.register_craft({
-	type = "toolrepair",
-	additional_wear = -0.10, -- Tool repair buff (10% bonus instead of 2%).
-})

sounds.lua

@@ -0,0 +1,20 @@
+--[[
+More Blocks: sound definitions
+
+Copyright © 2011-2021 Hugo Locurcio and contributors.
+Licensed under the zlib license. See LICENSE.md for more information.
+--]]
+
+local has_default_mod = minetest.get_modpath("default")
+for _, sound in ipairs({"dirt", "wood", "stone", "metal", "glass", "leaves"}) do
+    -- use sound-function from default if available
+    -- otherwise fall back to a no-op function (no sounds)
+    local sound_function_name = "node_sound_" .. sound .. "_defaults"
+    if has_default_mod then
+        -- use default sounds
+        moreblocks[sound_function_name] = default[sound_function_name]
+    else
+        -- no-op
+        moreblocks[sound_function_name] = function() end
+    end
+end

stairsplus/API.md

@@ -10,7 +10,7 @@
 		description = "Wooden",
 		tiles = {"default_wood.png"},
 		groups = {oddly_breakabe_by_hand=1},
-		sounds = default.node_sound_wood_defaults(),
+		sounds = moreblocks.node_sound_wood_defaults(),
 	})
 	```
 The following register only a particular type of microblock.

stairsplus/common.lua

@@ -49,6 +49,8 @@ stairsplus.rotate_node_aux = function(itemstack, placer, pointed_thing)
 	local under = pointed_thing.under
 	local under_node = minetest.get_node(under)
 	local under_prefix = under_node and name_to_category(under_node.name)
+	-- NALC Addition to avoid coloredwood/unifiedbricks crash by Sys4
+	local under_pmod = string.sub(under_node.name, 1, (string.find(under_node.name, ":") or 0)-1)
 
 	local same_cat = item_prefix == under_prefix
 
@@ -65,7 +67,8 @@ stairsplus.rotate_node_aux = function(itemstack, placer, pointed_thing)
 	-- under node has a non-standard shape, so use the distance between under and above
 	local wallmounted = minetest.dir_to_wallmounted(vector.subtract(pointed_thing.above, under))
 
-	if same_cat and not aux then
+	if same_cat and (under_pmod ~= "coloredwood" and under_pmod ~= "unifiedbricks")
+	and not aux then
 		p2 = under_node.param2
 		-- flip if placing above or below an upright or upside-down node
 		-- TODO should we also flip when placing next to a side-mounted node?

stairsplus/custom.lua

@@ -69,7 +69,7 @@ local function register_custom_subset(subset, modname, subname, recipeitem, grou
 		description = description,
 		drop = drop,
 		light_source = light,
-		sounds = default.node_sound_stone_defaults(),
+		sounds = moreblocks.node_sound_stone_defaults(),
 	})
 end
 

stairsplus/microblocks.lua

@@ -15,7 +15,7 @@ local function register_micro(modname, subname, recipeitem, groups, images, desc
 		description = description,
 		drop = drop,
 		light_source = light,
-		sounds = default.node_sound_stone_defaults(),
+		sounds = moreblocks.node_sound_stone_defaults(),
 	})
 end
 

stairsplus/panels.lua

@@ -15,7 +15,7 @@ local function register_panel(modname, subname, recipeitem, groups, images, desc
 		description = description,
 		drop = drop,
 		light_source = light,
-		sounds = default.node_sound_stone_defaults(),
+		sounds = moreblocks.node_sound_stone_defaults(),
 	})
 end
 

stairsplus/registrations.lua

@@ -6,75 +6,77 @@ Licensed under the zlib license. See LICENSE.md for more information.
 --]]
 
 -- default registrations
-local default_nodes = { -- Default stairs/slabs/panels/microblocks:
-	"stone",
-	"stone_block",
-	"cobble",
-	"mossycobble",
-	"brick",
-	"sandstone",
-	"steelblock",
-	"goldblock",
-	"copperblock",
-	"bronzeblock",
-	"diamondblock",
-	"tinblock",
-	"desert_stone",
-	"desert_stone_block",
-	"desert_cobble",
-	"meselamp",
-	"glass",
-	"tree",
-	"wood",
-	"jungletree",
-	"junglewood",
-	"pine_tree",
-	"pine_wood",
-	"acacia_tree",
-	"acacia_wood",
-	"aspen_tree",
-	"aspen_wood",
-	"obsidian",
-	"obsidian_block",
-	"obsidianbrick",
-	"obsidian_glass",
-	"stonebrick",
-	"desert_stonebrick",
-	"sandstonebrick",
-	"silver_sandstone",
-	"silver_sandstone_brick",
-	"silver_sandstone_block",
-	"desert_sandstone",
-	"desert_sandstone_brick",
-	"desert_sandstone_block",
-	"sandstone_block",
-	"coral_skeleton",
-	"ice",
-}
+if minetest.get_modpath("default") then
+	local default_nodes = { -- Default stairs/slabs/panels/microblocks:
+		"stone",
+		"stone_block",
+		"cobble",
+		"mossycobble",
+		"brick",
+		"sandstone",
+		"steelblock",
+		"goldblock",
+		"copperblock",
+		"bronzeblock",
+		"diamondblock",
+		"tinblock",
+		"desert_stone",
+		"desert_stone_block",
+		"desert_cobble",
+		"meselamp",
+		"glass",
+		"tree",
+		"wood",
+		"jungletree",
+		"junglewood",
+		"pine_tree",
+		"pine_wood",
+		"acacia_tree",
+		"acacia_wood",
+		"aspen_tree",
+		"aspen_wood",
+		"obsidian",
+		"obsidian_block",
+		"obsidianbrick",
+		"obsidian_glass",
+		"stonebrick",
+		"desert_stonebrick",
+		"sandstonebrick",
+		"silver_sandstone",
+		"silver_sandstone_brick",
+		"silver_sandstone_block",
+		"desert_sandstone",
+		"desert_sandstone_brick",
+		"desert_sandstone_block",
+		"sandstone_block",
+		"coral_skeleton",
+		"ice",
+	}
 
-for _, name in pairs(default_nodes) do
-	local mod = "default"
-	local nodename = mod .. ":" .. name
-	local ndef = table.copy(minetest.registered_nodes[nodename])
-	ndef.sunlight_propagates = true
+	for _, name in pairs(default_nodes) do
+		local mod = "default"
+		local nodename = mod .. ":" .. name
+		local ndef = table.copy(minetest.registered_nodes[nodename])
+		ndef.sunlight_propagates = true
 
-	-- Stone and desert_stone drop cobble and desert_cobble respectively.
-	if type(ndef.drop) == "string" then
-		ndef.drop = ndef.drop:gsub(".+:", "")
+		-- Stone and desert_stone drop cobble and desert_cobble respectively.
+		if type(ndef.drop) == "string" then
+			ndef.drop = ndef.drop:gsub(".+:", "")
+		end
+
+		-- Use the primary tile for all sides of cut glasslike nodes and disregard paramtype2.
+		if #ndef.tiles > 1 and ndef.drawtype and ndef.drawtype:find("glass") then
+			ndef.tiles = {ndef.tiles[1]}
+			ndef.paramtype2 = nil
+		end
+
+		mod = "moreblocks"
+		stairsplus:register_all(mod, name, nodename, ndef)
+		minetest.register_alias_force("stairs:stair_" .. name, mod .. ":stair_" .. name)
+		minetest.register_alias_force("stairs:stair_outer_" .. name, mod .. ":stair_" .. name .. "_outer")
+		minetest.register_alias_force("stairs:stair_inner_" .. name, mod .. ":stair_" .. name .. "_inner")
+		minetest.register_alias_force("stairs:slab_"  .. name, mod .. ":slab_"  .. name)
 	end
-
-	-- Use the primary tile for all sides of cut glasslike nodes and disregard paramtype2.
-	if #ndef.tiles > 1 and ndef.drawtype and ndef.drawtype:find("glass") then
-		ndef.tiles = {ndef.tiles[1]}
-		ndef.paramtype2 = nil
-	end
-
-	mod = "moreblocks"
-	stairsplus:register_all(mod, name, nodename, ndef)
-	minetest.register_alias_force("stairs:stair_" .. name, mod .. ":stair_" .. name)
-	minetest.register_alias_force("stairs:stair_outer_" .. name, mod .. ":stair_" .. name .. "_outer")
-	minetest.register_alias_force("stairs:stair_inner_" .. name, mod .. ":stair_" .. name .. "_inner")
-	minetest.register_alias_force("stairs:slab_"  .. name, mod .. ":slab_"  .. name)
 end
 
 -- farming registrations
@@ -118,7 +120,7 @@ if minetest.get_modpath("basic_materials") then
 		description = "Concrete",
 		tiles = {"basic_materials_concrete_block.png",},
 		groups = {cracky=1, level=2, concrete=1},
-		sounds = default.node_sound_stone_defaults(),
+		sounds = moreblocks.node_sound_stone_defaults(),
 	})
 
 	minetest.register_alias("prefab:concrete_stair","technic:stair_concrete")
@@ -128,7 +130,7 @@ if minetest.get_modpath("basic_materials") then
 		description = "Cement",
 		tiles = {"basic_materials_cement_block.png"},
 		groups = {cracky=2, not_in_creative_inventory=1},
-		sounds = default.node_sound_stone_defaults(),
+		sounds = moreblocks.node_sound_stone_defaults(),
 		sunlight_propagates = true,
 	})
 

stairsplus/slabs.lua

@@ -15,7 +15,7 @@ local function register_slab(modname, subname, recipeitem, groups, images, descr
 		description = description,
 		drop = drop,
 		light_source = light,
-		sounds = default.node_sound_stone_defaults(),
+		sounds = moreblocks.node_sound_stone_defaults(),
 	})
 end
 

stairsplus/slopes.lua

@@ -15,7 +15,7 @@ local function register_slope(modname, subname, recipeitem, groups, images, desc
 		description = description,
 		drop = drop,
 		light_source = light,
-		sounds = default.node_sound_stone_defaults(),
+		sounds = moreblocks.node_sound_stone_defaults(),
 	})
 end
 

stairsplus/stairs.lua

@@ -15,7 +15,7 @@ local function register_stair(modname, subname, recipeitem, groups, images, desc
 		description = description,
 		drop = drop,
 		light_source = light,
-		sounds = default.node_sound_stone_defaults(),
+		sounds = moreblocks.node_sound_stone_defaults(),
 	})
 end