From 883568add4548d46f3f4df1d58168621a8a2fe80 Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy2@mail.ru>
Date: Sun, 3 Jun 2018 18:37:53 +0200
Subject: [PATCH] Implement basic villager trading formspec

---
 mods/ENTITIES/mobs_mc/depends.txt             |   1 +
 .../textures/mobs_mc_trading_formspec_bg.png  | Bin 2494 -> 2015 bytes
 mods/ENTITIES/mobs_mc/villager.lua            | 109 ++++++++----------
 3 files changed, 51 insertions(+), 59 deletions(-)

diff --git a/mods/ENTITIES/mobs_mc/depends.txt b/mods/ENTITIES/mobs_mc/depends.txt
index da8ac70d8..2b399cc63 100644
--- a/mods/ENTITIES/mobs_mc/depends.txt
+++ b/mods/ENTITIES/mobs_mc/depends.txt
@@ -1,3 +1,4 @@
+mcl_init
 default?
 mcl_mobs
 mcl_tnt?
diff --git a/mods/ENTITIES/mobs_mc/textures/mobs_mc_trading_formspec_bg.png b/mods/ENTITIES/mobs_mc/textures/mobs_mc_trading_formspec_bg.png
index a95b09780a4d8dcad60089291441d6b90cdab82f..cfc64aeaa25a5c43a6a1bffed14f5276c105f45d 100644
GIT binary patch
literal 2015
zcmb_de@qj16hBfIwNY`LY+_IbVV<I4f`Zq9_#-gZ315vx!3~XK16Bw0T7D>s$l`#b
zW-~jZg5Nq5VosfwF;p}<NaoR6Y=xvKW(cI$(xxdE0hK5!%lC>3^Pg?*{<*yO?!EVU
zpZ9q=dOb*-E}kRCFl@T?%lHi#CIT2HnmI{?VHhu75QSmby!A;b37GJVj*hmqwe8%w
zQ=w33G@8W3#G0BKtyViQy6!lJVLo{qfDBvZxSxq(lXIo<t5f#)^mVPSv}~JguofLE
z62%ZlBI-ZBvD!6t>z>-v`<B-iIJ31OPZ%pcr_W^fZT02WTatqoD}L%X=QMOUIv*DF
zcLznEii?#z^ga2b<v>H{s}iEC*nZS{X=O}T*KSMk^Fc{7Z5drkGbH6l06r8zP6|n{
zNxf_GoD?3j3=9tUw(iLnQ9MWE1Xw4$*@J<Ji&^!Kkq6X`SI%NKRn;p*;TN_i#;1?a
zr|dzp`EgQKK_FFqKepuMMsGTt@661Kh9s(D(JUJv!MEXNvtZ(EgW^`a0X2a~`$L8H
z9L<n4E`UR5UYiL0-%K>j*vH=4d|@Q4lpT_(Ta;noLttKb^BkE#MzPaaewMZU{eyoV
zZ1(qOr?8Hr))W{5t7T;}s#3WNK=N7lS`&51rUD0?DpmKby=g$VTdC5v<rf0a4r>a0
zkYzL$-@fOg{7qNJ<nJooJgk@-MX0BeRYTizW)SMLWR*J;gb?aP^FXgWJep8DRy33{
z&eO`l^x#(4#6|tHHIgoOOJlL~aVtqZzorW+^ezA~O;Y^hO-&&|sSgADINGvkzqov3
zj3H)h+r9w+hW$ayvPkOu6ar|i+_?})=9l4YrIK%d?_kpzoGov>@@_3NjT1fl8d|AI
zgrQfUv4R=;RiN<*<Mw!VSnZ8VfTupMCz5bu7k;tIwQ~q}+{GG)Jluy+$C=Dl`3!$T
z-DQ&6<(>tEdcV2ZA-{9O8Lb=)oCQuTvP-tWdA_Naa-1idX~tQmZmAq&!>ePjA_-6w
zd*QGp+vZgxNn7sO-nkm2#BoRTTA0+=!1=?l`y2iBoGRhoY(oxC!60?sb`=_e9}PDp
zJ*~=~+kd<+nXyb4PG;cR*18oXJxh4b^*w47zQwvMiKN68vQ>~wo~FNd#vimE@ULAf
z;8O$`rr?@7L*CEEy=keqBs&H`a`WURFF4mG)P|z`gv)t;w|j19^vs*vX5SUBi7Y+V
zE=~{bbc9{bOwg1MFVAVLtgYW(A<JU5Y3=$9P^^6wmwT7X0FXmnLLHp3l%yq;Dj5hq
z4kC-^q$ZjXQGROPUhVbK5@c~Sa{?zO3wcpqpPw38G)_biV1|&lTP65H9h}tUaz~&*
zhPS%6<HAiDpVnQyh_k78Mm%~WNksxZ%~1R$TvMI)poeBYJO5G_?BFJJ2zBJ?|1VJJ
zG%^4TtU$wb*ae`d_6Z~s4wB7ZC8hff7xMDlqMj}?fB;^QuplE?M~}o%g9(>=qBuxi
zn?G(g4&D)n`~;OwXHc=R(IF`ixeAq@kn&#_z^2jkTK)=vrV$TfE)u}Q48_Y~%Ud?z
z_zvTQjZ+XG@zqzGaH1r3aAi~k0dz)T;PEKm(t(&B&xd3tnsY)55OnhIhxP9Mcbph%
zyp9kfbaF@r5H{|O5GF!5zFh#C_4AwUdfM`0Z(N^e1*j><*=O!)9ZSs-`j-Ie>lGcj
ZFGNqyeh?sODauDbYH0$9*R9$1-CvF+yRiTO

literal 2494
zcmbVOYfuwc6yAi0MaR)8S}dr<)*&K~K}BN%60m5*%Ay3ZmWPg%0tyHbA0f!2zN(0%
zP@+IWW<-q7L{Je54Cs`Hpu#j*hzckYA|x0{f|`URoz31LYR6)CX8-Ix_uTJ%-*?X4
z6PsY_jA^#hAPAb_x864pf-GPNvY7RS1q49^ZM{1LL8MI^gVsW($7nRRwY90$>gecb
zJ3G6~%uHuzX9oud7Z(>dH#Y`@!D6w9L}E-#43$bPE-vPBx%ifx%Mb)%k^*5G<lW!-
zGXz;J_w)4$I*5^XVRkFm&8-`e=A6O^dyKi$3fmV=PiQ|l{du>o%2uyG=37<%Re@13
zlfTX8H|&D?Rb79qFI3}pos7>cNOzy}C~lK=+n=*&@bU+<D7f<qPT<Cd*%XYsh|=Mj
zo|VLi!>(+KnS&>=tedQmw+~0hA}=X}1CcT~-f%j{8%CD@B?My%i{^)H_j1k7<Yj_r
z_2!vix14${4Gxxvb;)cfwVl%B#(aMmPeAeoZ<ieq32Ig*NDM6?_ldkWD<4IF%N$ne
zdJQ1}&xt&JN$R0>WG`@-eDyVbRlV-}!Klk#r`G~-T4mypeoe^8q5A=JtSK=64zmBP
zX!2E<3q^}HbAj?f!qAn>8cRh1`aR}XvVUyzSfA&rP<Y2age|RyJuPvbYNV%=qq)aO
zsNmEMB3s)V{CU}qilwLS@b3r6q#59|`?}y)D~A14w0Z`faGi{>SR&Si7o^Bkjhb}L
zrOqgAbEEF-4QTS$+y?P2=<!&^J!&nl^(?PJtk4U`_Gb5}ayfNrdPJnaQmGr!lDCXf
za+Ft9>oK(t7mU=wU#cMH1rA@_J+HAM!C&bEA27kH?isM9*T!p@t9y0alcZfN5fKHE
zbt8iEBrRE9<2rAY%#=L+y-!Us)z__Xhi~s*N*OWir7^;kcUCmpWIVEBS)b(|6U%2y
zBD$IJOCBD6Zb%+w7&ik-3XE}29~$BpsIm_53Qwx=_D^=6&awW1i{On<BfhCOTCbR5
z??&9hnM%iALEI&xWK_lsd9pxI!GL8JAnda(`M#LPl}<&9WnBVb?8JmK2L-|bcAvTz
z5qn&4k&qisD<4wH5%(e)Ts^8U#I{O(Ku~#yxHShjLzN58sD3tf1T;uL!PGYx`rWZb
zpq=^&z<@8uojFpV3jkf_TU3a4T+=;{D8CStc{g=D_k*X40K9$&(35V&g=p^FN-Hx=
z(U9zAYeYQ27IVCE;d}!F^p92FI}g9>X*{8+qYf<`PYAX6?$Zr!X7dv>z#KA8rge2J
z%&#Cddcm5?)7Yz~1DXb6*%>_#(J_;>B<c!XcrhjPRoIpk-eY0w-muYD46`4Fdzt4S
z9F>1GTgteY>frRs-o|8T0!!pr^dhwT_*Rf4NN&S5JPXa`*&`=-!`CBVi7tCk%D=Vk
zf>!68qSs6nI^wRF#+s)GUv)UUgA)9v;x+T{?OW%gpzwTpxK^kqufK%1Jhxc;*Qz1?
zp5;F|r`jb>F`PTn%b8LwF8LD3WEzf!A`#ctsj*B_+M@5U@_a1_>fFY53HWh8w>h1o
zT?i;Zr=^*EAl`ot)Jf0WkNKXU^fh_=jabIxG8wLh#N|tq*)9Pg`?+ShQDfYcB=H-X
zOJf;wx^W*iyT)nGes*L_@tH8f;%`hLlYss~Ncu5Qpt-019|!2A;te}_j5>!D-ISAk
z(qQR8Wl?0yckD32%T{npp<<A_E|t=qLl#uY$v(yi#fGEYNU`#~q)diWOU+ZmoDjXp
z-Z^vvV`vB}j~V?(SHQ&fnMmdbG`uIWs2N_}!X~&>!EHPdBUun7R$h<nurg34j{~p>
z<QguM;kwLny<p3P=5;{GC!98k5Y*>jPJRY&K2#uAxt#2?2a$^t*<!&CBg{QJ&g182
zMW(P>jf6ZYP9Tyw%9?fFu<$ChC5<n<Ewmoi<kIR7VZ$|VhX&*7h&9Y3J^ec=)yRLC
N-&)vLux7_E{{Y(*7u)~<

diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua
index 5cb9783c0..021e2da57 100644
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@@ -53,9 +53,9 @@ mobs:register_mob("mobs_mc:villager", {
 	run_velocity = 2.4,
 	drops = {},
 	sounds = {
-		random = "Villager1",
-		death = "Villagerdead",
-		damage = "Villagerhurt1",
+		random = "mobs_mc_villager_noise",
+		death = "mobs_mc_villager_death",
+		damage = "mobs_mc_villager_damage",
 		distance = 16,
 	},
 	animation = {
@@ -78,7 +78,6 @@ mobs:register_mob("mobs_mc:villager", {
 	light_damage = 0,
 	view_range = 16,
 	fear_height = 4,
-	--[[
 	on_rightclick = function(self, clicker)
 		local inv
 		inv = minetest.get_inventory({type="detached", name="trading_inv"})
@@ -87,10 +86,9 @@ mobs:register_mob("mobs_mc:villager", {
 				allow_take = function(inv, listname, index, stack, player)
 					if listname == "output" then
 						inv:remove_item("input", inv:get_stack("wanted", 1))
-						minetest.sound_play("Villageraccept", {to_player = player:get_player_name()})
+						minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name()})
 					end
 					if listname == "input" or listname == "output" then
-						--return 1000
 						return 0
 					else
 						return 0
@@ -106,72 +104,68 @@ mobs:register_mob("mobs_mc:villager", {
 				on_put = function(inv, listname, index, stack, player)
 					if inv:contains_item("input", inv:get_stack("wanted", 1)) then
 						inv:set_stack("output", 1, inv:get_stack("offered", 1))
-						minetest.sound_play("Villageraccept", {to_player = player:get_player_name()})
+						minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name()})
 					else
 						inv:set_stack("output", 1, ItemStack(""))
-						minetest.sound_play("Villagerdeny", {to_player = player:get_player_name()})
+						minetest.sound_play("mobs_mc_villager_deny", {to_player = player:get_player_name()})
 					end
 				end,
 				on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
 					if inv:contains_item("input", inv:get_stack("wanted", 1)) then
 						inv:set_stack("output", 1, inv:get_stack("offered", 1))
-						minetest.sound_play("Villageraccept", {to_player = player:get_player_name()})
+						minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name()})
 					else
 						inv:set_stack("output", 1, ItemStack(""))
-						minetest.sound_play("Villagerdeny", {to_player = player:get_player_name()})
+						minetest.sound_play("mobs_mc_villager_deny", {to_player = player:get_player_name()})
 					end
 				end,
 				on_take = function(inv, listname, index, stack, player)
 					if inv:contains_item("input", inv:get_stack("wanted", 1)) then
 						inv:set_stack("output", 1, inv:get_stack("offered", 1))
-						minetest.sound_play("Villageraccept", {to_player = player:get_player_name()})
+						minetest.sound_play("mobs_mc_villager_accept", {to_player = player:get_player_name()})
 					else
 						inv:set_stack("output", 1, ItemStack(""))
-						minetest.sound_play("Villagerdeny", {to_player = player:get_player_name()})
+						minetest.sound_play("mobs_mc_villager_deny", {to_player = player:get_player_name()})
 						
 					end
 				end,
 			})
 			end
-		inv:set_size("input", 1)
-		inv:set_size("output", 1)
-		inv:set_size("wanted", 1)
-		inv:set_size("offered", 1)
+			inv:set_size("input", 2)
+			inv:set_size("output", 1)
+			inv:set_size("wanted", 2)
+			inv:set_size("offered", 1)
 
 		local trades = {
-			{"default:apple 12",			"default:clay_lump 1"},
-			{"default:coal_lump 20",		"default:clay_lump 1"},
-			{"default:paper 30",			"default:clay_lump 1"},
-			{"mobs:leather 10",			"default:clay_lump 1"},
-			{"default:book 2",			"default:clay_lump 1"},
-			{"default:clay_lump 3",		"default:clay_lump 1"},
-			{"farming:potato 15",		"default:clay_lump 1"},
-			{"farming:wheat 20",			"default:clay_lump 1"},
-			{"farming:carrot 15",			"default:clay_lump 1"},
-			{"farming:melon_8 8",		"default:clay_lump 1"},
-			{"mobs:rotten_flesh 40",		"default:clay_lump 1"},
-			{"default:gold_ingot 10",		"default:clay_lump 1"},
-			{"farming:cotton 10",			"default:clay_lump 1"},
-			{"wool:white 15",			"default:clay_lump 1"},
-			{"farming:pumpkin 8",		"default:clay_lump 1"},
+			{"mcl_core:apple 12",		"mcl_core:emerald 1"},
+			{"mcl_core:coal_lump 20",	"mcl_core:emerald 1"},
+			{"mcl_core:paper 30",		"mcl_core:emerald 1"},
+			{"mcl_mobitems:leather 10",	"mcl_core:emerald 1"},
+			{"mcl_books:book 2",		"mcl_core:emerald 1"},
+			{"mcl_core:emerald 3",		"mcl_core:emerald 1"},
+			{"mcl_farming:potato_item 15",	"mcl_core:emerald 1"},
+			{"mcl_farming:wheat_item 20",	"mcl_core:emerald 1"},
+			{"mcl_farming:carrot_item 15",	"mcl_core:emerald 1"},
+			{"mcl_farming:melon_item 8",	"mcl_core:emerald 1"},
+			{"mcl_mobitems:rotten_flesh 40","mcl_core:emerald 1"},
+			{"mcl_core:gold_ingot 10",	"mcl_core:emerald 1"},
+			{"mcl_wool:white 15",		"mcl_core:emerald 1"},
+			{"mcl_farming:pumpkin 8",	"mcl_core:emerald 1"},
 
-			{"default:clay_lump 1",		"mobs:beef_cooked 5"},
-			{"default:clay_lump 1",		"mobs:chicken_cooked 7"},
-			{"default:clay_lump 1",		"farming:cookie 6"},
-			{"default:clay_lump 1",		"farming:pumpkin_bread 3"},
-			{"default:clay_lump 1",		"mobs:arrow 10"},
-			{"default:clay_lump 3",		"mobs:bow_wood 1"},
-			{"default:clay_lump 8",		"fishing:pole_wood 1"},
-			--{"default:clay_lump 4",		"potionspack:healthii 1"},
-			{"default:clay_lump 1",		"cake:cake 1"},
-			{"default:clay_lump 10",		"mobs:saddle 1"},
-			{"default:clay_lump 10",		"clock:1 1"},
-			{"default:clay_lumpd 10",		"compass:0 1"},
-			{"default:clay_lump 1",		"default:glass 5"},
-			{"default:clay_lump 1",		"nether:glowstone 3"},
-			{"default:clay_lump 3",		"mobs:shears 1"},
-			{"default:clay_lump 10",		"default:sword_diamond 1"},
-			{"default:clay_lump 20",		"3d_armor:chestplate_diamond 1"},
+			{"mcl_core:emerald 1",		"mcl_mobitems:beef_cooked 5"},
+			{"mcl_core:emerald 1",		"mcl_mobitems:chicken_cooked 7"},
+			{"mcl_core:emerald 1",		"mcl_farming:cookie 6"},
+			{"mcl_core:emerald 1",		"mcl_bows:arrow 10"},
+			{"mcl_core:emerald 3",		"mcl_bows:bow_0 1"},
+			{"mcl_core:emerald 1",		"mcl_cake:cake 1"},
+			{"mcl_core:emerald 10",		"mcl_mobitems:saddle 1"},
+			{"mcl_core:emerald 10",		"mcl_clock:clock_1 1"},
+			{"mcl_core:emerald 10",		"mcl_compass:compass 1"},
+			{"mcl_core:emerald 1",		"mcl_core:glass 5"},
+			{"mcl_core:emerald 1",		"mcl_nether:glowstone 3"},
+			{"mcl_core:emerald 3",		"mcl_tools:shears 1"},
+			{"mcl_core:emerald 10",		"mcl_tools:sword_diamond 1"},
+			{"mcl_core:emerald 20",		"3d_armor:chestplate_diamond 1"},
 		}
 		local tradenum = math.random(#trades)
 		inv:set_stack("wanted", 1, ItemStack(trades[tradenum][1]))
@@ -179,20 +173,17 @@ mobs:register_mob("mobs_mc:villager", {
 		
 		local formspec = 
 		"size[9,8.75]"..
-		"background[-0.19,-0.25;9.41,9.49;trading_formspec_bg.png]"..
-		"bgcolor[#080808BB;true]"..
-		"listcolors[#9990;#FFF7;#FFF0;#160816;#D4D2FF]"..
+		"background[-0.19,-0.25;9.41,9.49;mobs_mc_trading_formspec_bg.png]"..
+		mcl_vars.inventory_header..
 		"list[current_player;main;0,4.5;9,3;9]"..
 		"list[current_player;main;0,7.74;9,1;]"
-		.."list[detached:trading_inv;wanted;2,1;1,1;]"
-		.."list[detached:trading_inv;offered;5.75,1;1,1;]"
-		.."list[detached:trading_inv;input;2,2.5;1,1;]"
-		.."list[detached:trading_inv;output;5.75,2.5;1,1;]"
-		minetest.sound_play("Villagertrade", {to_player = clicker:get_player_name()})
-		minetest.show_formspec(clicker:get_player_name(), "tradespec", formspec)
+		.."list[detached:trading_inv;wanted;2,1;2,1;]"
+		.."list[detached:trading_inv;offered;5.76,1;1,1;]"
+		.."list[detached:trading_inv;input;2,2.5;2,1;]"
+		.."list[detached:trading_inv;output;5.76,2.55;1,1;]"
+		minetest.sound_play("mobs_mc_villager_trade", {to_player = clicker:get_player_name()})
+		minetest.show_formspec(clicker:get_player_name(), "mobs_mc:trade", formspec)
 	end,
-	
-	]]
 })
 
 mobs:spawn_specific("mobs_mc:villager", mobs_mc.spawn.village, {"air"}, 0, minetest.LIGHT_MAX+1, 30, 8000, 4, mobs_mc.spawn_height.water+1, mobs_mc.spawn_height.overworld_max)