Merge remote-tracking branch 'upstream/master'

.luacheckrc

@@ -31,5 +31,4 @@ read_globals = {
 	"HasOwner",
 	"getLastOwner",
 	"GetNodeOwnerName",
-	"place_rotated",
 }

circular_saw.lua

@@ -20,9 +20,6 @@ circular_saw.known_stairs = setmetatable({}, {
 -- This is populated by stairsplus:register_all:
 circular_saw.known_nodes = {}
 
--- This is populated by stairsplus:register_micro:
-circular_saw.microblocks = {}
-
 -- How many microblocks does this shape at the output inventory cost:
 -- It may cause slight loss, but no gain.
 circular_saw.cost_in_microblocks = {
@@ -140,13 +137,10 @@ function circular_saw:reset(pos)
 
 	inv:set_list("input",  {})
 	inv:set_list("micro",  {})
+	inv:set_list("output", {})
 
-	local microblockcount = inv:get_stack("micro",1):get_count()
-	meta:set_int("anz", microblockcount)
-	if microblockcount == 0 then
-		meta:set_string("infotext", S("Circular Saw is empty") .. owned_by)
-		inv:set_list("output", {})
-	end
+	meta:set_int("anz", 0)
+	meta:set_string("infotext", S("Circular Saw is empty") .. owned_by)
 end
 
 
@@ -167,21 +161,19 @@ function circular_saw:update_inventory(pos, amount)
 	end
 
 	local stack = inv:get_stack("input",  1)
-	local microstack = inv:get_stack("micro",1)
-
-	-- At least one (micro)block is necessary to see what kind of stairs are requested.
-	if stack:is_empty() and microstack:is_empty() then
-
+	-- At least one "normal" block is necessary to see what kind of stairs are requested.
+	if stack:is_empty() then
+		-- Any microblocks not taken out yet are now lost.
+		-- (covers material loss in the machine)
 		self:reset(pos)
 		return
 
 	end
-
-	local node_name = circular_saw.microblocks[microstack:get_name()] or stack:get_name() or ""
+	local node_name = stack:get_name() or ""
 	local node_def = stack:get_definition()
 	local name_parts = circular_saw.known_nodes[node_name] or ""
-	local modname  = name_parts[1]
-	local material = name_parts[2]
+	local modname  = name_parts[1] or ""
+	local material = name_parts[2] or ""
 	local owned_by = meta:get_string("owner")
 
 	if owned_by and owned_by ~= "" then
@@ -205,7 +197,6 @@ function circular_saw:update_inventory(pos, amount)
 	inv:set_list("micro", {
 		modname .. ":micro_" .. material .. " " .. (amount % 8)
 	})
-
 	-- Display:
 	inv:set_list("output",
 		self:get_output_inv(modname, material, amount,
@@ -242,11 +233,11 @@ function circular_saw.allow_metadata_inventory_move(
 end
 
 
--- Only input- and recycle-slot (and microblock slot when empty) are intended as input slots:
+-- Only input- and recycle-slot are intended as input slots:
 function circular_saw.allow_metadata_inventory_put(
 		pos, listname, index, stack, player)
 	-- The player is not allowed to put something in there:
-	if listname == "output" then
+	if listname == "output" or listname == "micro" then
 		return 0
 	end
 
@@ -294,16 +285,6 @@ function circular_saw.allow_metadata_inventory_put(
 		end
 		return 0
 	end
-
-	if listname == "micro" then
-		if not (inv:is_empty("input") and inv:is_empty("micro")) then return 0 end
-		for name, t in pairs(circular_saw.microblocks) do
-			if name == stackname and inv:room_for_item("input", stack) then
-				return count
-			end
-		end
-		return 0
-	end
 end
 
 -- Taking is allowed from all slots (even the internal microblock slot).
@@ -323,8 +304,6 @@ function circular_saw.on_metadata_inventory_put(
 	if listname == "input" then
 		-- Each new block is worth 8 microblocks:
 		circular_saw:update_inventory(pos, 8 * count)
-	elseif listname == "micro" then
-		circular_saw:update_inventory(pos, count)
 	elseif listname == "recycle" then
 		-- Lets look which shape this represents:
 		local cost = circular_saw:get_cost(inv, stackname)
@@ -375,6 +354,7 @@ function circular_saw.on_metadata_inventory_take(
 		-- We do know how much each block at each position costs:
 		local cost = circular_saw.cost_in_microblocks[index]
 				* stack:get_count()
+
 		circular_saw:update_inventory(pos, -cost)
 	elseif listname == "micro" then
 		-- Each microblock costs 1 microblock:

init.lua

@@ -21,7 +21,8 @@ dofile(modpath .. "/stairsplus/init.lua")
 
 if minetest.get_modpath("default") then
     dofile(modpath .. "/nodes.lua")
-    dofile(modpath .. "/redefinitions.lua")
     dofile(modpath .. "/crafting.lua")
     dofile(modpath .. "/aliases.lua")
 end
+
+minetest.log("action", "[moreblocks] loaded.")

mod.conf

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

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%).
-})

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?
@@ -146,14 +149,11 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam
 
 	-- Darken light sources slightly to make up for their smaller visual size
 	def.light_source = math.max(0, (def.light_source or 0) - 1)
+
+	def.on_place = stairsplus.rotate_node_aux
 	def.groups = stairsplus:prepare_groups(fields.groups)
 
 	if category == "slab" then
-		if minetest.global_exists("place_rotated") then
-			def.on_place = place_rotated.slab
-		else
-			def.on_place = stairsplus.rotate_node_aux
-		end
 		if type(info) ~= "table" then
 			def.node_box = {
 				type = "fixed",
@@ -168,7 +168,6 @@ stairsplus.register_single = function(category, alternate, info, modname, subnam
 			def.description = desc_base .. alternate:gsub("_", " "):gsub("(%a)(%S*)", function(a, b) return a:upper() .. b end)
 		end
 	else
-		def.on_place = stairsplus.rotate_node_aux
 		def.description = desc_base
 		if category == "slope" then
 			def.drawtype = "mesh"

stairsplus/custom.lua

@@ -94,5 +94,4 @@ function stairsplus:register_custom_subset(subset, modname, subname, recipeitem,
 	end
 
 	circular_saw.known_nodes[recipeitem] = {modname, subname}
-	circular_saw.microblocks[modname.. ":micro_" .. subname] = recipeitem
 end

stairsplus/microblocks.lua

@@ -40,5 +40,4 @@ function stairsplus:register_micro(modname, subname, recipeitem, fields)
 	end
 
 	circular_saw.known_nodes[recipeitem] = {modname, subname}
-	circular_saw.microblocks[modname.. ":micro_" .. subname] = recipeitem
 end