From 6771ad9d3329bba44e35b79816ba69f639d52466 Mon Sep 17 00:00:00 2001
From: Zefram <zefram@fysh.org>
Date: Sun, 20 Jul 2014 23:14:14 +0100
Subject: [PATCH] Genericise can logic

Factor out the logic common to water and lava cans.  Provide it in the
form of a technic.register_can() function, which can be called by other
mods to register cans for other liquids.
---
 technic/tools/cans.lua | 205 +++++++++++++++++------------------------
 1 file changed, 84 insertions(+), 121 deletions(-)

diff --git a/technic/tools/cans.lua b/technic/tools/cans.lua
index f1a821b..f46a401 100644
--- a/technic/tools/cans.lua
+++ b/technic/tools/cans.lua
@@ -1,26 +1,5 @@
-local water_can_max_load = 16
-local lava_can_max_load = 8
-
 local S = technic.getter
 
-minetest.register_craft({
-	output = 'technic:water_can 1',
-	recipe = {
-		{'technic:zinc_ingot', 'technic:rubber','technic:zinc_ingot'},
-		{'technic:carbon_steel_ingot', '', 'technic:carbon_steel_ingot'},
-		{'technic:zinc_ingot', 'technic:carbon_steel_ingot', 'technic:zinc_ingot'},
-	}
-})
-
-minetest.register_craft({
-	output = 'technic:lava_can 1',
-	recipe = {
-		{'technic:zinc_ingot', 'technic:stainless_steel_ingot','technic:zinc_ingot'},
-		{'technic:stainless_steel_ingot', '', 'technic:stainless_steel_ingot'},
-		{'technic:zinc_ingot', 'technic:stainless_steel_ingot', 'technic:zinc_ingot'},
-	}
-})
-
 local function set_can_wear(itemstack, level, max_level)
 	local temp
 	if level == 0 then
@@ -33,113 +12,97 @@ local function set_can_wear(itemstack, level, max_level)
 	itemstack:set_wear(temp)
 end
 
