From 8bf9903476d8e82d3c8f13ba784216ae0b2504a3 Mon Sep 17 00:00:00 2001
From: Evert Prants <imsonotsleepy@gmail.com>
Date: Wed, 12 Dec 2018 21:06:41 +0200
Subject: [PATCH] moved all fluid transfer stuff to fluid_lib

---
 elepower_dynamics/conduits.lua                |  23 ---
 elepower_dynamics/crafting.lua                |  13 +-
 elepower_dynamics/craftitems.lua              |   3 +
 elepower_dynamics/depends.txt                 |   1 -
 elepower_dynamics/mod.conf                    |   2 +-
 .../models/elepower_transport_node.obj        | 185 ------------------
 elepower_dynamics/textures/elepower_duct.png  | Bin 5386 -> 0 bytes
 .../textures/elepower_fluid_transporter.png   | Bin 5264 -> 0 bytes
 .../elepower_fluid_transporter_back.png       | Bin 489 -> 0 bytes
 .../elepower_fluid_transporter_front.png      | Bin 474 -> 0 bytes
 .../elepower_fluid_transporter_side.png       | Bin 519 -> 0 bytes
 elepower_farming/depends.txt                  |   1 -
 elepower_farming/mod.conf                     |   2 +-
 elepower_nuclear/machines/fission_reactor.lua |   4 +-
 elepower_papi/formspec.lua                    |  25 +++
 15 files changed, 34 insertions(+), 225 deletions(-)
 delete mode 100644 elepower_dynamics/models/elepower_transport_node.obj
 delete mode 100644 elepower_dynamics/textures/elepower_duct.png
 delete mode 100644 elepower_dynamics/textures/elepower_fluid_transporter.png
 delete mode 100644 elepower_dynamics/textures/elepower_fluid_transporter_back.png
 delete mode 100644 elepower_dynamics/textures/elepower_fluid_transporter_front.png
 delete mode 100644 elepower_dynamics/textures/elepower_fluid_transporter_side.png

diff --git a/elepower_dynamics/conduits.lua b/elepower_dynamics/conduits.lua
index 2eb46b5..f789569 100644
--- a/elepower_dynamics/conduits.lua
+++ b/elepower_dynamics/conduits.lua
@@ -5,26 +5,3 @@ ele.register_conduit("elepower_dynamics:conduit", {
 	tiles = {"elepower_conduit.png"},
 	groups = {oddly_breakable_by_hand = 1, cracky = 1}
 })
-
--- Fluids
-elefluid.register_transfer_node("elepower_dynamics:fluid_transfer_node", {
-	description = "Fluid Transfer Node\nPunch to start pumping",
-	tiles = {"elepower_fluid_transporter.png"},
-	drawtype = "mesh",
-	mesh = "elepower_transport_node.obj",
-	groups = {oddly_breakable_by_hand = 1, cracky = 1},
-	paramtype = "light",
-	selection_box = {
-		type = "fixed",
-		fixed = {
-			{-0.4375, -0.4375, -0.5000, 0.4375, 0.4375, 0.000},
-			{-0.1875, -0.1875, 0.000, 0.1875, 0.1875, 0.5000}
-		}
-	}
-})
-
-elefluid.register_transfer_duct("elepower_dynamics:fluid_duct", {
-	description = "Fluid Duct",
-	tiles = {"elepower_duct.png"},
-	groups = {oddly_breakable_by_hand = 1, cracky = 1}
-})
diff --git a/elepower_dynamics/crafting.lua b/elepower_dynamics/crafting.lua
index 5f3a972..b0fca91 100644
--- a/elepower_dynamics/crafting.lua
+++ b/elepower_dynamics/crafting.lua
@@ -125,16 +125,6 @@ minetest.register_craft({
 	}
 })
 
