From b157cd674c85a100186dd0b52e3b350935e9f71d Mon Sep 17 00:00:00 2001
From: Evert Prants <imsonotsleepy@gmail.com>
Date: Tue, 19 Jun 2018 17:21:32 +0300
Subject: [PATCH] Pipeworks support!!

---
 elepower_farming/nodes/harvester.lua          |  16 +++--
 elepower_farming/nodes/init.lua               |   1 +
 elepower_farming/nodes/planter.lua            |   2 +
 elepower_farming/nodes/tree_extractor.lua     |  57 ++++++++++++++++++
 .../elefarming_machine_tree_extractor.png     | Bin 0 -> 1601 bytes
 elepower_machines/bases/crafter.lua           |   2 +
 elepower_machines/bases/generator.lua         |   2 +
 elepower_papi/machine.lua                     |  27 +++++++++
 elepower_papi/mod.conf                        |   2 +-
 9 files changed, 102 insertions(+), 7 deletions(-)
 create mode 100644 elepower_farming/nodes/tree_extractor.lua
 create mode 100644 elepower_farming/textures/elefarming_machine_tree_extractor.png

diff --git a/elepower_farming/nodes/harvester.lua b/elepower_farming/nodes/harvester.lua
index ca8ca64..db0da87 100644
--- a/elepower_farming/nodes/harvester.lua
+++ b/elepower_farming/nodes/harvester.lua
@@ -17,19 +17,22 @@ local fdir_areas = {
 		{x = 0,  z = 4,  y = 0},
 	},
 	{ -- POS Z (2)
-		{x = -4, z = 0, y = 0},
-		{x = 4, z = 8,  y = 0},
+		{x = -4, z = 0,  y = 0},
+		{x = 4,  z = 8,  y = 0},
 	},
 	{ -- POS X (3)
-		{x = 0, z = -4, y = 0},
-		{x = 8, z = 4,  y = 0},
+		{x = 0,  z = -4, y = 0},
+		{x = 8,  z = 4,  y = 0},
 	},
 	nil, nil
 }
 
 local function harvest(pos, harvested, fdir)
-	local front     = ele.helpers.face_front(pos, fdir)
-	local ranges    = fdir_areas[fdir + 1]
+	local front  = ele.helpers.face_front(pos, fdir)
+	local ranges = fdir_areas[fdir + 1]
+
+	if not ranges then return nil end
+
 	local range_st  = vector.add(front, ranges[1])
 	local range_end = vector.add(front, ranges[2])
 
