From: JP Guerrero <jeanpatrick.guerrero@gmail.com>
Date: Thu, 1 Dec 2016 11:58:10 +0000 (+0100)
Subject: Workbench: add more registration filters
X-Git-Tag: 1.0~22
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=fa15d1b7f52b7740b0075564e118267f2010fc69;p=xdecor.git

Workbench: add more registration filters
---

diff --git a/src/workbench.lua b/src/workbench.lua
index 29f12b9..1e89c3c 100644
--- a/src/workbench.lua
+++ b/src/workbench.lua
@@ -1,5 +1,6 @@
 local workbench = {}
 screwdriver = screwdriver or {}
+local min, ceil = math.min, math.ceil
 
 -- Nodes allowed to be cut.
 -- Only the regular, solid blocks without metas or explosivity can be cut.
@@ -14,7 +15,8 @@ for node, def in pairs(minetest.registered_nodes) do
 	   not def.allow_metadata_inventory_take and
 	   not (def.groups.not_in_creative_inventory == 1) and
 	   not def.groups.wool and
-	   not def.description:find("Ore") and
+	   not def.tiles[1]:find("default_mineral") and
+	   not def.mesecons and
 	   def.description and
 	   def.description ~= "" and
 	   def.light_source == 0
@@ -30,8 +32,8 @@ workbench.custom_nodes_register = {
 
 setmetatable(nodes, {
 	__concat = function(t1, t2)
-		for k in pairs(t2) do
-			t1[#t1+1] = t2[k]
+		for i=1, #t2 do
+			t1[#t1+1] = t2[i]
 		end
 		return t1
 	end
@@ -78,7 +80,7 @@ function workbench:get_output(inv, input, name)
 
 	local output = {}
 	for _, n in pairs(self.defs) do
-		local count = math.min(n[2] * input:get_count(), input:get_stack_max())
+		local count = min(n[2] * input:get_count(), input:get_stack_max())
 		local item = name.."_"..n[1]
 		if not n[3] then item = "stairs:"..n[1].."_"..name:match(":(.*)") end
 		output[#output+1] = item.." "..count
@@ -214,7 +216,7 @@ function workbench.on_take(pos, listname, index, stack)
 			inv:set_list("forms", {})
 		end
 	elseif listname == "forms" then
-		input:take_item(math.ceil(stack:get_count() / workbench.defs[index][2]))
+		input:take_item(ceil(stack:get_count() / workbench.defs[index][2]))
 		inv:set_stack("input", 1, input)
 		workbench:get_output(inv, input, input:get_name())
 	end