-minetest.register_tool("technic:water_can", {
-	description = S("Water Can"),
-	inventory_image = "technic_water_can.png",
-	stack_max = 1,
-	wear_represents = "content_level",
-	liquids_pointable = true,
-	on_use = function(itemstack, user, pointed_thing)
-		if pointed_thing.type ~= "node" then
-			return
-		end
-		node = minetest.get_node(pointed_thing.under)
+function technic.register_can(d)
+	local data = {}
+	for k, v in pairs(d) do data[k] = v end
+	minetest.register_tool(data.can_name, {
+		description = data.can_description,
+		inventory_image = data.can_inventory_image,
+		stack_max = 1,
+		wear_represents = "content_level",
+		liquids_pointable = true,
+		on_use = function(itemstack, user, pointed_thing)
+			if pointed_thing.type ~= "node" then
+				return
+			end
+			node = minetest.get_node(pointed_thing.under)
+
+			local charge = nil
+			if itemstack:get_metadata() == "" then
+				charge = 0
+			else
+				charge = tonumber(itemstack:get_metadata())
+			end
+			if node.name == data.liquid_source_name then
+				if charge < data.can_capacity then
+					minetest.remove_node(pointed_thing.under)
+					charge = charge + 1
+					itemstack:set_metadata(tostring(charge))
+					set_can_wear(itemstack, charge, data.can_capacity)
+				end
+				return itemstack
+			end
+			if charge == 0 then
+				return
+			end
 
-		local charge = nil
-		if itemstack:get_metadata() == "" then
-			charge = 0
-		else
-			charge = tonumber(itemstack:get_metadata())
-		end
-		if node.name == "default:water_source" then
-			if charge < water_can_max_load then
-				minetest.remove_node(pointed_thing.under)
-				charge = charge + 1
+			if node.name == data.liquid_flowing_name then
+				minetest.set_node(pointed_thing.under, {name=data.liquid_source_name})
+				charge = charge - 1
 				itemstack:set_metadata(tostring(charge))
-				set_can_wear(itemstack, charge, water_can_max_load)
+				set_can_wear(itemstack, charge, data.can_capacity)
+				return itemstack
 			end
-			return itemstack
-		end
-		if charge == 0 then
-			return
-		end
 
-		if node.name == "default:water_flowing" then
-			minetest.set_node(pointed_thing.under, {name="default:water_source"})
-			charge = charge - 1
-			itemstack:set_metadata(tostring(charge))
-			set_can_wear(itemstack, charge, water_can_max_load)
-			return itemstack
-		end
+			node = minetest.get_node(pointed_thing.above)
+			if node.name == "air" then
+				minetest.set_node(pointed_thing.above, {name=data.liquid_source_name})
+				charge = charge - 1
+				itemstack:set_metadata(tostring(charge))
+				set_can_wear(itemstack, charge, data.can_capacity)
+				return itemstack
+			end		
+		end,
+		on_refill = function(stack)
+			stack:set_metadata(tostring(data.can_capacity))
+			set_can_wear(stack, data.can_capacity, data.can_capacity)
+			return stack
+		end,
+	})
+end
 
-		node = minetest.get_node(pointed_thing.above)
-		if node.name == "air" then
-			minetest.set_node(pointed_thing.above, {name="default:water_source"})
-			charge = charge - 1;
-			itemstack:set_metadata(tostring(charge))
-			set_can_wear(itemstack, charge, water_can_max_load)
-			return itemstack
-		end		
-	end,
-	on_refill = function(stack)
-		stack:set_metadata(tostring(water_can_max_load))
-		set_can_wear(stack, water_can_max_load, water_can_max_load)
-		return stack
-	end,
+technic.register_can({
+	can_name = "technic:water_can",
+	can_description = S("Water Can"),
+	can_inventory_image = "technic_water_can.png",
+	can_capacity = 16,
+	liquid_source_name = "default:water_source",
+	liquid_flowing_name = "default:water_flowing",
 })
 
-minetest.register_tool("technic:lava_can", {
-	description = S("Lava Can"),
-	inventory_image = "technic_lava_can.png",
-	stack_max = 1,
-	wear_represents = "content_level",
-	liquids_pointable = true,
-	on_use = function(itemstack, user, pointed_thing)
-		if pointed_thing.type ~= "node" then
-			return
-		end
-		node = minetest.get_node(pointed_thing.under)
-		local charge = 0
-		if itemstack:get_metadata() == "" then
-			charge = 0
-		else
-			charge = tonumber(itemstack:get_metadata())
-		end
-
-		if node.name == "default:lava_source" then
-			if charge < lava_can_max_load then
-				minetest.remove_node(pointed_thing.under)
-				charge = charge + 1
-				itemstack:set_metadata(tostring(charge))
-				set_can_wear(itemstack, charge, lava_can_max_load)
-			end
-			return itemstack
-		end
-		if charge == 0 then
-			return
-		end
-
-		if node.name == "default:lava_flowing" then
-			minetest.set_node(pointed_thing.under, {name="default:lava_source"})
-			charge = charge - 1	
-			itemstack:set_metadata(tostring(charge))
-			set_can_wear(itemstack, charge, lava_can_max_load)
-			return itemstack
-		end
+minetest.register_craft({
+	output = 'technic:water_can 1',
+	recipe = {
+		{'technic:zinc_ingot', 'technic:rubber','technic:zinc_ingot'},
+		{'technic:carbon_steel_ingot', '', 'technic:carbon_steel_ingot'},
+		{'technic:zinc_ingot', 'technic:carbon_steel_ingot', 'technic:zinc_ingot'},
+	}
+})
 
-		node = minetest.get_node(pointed_thing.above)
-		if node.name == "air" then
-			minetest.set_node(pointed_thing.above, {name="default:lava_source"})
-			charge = charge - 1
-			itemstack:set_metadata(tostring(charge))
-			set_can_wear(itemstack, charge, lava_can_max_load)
-			return itemstack
-		end
-	end,
-	on_refill = function(stack)
-		stack:set_metadata(tostring(lava_can_max_load))
-		set_can_wear(stack, lava_can_max_load, lava_can_max_load)
-		return stack
-	end,
+technic.register_can({
+	can_name = "technic:lava_can",
+	can_description = S("Lava Can"),
+	can_inventory_image = "technic_lava_can.png",
+	can_capacity = 8,
+	liquid_source_name = "default:lava_source",
+	liquid_flowing_name = "default:lava_flowing",
 })
 
+minetest.register_craft({
+	output = 'technic:lava_can 1',
+	recipe = {
+		{'technic:zinc_ingot', 'technic:stainless_steel_ingot','technic:zinc_ingot'},
+		{'technic:stainless_steel_ingot', '', 'technic:stainless_steel_ingot'},
+		{'technic:zinc_ingot', 'technic:stainless_steel_ingot', 'technic:zinc_ingot'},
+	}
+})
-- 
2.30.2