@@ -122,6 +125,7 @@ ele.register_machine("elepower_farming:harvester", {
 		ele_machine = 1,
 		ele_user = 1,
 		cracky = 1,
+		tubedevice = 1,
 	},
 	on_construct = function (pos)
 		local meta = minetest.get_meta(pos)
diff --git a/elepower_farming/nodes/init.lua b/elepower_farming/nodes/init.lua
index d31c2a6..5ead624 100644
--- a/elepower_farming/nodes/init.lua
+++ b/elepower_farming/nodes/init.lua
@@ -2,3 +2,4 @@
 dofile(elefarm.modpath.."/nodes/planter.lua")
 dofile(elefarm.modpath.."/nodes/harvester.lua")
 dofile(elefarm.modpath.."/nodes/fluids.lua")
+dofile(elefarm.modpath.."/nodes/tree_extractor.lua")
diff --git a/elepower_farming/nodes/planter.lua b/elepower_farming/nodes/planter.lua
index 327cbd5..eb40df4 100644
--- a/elepower_farming/nodes/planter.lua
+++ b/elepower_farming/nodes/planter.lua
@@ -242,6 +242,8 @@ ele.register_base_device("elepower_farming:planter", {
 		ele_machine = 1,
 		ele_user = 1,
 		cracky = 1,
+		tubedevice = 1,
+		tubedevice_receiver = 1,
 	},
 	on_construct = function (pos)
 		local meta = minetest.get_meta(pos)
diff --git a/elepower_farming/nodes/tree_extractor.lua b/elepower_farming/nodes/tree_extractor.lua
new file mode 100644
index 0000000..4a892bd
--- /dev/null
+++ b/elepower_farming/nodes/tree_extractor.lua
@@ -0,0 +1,57 @@
+
+local CAPACITY = 8000
+
+minetest.register_node("elepower_farming:tree_extractor", {
+	description = "Tree Sap Extractor",
+	groups = {fluid_container = 1, oddly_breakable_by_hand = 1, cracky = 1},
+	tiles = {
+		"elefarming_machine_base.png", "elefarming_machine_base.png", "elefarming_machine_side.png",
+		"elefarming_machine_side.png", "elefarming_machine_side.png^elepower_power_port.png", 
+		"elefarming_machine_tree_extractor.png",
+	},
+	fluid_buffers = {
+		tree_sap = {
+			capacity = CAPACITY
+		}
+	},
+	on_construct = function ( pos )
+		local meta = minetest.get_meta(pos)
+		meta:set_string("tree_sap_fluid", "elepower_farming:tree_sap_source")
+	end
+})
+
+minetest.register_abm({
+	nodenames = {"elepower_farming:tree_extractor"},
+	label = "elefluidSapAccumulator",
+	interval   = 8,
+	chance     = 1/6,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		local meta    = minetest.get_meta(pos)
+		local tree_sap_c = meta:get_int("tree_sap_fluid_storage")
+		if tree_sap_c == CAPACITY then return end
+
+		local fpos  = ele.helpers.face_front(pos, node.param2)
+		local fluid = 0
+		local fnode = minetest.get_node_or_nil(fpos)
+		if fnode and ele.helpers.get_item_group(fnode.name, "tree") then
+			fluid = fluid + 100
+		end
+
+		if fluid == 0 then
+			meta:set_string("infotext", "Place me in front of a tree!")
+			return
+		end
+
+		local give = 0
+		if tree_sap_c + fluid > CAPACITY then
+			give = CAPACITY - tree_sap_c
+		else
+			give = fluid
+		end
+
+		tree_sap_c = tree_sap_c + give
+
+		meta:set_int("tree_sap_fluid_storage", tree_sap_c)
+		meta:set_string("infotext", ("Tree Sap: %d/%d %s"):format(tree_sap_c, CAPACITY, elefluid.unit))
+	end
+})
diff --git a/elepower_farming/textures/elefarming_machine_tree_extractor.png b/elepower_farming/textures/elefarming_machine_tree_extractor.png
new file mode 100644
index 0000000000000000000000000000000000000000..dfe6f4abc7710890d0f407a0be9d5fcb009dec81
GIT binary patch
literal 1601
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

literal 0
HcmV?d00001

diff --git a/elepower_machines/bases/crafter.lua b/elepower_machines/bases/crafter.lua
index c9573d1..cc0f0fb 100644
--- a/elepower_machines/bases/crafter.lua
+++ b/elepower_machines/bases/crafter.lua
@@ -13,6 +13,8 @@ function elepm.register_crafter(nodename, nodedef)
 
 	nodedef.groups["ele_machine"] = 1
 	nodedef.groups["ele_user"]    = 1
+	nodedef.groups["tubedevice"]  = 1
+	nodedef.groups["tubedevice_receiver"] = 1
 
 	nodedef.on_timer = function (pos, elapsed)
 		local refresh = false
diff --git a/elepower_machines/bases/generator.lua b/elepower_machines/bases/generator.lua
index 6e48c80..47804d9 100644
--- a/elepower_machines/bases/generator.lua
+++ b/elepower_machines/bases/generator.lua
@@ -6,6 +6,8 @@ function elepm.register_fuel_generator(nodename, nodedef)
 
 	nodedef.groups["ele_machine"]  = 1
 	nodedef.groups["ele_provider"] = 1
+	nodedef.groups["tubedevice"]   = 1
+	nodedef.groups["tubedevice_receiver"] = 1
 
 	nodedef.on_timer = function (pos, elapsed)
 		local meta = minetest.get_meta(pos)
diff --git a/elepower_papi/machine.lua b/elepower_papi/machine.lua
index 9565273..774dc83 100644
--- a/elepower_papi/machine.lua
+++ b/elepower_papi/machine.lua
@@ -1,6 +1,8 @@
 
 -- Machine definitions
 
+local pw = minetest.get_modpath("pipeworks") ~= nil
+
 --[[
 	Groups:
 		ele_machine			Any machine that does something with power
@@ -120,6 +122,26 @@ function ele.capacity_text(capacity, storage)
 	return "Charge: " .. storage .. "/" .. capacity .. " " ..ele.unit
 end
 
+local tube = {
+	insert_object = function(pos, node, stack, direction)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		minetest.get_node_timer(pos):start(1.0)
+		return inv:add_item("src", stack)
+	end,
+	can_insert = function(pos, node, stack, direction)
+		local meta = minetest.get_meta(pos)
+		local inv = meta:get_inventory()
+		if meta:get_int("splitstacks") == 1 then
+			stack = stack:peek_item(1)
+		end
+		return inv:room_for_item("src", stack)
+	end,
+	input_inventory = "dst",
+
+	connect_sides = {left = 1, right = 1, back = 1, top = 1, bottom = 1},
+}
+
 -- Register a base device
 function ele.register_base_device(nodename, nodedef)
 	-- Override construct callback
@@ -154,6 +176,11 @@ function ele.register_base_device(nodename, nodedef)
 		nodedef.can_dig = can_dig
 	end
 
+	-- Pipeworks support
+	if pw and nodedef.groups and (nodedef.groups["tubedevice"] or nodedef.groups["tube"]) then
+		nodedef['tube'] = tube
+	end
+
 	-- Finally, register the damn thing already
 	minetest.register_node(nodename, nodedef)
 
diff --git a/elepower_papi/mod.conf b/elepower_papi/mod.conf
index 3cec765..bb99480 100644
--- a/elepower_papi/mod.conf
+++ b/elepower_papi/mod.conf
@@ -1,3 +1,3 @@
 name = elepower_papi
 description = Elepower Power Network API
-optional_depends = default
+optional_depends = default,pipeworks