--- Duct
-minetest.register_craft({
-	output = "elepower_dynamics:fluid_duct 8",
-	recipe = {
-		{"default:glass",  "default:glass",  "default:glass"},
-		{"elepower_dynamics:lead_ingot", "elepower_dynamics:lead_ingot", "elepower_dynamics:lead_ingot"},
-		{"default:glass",  "default:glass",  "default:glass"},
-	}
-})
-
 -- Portable Tank
 minetest.register_craft({
 	output = "elepower_dynamics:portable_tank",
@@ -223,8 +213,9 @@ minetest.register_craft({
 })
 
 -- Fluid Transfer Node
+minetest.clear_craft({output = "fluid_transfer:fluid_transfer_pump"})
 minetest.register_craft({
-	output = "elepower_dynamics:fluid_transfer_node 3",
+	output = "fluid_transfer:fluid_transfer_pump 3",
 	recipe = {
 		{"group:stone",  "elepower_dynamics:control_circuit",  "group:stone"},
 		{"elepower_dynamics:electrum_gear", "elepower_dynamics:servo_valve", "elepower_dynamics:electrum_gear"},
diff --git a/elepower_dynamics/craftitems.lua b/elepower_dynamics/craftitems.lua
index 1abb547..a607607 100644
--- a/elepower_dynamics/craftitems.lua
+++ b/elepower_dynamics/craftitems.lua
@@ -253,3 +253,6 @@ minetest.register_craftitem("elepower_dynamics:pv_cell", {
 ---------------
 -- Overrides --
 ---------------
+
+minetest.register_alias("elepower_dynamics:fluid_transfer_node", "fluid_transfer:fluid_transfer_pump")
+minetest.register_alias("elepower_dynamics:fluid_duct", "fluid_transfer:fluid_duct")
diff --git a/elepower_dynamics/depends.txt b/elepower_dynamics/depends.txt
index e1bfefc..ada10ea 100644
--- a/elepower_dynamics/depends.txt
+++ b/elepower_dynamics/depends.txt
@@ -1,5 +1,4 @@
 elepower_papi
-elepower_fapi
 default
 fluid_tanks
 dye?
diff --git a/elepower_dynamics/mod.conf b/elepower_dynamics/mod.conf
index be50925..3c36625 100644
--- a/elepower_dynamics/mod.conf
+++ b/elepower_dynamics/mod.conf
@@ -1,4 +1,4 @@
 name = elepower_dynamics
 description = Elepower Dynamics. Conduits and materials!
-depends = elepower_papi,elepower_fapi,default,fluid_tanks
+depends = elepower_papi,default,fluid_tanks
 optional_depends = moreores,basic_materials,dye
diff --git a/elepower_dynamics/models/elepower_transport_node.obj b/elepower_dynamics/models/elepower_transport_node.obj
deleted file mode 100644
index c328332..0000000
--- a/elepower_dynamics/models/elepower_transport_node.obj
+++ /dev/null
@@ -1,185 +0,0 @@
-o Node
-v 0.400000 0.400000 -0.370263
-v 0.400000 0.400000 -0.497499
-v -0.400000 0.400000 -0.497499
-v -0.400000 0.400000 -0.370263
-v 0.400000 -0.400000 -0.370263
-v 0.400000 -0.400000 -0.497499
-v -0.400000 -0.400000 -0.497499
-v -0.400000 -0.400000 -0.370263
-v 0.320000 0.320000 -0.243027
-v 0.320000 0.320000 -0.370263
-v -0.320000 0.320000 -0.370263
-v -0.320000 0.320000 -0.243027
-v 0.320000 -0.320000 -0.243027
-v 0.320000 -0.320000 -0.370263
-v -0.320000 -0.320000 -0.370263
-v -0.320000 -0.320000 -0.243027
-v 0.256000 0.256000 -0.115790
-v 0.256000 0.256000 -0.243027
-v -0.256000 0.256000 -0.243027
-v -0.256000 0.256000 -0.115790
-v 0.256000 -0.256000 -0.115790
-v 0.256000 -0.256000 -0.243026
-v -0.256000 -0.256000 -0.243026
-v -0.256000 -0.256000 -0.115790
-v 0.204800 0.204800 0.008210
-v 0.204800 0.204800 -0.119027
-v -0.204800 0.204800 -0.119027
-v -0.204800 0.204800 0.008210
-v 0.204800 -0.204800 0.008210
-v 0.204800 -0.204800 -0.119026
-v -0.204800 -0.204800 -0.119026
-v -0.204800 -0.204800 0.008210
-v 0.146894 0.146894 0.503596
-v 0.146894 0.146894 -0.002413
-v -0.146894 0.146894 -0.002413
-v -0.146894 0.146894 0.503596
-v 0.146894 -0.146894 0.503596
-v 0.146894 -0.146894 -0.002413
-v -0.146894 -0.146894 -0.002413
-v -0.146894 -0.146894 0.503596
-v 0.320665 0.320665 -0.497499
-v -0.320665 0.320665 -0.497499
-v 0.320664 -0.320665 -0.497499
-v -0.320665 -0.320665 -0.497499
-vt 0.712514 0.681510
-vt 0.975774 0.681510
-vt 0.975774 0.944770
-vt 0.712514 0.944770
-vt 0.712514 0.681510
-vt 0.975774 0.681510
-vt 0.975774 0.944770
-vt 0.712514 0.944770
-vt 0.975774 0.681510
-vt 0.975774 0.944770
-vt 0.712514 0.944770
-vt 0.315390 0.302988
-vt 0.315390 0.039728
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.712514 0.681510
-vt 0.975774 0.681510
-vt 0.975774 0.944770
-vt 0.052130 0.039728
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vt 0.052130 0.039728
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vt 0.052130 0.039728
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vt 0.052130 0.039728
-vt 0.315390 0.039728
-vt 0.052130 0.302988
-vt 0.052130 0.039728
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vt 0.052130 0.039728
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vt 0.052130 0.039728
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vt 0.052130 0.039728
-vt 0.315390 0.039728
-vt 0.052130 0.302988
-vt 0.052130 0.039728
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.315390 0.039728
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vt 0.113358 0.155808
-vt 0.139491 0.183677
-vt 0.052150 0.175815
-vt 0.070263 0.158170
-vt 0.118317 0.113646
-vt 0.075071 0.114371
-vt 0.052211 0.096257
-vt 0.139491 0.086694
-vt 0.975306 0.069495
-vt 0.371324 0.069495
-vt 0.371324 0.276848
-vt 0.975306 0.276848
-vt 0.975306 0.069495
-vt 0.975306 0.276848
-vt 0.371324 0.276849
-vt 0.371324 0.069495
-vt 0.975125 0.070933
-vt 0.975125 0.278286
-vt 0.371143 0.278286
-vt 0.371143 0.070933
-vt 0.371143 0.070933
-vt 0.371143 0.278286
-vt 0.975125 0.278286
-vt 0.975125 0.070933
-vt 0.043937 0.339371
-vt 0.658425 0.339371
-vt 0.658425 0.953858
-vt 0.043937 0.953858
-vt 0.052130 0.302988
-vt 0.315390 0.302988
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vt 0.315390 0.039728
-vt 0.052130 0.039728
-vt 0.052130 0.039728
-vt 0.315390 0.039728
-vt 0.052130 0.302988
-vt 0.315390 0.302988
-vt 0.315390 0.302988
-vt 0.052130 0.302988
-vn 0.0000 1.0000 -0.0000
-vn 0.0000 -1.0000 0.0000
-vn 1.0000 -0.0000 -0.0000
-vn 0.0000 0.0000 -1.0000
-vn -1.0000 0.0000 0.0000
-vn 0.0000 0.0000 1.0000
-s off
-f 1/1/1 2/2/1 3/3/1 4/4/1
-f 5/5/2 8/6/2 7/7/2 6/8/2
-f 1/1/3 5/9/3 6/10/3 2/11/3
-f 3/12/4 2/13/4 41/14/4 42/15/4
-f 3/16/5 7/17/5 8/18/5 4/4/5
-f 5/19/6 1/20/6 4/21/6 8/22/6
-f 9/23/1 10/24/1 11/25/1 12/26/1
-f 13/27/2 16/28/2 15/29/2 14/30/2
-f 9/23/3 13/31/3 14/32/3 10/33/3
-f 10/34/4 14/35/4 15/29/4 11/36/4
-f 11/37/5 15/38/5 16/39/5 12/26/5
-f 13/27/6 9/40/6 12/41/6 16/42/6
-f 17/43/1 18/44/1 19/45/1 20/46/1
-f 21/47/2 24/48/2 23/49/2 22/50/2
-f 17/43/3 21/51/3 22/52/3 18/53/3
-f 18/54/4 22/55/4 23/49/4 19/56/4
-f 19/57/5 23/58/5 24/59/5 20/46/5
-f 21/47/6 17/60/6 20/61/6 24/62/6
-f 25/63/1 26/64/1 27/65/1 28/66/1
-f 29/67/2 32/68/2 31/69/2 30/70/2
-f 25/63/3 29/67/3 30/70/3 26/64/3
-f 27/65/5 31/69/5 32/68/5 28/66/5
-f 29/67/6 25/63/6 28/66/6 32/68/6
-f 33/71/1 34/72/1 35/73/1 36/74/1
-f 37/75/2 40/76/2 39/77/2 38/78/2
-f 33/79/3 37/80/3 38/81/3 34/82/3
-f 35/83/5 39/84/5 40/85/5 36/86/5
-f 41/87/4 43/88/4 44/89/4 42/90/4
-f 6/91/4 7/92/4 44/93/4 43/94/4
-f 7/95/4 3/96/4 42/97/4 44/98/4
-f 2/99/4 6/100/4 43/101/4 41/102/4
diff --git a/elepower_dynamics/textures/elepower_duct.png b/elepower_dynamics/textures/elepower_duct.png
deleted file mode 100644
index c067c92d23b86383052c868eeb09252c85f12ea5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5386
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

diff --git a/elepower_dynamics/textures/elepower_fluid_transporter.png b/elepower_dynamics/textures/elepower_fluid_transporter.png
deleted file mode 100644
index 271b72538d2d2fc59be0c5235dda521ae396ff42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5264
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
Gh<^Z%^i^B{

diff --git a/elepower_dynamics/textures/elepower_fluid_transporter_back.png b/elepower_dynamics/textures/elepower_fluid_transporter_back.png
deleted file mode 100644
index 4f688b84c570a1a2295f68a9bfaa3b03b39af380..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 489
zcmV<F0T%v=P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0GR-p
z0LG<|8sq=~010qNS#tmYE+YT{E+YYWr9XB6000McNliru;sz2A69!?}*#`gs02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00B`+L_t(I%cYacZNo4SMBkE2
z)!;%5_z)lnQi?mxB_~&+3S^TU=HPHGT@xKi&g^_vcD-H)|M(o>bUI;XNJ0{3M$Q>C
zV~oKV&lxEtBmp3abzPqX^I<84-g}TuQ13lR=J`Q^nFVM+aZe(N$KydM<#-2>bEfxB
zYYj6Cz+Ucr2ZYK{Ac>R`wN`S@+-|q9WoC2<&zbZ2%(iW~d#Lou2!uQ{<NNFDWn~QB
zKR=NaD&75MVT^G|7@ok~8u=F>iQYTQvP45cFu|`NpQIL4M71fULkkh&oRCtAN6nq?
zPWqiTvudq{S_i1LQc7WrLGK+&ynTGIw>RtEFI5oimqikn%Y|BN_#9)9bEdTx6$TLy
z$u7%+nXzpfW=3l*yv~Z<ol?p%M0ZCL_xn9oS`zLa(`Iec;vvNS9?Wf<UC+B|Z@;OL
f!Md)0{+)jS=TiwZWAb=;00000NkvXXu0mjfs#V1l

diff --git a/elepower_dynamics/textures/elepower_fluid_transporter_front.png b/elepower_dynamics/textures/elepower_fluid_transporter_front.png
deleted file mode 100644
index ab1f3fb545efaaefb78956fbfae3278b297cc2b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 474
zcmV<00VV#4P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0GR-p
z0LG<|8sq=~010qNS#tmYE+YT{E+YYWr9XB6000McNliru;sz2A5*UKa)g=G`02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00BZtL_t(I%cYYsZUQk7Mc>$F
zMUeui5TZ}2T!a<e0V!#69x4uzC>$jf^>!-(Rip%1PYUAMT@)pV{Lc3H`_G?mna}6S
zKM(+h!yzI<jFA{4B7*lG5kXZ^J-y+aBgP0ojFGY|PXr>uYPGTpBEq&mMF0>K=xttF
z1e3|6Rv;pX2t`rU+KL4qw+{ex*Gt|Tvd7~wB2p80?~QrC-&>)3Tb%Y9m$NK0l}3>I
zPDo_uaL$nwn=b%WRk0h)E^=K}*$rk!=F+Bs_52$??;cHs5jf|#HViJAnB4vg-SraH
z+9wBaI2;)4UN3&Nw|O=Xg0-M^6W;sQ`W($E1c2l5Xa`xASz$9s=i_YUAcTObG8&Dn
zVB4Q^lSX&{WG%)RTk1l}L7wM?5U8r^JM$HtPREkzT>j&y3IJtUUj3cF0Puv89oh0r
Q7XSbN07*qoM6N<$g8AFH$^ZZW

diff --git a/elepower_dynamics/textures/elepower_fluid_transporter_side.png b/elepower_dynamics/textures/elepower_fluid_transporter_side.png
deleted file mode 100644
index 5804ce4c675242a444f97396c766d56d658083f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 519
zcmV+i0{H!jP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0GR-p
z0LG<|8sq=~010qNS#tmYE+YT{E+YYWr9XB6000McNliru;sz2A5GHY(stf=C02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00D1FL_t(I%cYaCZqz^!hQHa_
zHBW$asi<k7;fbzGkkXSBR0&dgXwvgM2~u9dN^=dmv%NDZoLSq@!AO>y-EY2~e^>VV
zz4ITH0d~6`B7&J=W{3!?iiqIuxX(RON|+e{W=7xlGawe0QmC~y*v-Q^09PM>G)MrV
zQUHSP?wA?3j~DR%0PhamK3*Uq48wq`HoFE;RcftF(}ajDn}5Hyd4;GdK(lNBGiwGn
z59iy>ERb)%J~NIZDWzpDL3DTSo-XIj&&+^7zqbeOo-V1il2TeyaCcOdFCV_oCTFuz
z*j&H)$uv!K=be+%GK0L1C#E0&s9Gys*R=uvm4d2bW=(CaxQ4{6rfF)R3^0x(r4-zq
zT5AJFt<Bb#su@Jr=u%2)XAD3oWfS2hg~-3_Iz)uy@wfqmrK*y1-ZV%6IcLm_)9KW%
zbUVWHoKnttGmFh*3axkxq5bvKJ;N{%QM>!*+BZPo_y7EyUjTz5{mE&~Vmtr<002ov
JPDHLkV1jGQ+wK4W

diff --git a/elepower_farming/depends.txt b/elepower_farming/depends.txt
index db16c63..ccbeb24 100644
--- a/elepower_farming/depends.txt
+++ b/elepower_farming/depends.txt
@@ -1,5 +1,4 @@
 elepower_papi
-elepower_fapi
 bucket
 farming
 fluid_tanks
diff --git a/elepower_farming/mod.conf b/elepower_farming/mod.conf
index 1af29ee..95b766c 100644
--- a/elepower_farming/mod.conf
+++ b/elepower_farming/mod.conf
@@ -1,4 +1,4 @@
 name = elepower_farming
 description = Electric Farming Automation!
-depends = elepower_papi, elepower_fapi, bucket, farming, fluid_tanks
+depends = elepower_papi, bucket, farming, fluid_tanks
 optional_depends = mobs, mobs_animal, mobs_monster, moretrees, ethereal
diff --git a/elepower_nuclear/machines/fission_reactor.lua b/elepower_nuclear/machines/fission_reactor.lua
index 0813867..5e81d4c 100644
--- a/elepower_nuclear/machines/fission_reactor.lua
+++ b/elepower_nuclear/machines/fission_reactor.lua
@@ -51,8 +51,8 @@ local function calculate_fitness(pos)
 			local dp = minetest.get_name_from_content_id(data[i])
 			if excession <= 16 and (ele.helpers.get_item_group(dp, "ele_reactor_component") or
 				ele.helpers.get_item_group(dp, "ele_neutron_absorbant") or
-				ele.helpers.get_item_group(dp, "elefluid_transport_source") or
-				ele.helpers.get_item_group(dp, "elefluid_transport") or
+				ele.helpers.get_item_group(dp, "fluid_transport_source") or
+				ele.helpers.get_item_group(dp, "fluid_transport") or
 				ele.helpers.get_item_group(dp, "tube") or
 				ele.helpers.get_item_group(dp, "tubedevice")) then
 				hu = hu - 1
diff --git a/elepower_papi/formspec.lua b/elepower_papi/formspec.lua
index bc2bd3c..154b73b 100644
--- a/elepower_papi/formspec.lua
+++ b/elepower_papi/formspec.lua
@@ -58,3 +58,28 @@ function ele.formspec.power_meter(capacitor)
 		minetest.colorize("#0399c6", ele.capacity_text(capacitor.capacity, capacitor.storage))..
 		minetest.colorize("#565656", "\nPower Used / Generated: " .. usage .. " " .. ele.unit) .. "]"
 end
+
+-- Fluid bar for formspec
+function ele.formspec.fluid_bar(x, y, fluid_buffer)
+	local texture = "default_water.png"
+	local metric  = 0
+	local tooltip = ("tooltip[%d,%d;1,2.5;%s]"):format(x, y, "Empty Buffer")
+
+	if fluid_buffer and fluid_buffer.fluid and fluid_buffer.fluid ~= "" and
+		minetest.registered_nodes[fluid_buffer.fluid] ~= nil then
+		texture = minetest.registered_nodes[fluid_buffer.fluid].tiles[1]
+		if type(texture) == "table" then
+			texture = texture.name
+		end
+
+		local fdesc = fluid_lib.cleanse_node_description(fluid_buffer.fluid)
+		metric  = math.floor(100 * fluid_buffer.amount / fluid_buffer.capacity)
+		tooltip = ("tooltip[%d,%d;1,2.5;%s\n%s / %s %s]"):format(x, y, fdesc, 
+			ele.helpers.comma_value(fluid_buffer.amount), ele.helpers.comma_value(fluid_buffer.capacity), fluid_lib.unit)
+	end
+
+	return "image["..x..","..y..";1,2.8;elepower_gui_barbg.png"..
+		   "\\^[lowpart\\:"..metric.."\\:"..texture.."\\\\^[resize\\\\:64x128]"..
+		   "image["..x..","..y..";1,2.8;elepower_gui_gauge.png]"..
+		   tooltip
+end