From 7243a25fe6c98ad3bca206b5ad8310462598d93a Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 24 Mar 2020 18:48:14 +0100 Subject: [PATCH] Generate item slot images on the fly --- mods/HUD/mcl_formspec/init.lua | 11 +++++++++ mods/HUD/mcl_formspec/mod.conf | 1 + .../textures/mcl_formspec_itemslot.png | Bin 0 -> 231 bytes mods/HUD/mcl_inventory/creative.lua | 8 +++++++ mods/HUD/mcl_inventory/depends.txt | 1 + mods/HUD/mcl_inventory/init.lua | 8 +++++++ .../textures/crafting_formspec_bg.png | Bin 1431 -> 1030 bytes .../textures/crafting_formspec_bg2.png | Bin 861 -> 0 bytes .../textures/crafting_inventory_9_slots.png | Bin 1153 -> 0 bytes .../textures/crafting_inventory_creative.png | Bin 1517 -> 1246 bytes .../crafting_inventory_creative_survival.png | Bin 1516 -> 1419 bytes .../ITEMS/REDSTONE/mcl_dispensers/depends.txt | 1 + mods/ITEMS/REDSTONE/mcl_dispensers/init.lua | 1 - mods/ITEMS/REDSTONE/mcl_droppers/depends.txt | 1 + mods/ITEMS/REDSTONE/mcl_droppers/init.lua | 1 - mods/ITEMS/mcl_anvils/depends.txt | 1 + mods/ITEMS/mcl_anvils/init.lua | 5 ++++ .../textures/mcl_anvils_inventory.png | Bin 1088 -> 699 bytes mods/ITEMS/mcl_chests/depends.txt | 1 + mods/ITEMS/mcl_chests/init.lua | 22 ++++++++++++++---- .../textures/mcl_chests_inventory_chest.png | Bin 1195 -> 0 bytes .../mcl_chests_inventory_chest_large.png | Bin 1562 -> 0 bytes mods/ITEMS/mcl_crafting_table/depends.txt | 1 + mods/ITEMS/mcl_crafting_table/init.lua | 6 ++++- .../textures/crafting_inventory_workbench.png | Bin 1282 -> 281 bytes mods/ITEMS/mcl_furnaces/depends.txt | 1 + mods/ITEMS/mcl_furnaces/init.lua | 12 ++++++++-- .../textures/crafting_inventory_furnace.png | Bin 1166 -> 0 bytes mods/ITEMS/mcl_hoppers/depends.txt | 1 + mods/ITEMS/mcl_hoppers/init.lua | 4 +++- .../textures/mcl_hoppers_inventory.png | Bin 992 -> 0 bytes 31 files changed, 76 insertions(+), 11 deletions(-) create mode 100644 mods/HUD/mcl_formspec/init.lua create mode 100644 mods/HUD/mcl_formspec/mod.conf create mode 100644 mods/HUD/mcl_formspec/textures/mcl_formspec_itemslot.png delete mode 100644 mods/HUD/mcl_inventory/textures/crafting_formspec_bg2.png delete mode 100644 mods/HUD/mcl_inventory/textures/crafting_inventory_9_slots.png delete mode 100644 mods/ITEMS/mcl_chests/textures/mcl_chests_inventory_chest.png delete mode 100644 mods/ITEMS/mcl_chests/textures/mcl_chests_inventory_chest_large.png delete mode 100644 mods/ITEMS/mcl_furnaces/textures/crafting_inventory_furnace.png delete mode 100644 mods/ITEMS/mcl_hoppers/textures/mcl_hoppers_inventory.png diff --git a/mods/HUD/mcl_formspec/init.lua b/mods/HUD/mcl_formspec/init.lua new file mode 100644 index 000000000..7013fc0ee --- /dev/null +++ b/mods/HUD/mcl_formspec/init.lua @@ -0,0 +1,11 @@ +mcl_formspec = {} + +function mcl_formspec.get_itemslot_bg(x, y, w, h) + local out = "" + for i = 0, w - 1, 1 do + for j = 0, h - 1, 1 do + out = out .."image["..x+i..","..y+j..";1,1;mcl_formspec_itemslot.png]" + end + end + return out +end diff --git a/mods/HUD/mcl_formspec/mod.conf b/mods/HUD/mcl_formspec/mod.conf new file mode 100644 index 000000000..9d614403f --- /dev/null +++ b/mods/HUD/mcl_formspec/mod.conf @@ -0,0 +1 @@ +description = Helper mod to simplify creation of formspecs a little bit diff --git a/mods/HUD/mcl_formspec/textures/mcl_formspec_itemslot.png b/mods/HUD/mcl_formspec/textures/mcl_formspec_itemslot.png new file mode 100644 index 0000000000000000000000000000000000000000..84958ecd4234850d627aa868c382df5d322d0f8c GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^ULefD1SBVK3RMGAY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPVvoM#DxVok4SD;Xdr;B4q#jUruH}WzVaxfVFn|k*~ zL)YKu9tTAn_c3L4&(b$ePQEKESik1onN?cXtMzTj1$%Vo{uG$^vZ}w7(f&Q#{=Tga RPC)w^JYD@<);T3K0RZ;UL=6A{ literal 0 HcmV?d00001 diff --git a/mods/HUD/mcl_inventory/creative.lua b/mods/HUD/mcl_inventory/creative.lua index d5b5e474b..0b5f52b6b 100644 --- a/mods/HUD/mcl_inventory/creative.lua +++ b/mods/HUD/mcl_inventory/creative.lua @@ -325,11 +325,16 @@ mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, inv_siz -- Survival inventory slots main_list = "list[current_player;main;0,3.75;9,3;9]".. + mcl_formspec.get_itemslot_bg(0,3.75,9,3).. -- armor "list[detached:"..playername.."_armor;armor;2.5,1.3;1,1;1]".. "list[detached:"..playername.."_armor;armor;2.5,2.75;1,1;2]".. "list[detached:"..playername.."_armor;armor;5.5,1.3;1,1;3]".. "list[detached:"..playername.."_armor;armor;5.5,2.75;1,1;4]".. + mcl_formspec.get_itemslot_bg(2.5,1.3,1,1).. + mcl_formspec.get_itemslot_bg(2.5,2.75,1,1).. + mcl_formspec.get_itemslot_bg(5.5,1.3,1,1).. + mcl_formspec.get_itemslot_bg(5.5,2.75,1,1).. armor_slot_imgs.. -- player preview player_preview.. @@ -354,6 +359,7 @@ mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, inv_siz else -- Creative inventory slots main_list = "list[detached:creative_"..playername..";main;0,1.75;9,5;"..tostring(start_i).."]".. + mcl_formspec.get_itemslot_bg(0,1.75,9,5).. -- Page buttons "label[9.0,5.5;"..F(S("@1/@2", pagenum, pagemax)).."]".. "image_button[9.0,6.0;0.7,0.7;crafting_creative_prev.png;creative_prev;]".. @@ -412,6 +418,7 @@ mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, inv_siz "tooltip[nix;"..F(filtername["nix"]).."]".. caption.. "list[current_player;main;0,7;9,1;]".. + mcl_formspec.get_itemslot_bg(0,7,9,1).. main_list.. tab(name, "food") .. "tooltip[food;"..F(filtername["food"]).."]".. @@ -429,6 +436,7 @@ mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, inv_siz tab(name, "inv") .. "tooltip[inv;"..F(filtername["inv"]).."]".. "list[detached:trash;main;9,7;1,1;]".. + mcl_formspec.get_itemslot_bg(9,7,1,1).. "image[9,7;1,1;crafting_creative_trash.png]".. listrings diff --git a/mods/HUD/mcl_inventory/depends.txt b/mods/HUD/mcl_inventory/depends.txt index 056b070d3..fb454b7d1 100644 --- a/mods/HUD/mcl_inventory/depends.txt +++ b/mods/HUD/mcl_inventory/depends.txt @@ -1,4 +1,5 @@ mcl_init +mcl_formspec mcl_player? _mcl_autogroup? mcl_armor? diff --git a/mods/HUD/mcl_inventory/init.lua b/mods/HUD/mcl_inventory/init.lua index 994f11e49..e6a1f1460 100644 --- a/mods/HUD/mcl_inventory/init.lua +++ b/mods/HUD/mcl_inventory/init.lua @@ -96,6 +96,10 @@ local function set_inventory(player, armor_change_only) "list[detached:"..player_name.."_armor;armor;0,1;1,1;2]".. "list[detached:"..player_name.."_armor;armor;0,2;1,1;3]".. "list[detached:"..player_name.."_armor;armor;0,3;1,1;4]".. + mcl_formspec.get_itemslot_bg(0,0,1,1).. + mcl_formspec.get_itemslot_bg(0,1,1,1).. + mcl_formspec.get_itemslot_bg(0,2,1,1).. + mcl_formspec.get_itemslot_bg(0,3,1,1).. armor_slot_imgs.. -- craft and inventory "label[0,4;"..F(minetest.colorize("#313131", S("Inventory"))).."]".. @@ -104,6 +108,10 @@ local function set_inventory(player, armor_change_only) "label[4,0.5;"..F(minetest.colorize("#313131", S("Crafting"))).."]".. "list[current_player;craft;4,1;2,2]".. "list[current_player;craftpreview;7,1.5;1,1;]".. + mcl_formspec.get_itemslot_bg(0,4.5,9,3).. + mcl_formspec.get_itemslot_bg(0,7.74,9,1).. + mcl_formspec.get_itemslot_bg(4,1,2,2).. + mcl_formspec.get_itemslot_bg(7,1.5,1,1).. -- crafting guide button "image_button[4.5,3;1,1;craftguide_book.png;__mcl_craftguide;]".. "tooltip[__mcl_craftguide;"..F(S("Recipe book")).."]".. diff --git a/mods/HUD/mcl_inventory/textures/crafting_formspec_bg.png b/mods/HUD/mcl_inventory/textures/crafting_formspec_bg.png index 146c1422c8ceb3ebf82a3ddc81832e719dce9e42..5fd888decb24314d47272c5791894f2e3c7c1379 100644 GIT binary patch literal 1030 zcmeAS@N?(olHy`uVBq!ia0y~yVD)^mS!_!Ys@sZE&oVzZ7U+mZytjNX4zUHym@F9R*wt9!%m|c0t5P@sA>l1K-3o z<-bD(et9mwdXEvP9RdWZuii7e`tso1x+MA8ua->qvswtmFI#|ki7*gP_Im*mgfq}( zQI#QNu^9rBh0!QB00qG|VM-!714RrL%yZxk3T?rF7chzSKN+7p-y85}Sb4q9e0BMqZ>i_@% literal 1431 zcmeAS@N?(olHy`uVBq!ia0y~yVD@lvmTbfHtz zT5^itw<8OMgUgIG=Dz84R$uleCBW*YaJygkrIQOvHmNsXI{CfWIBavO+tu&i9>2=y zyFBmT*?C@_SN~MhzOB6Tzyj#FU6v(D$NboqPPQ$4)#A5z&Uah$u3b8-_i-$Jcw^p~ zm51jg$?spjP~R!j>f60Jsp`cs|7X{Kzp!$0u==vsDSklPmizf!KRE|zo8R0S>n2;i zO!1#%Wf-eoeCgyoi_)ZLe$SRnww(!dJunPE%J9_P?XbNm%zRHF$-l180URLM{Erko zpkM=q3zX{QyMO-d`M*k2radnEc0^2mn*PP>zqc=VJ`WL~HXt7~+I~DRFKN4aH9Sm7 zjRV|nfJYt3QNNA?!&q+m`$k(vSW-o%<+p;9t>N*$@Ot|--*u1QyHI&yV{-MUxEz>+ zP+Uk_XrQ^$Ni;BxWOM$QthQ}${{i{9zT zY*{1stm3@h`^$aPQkj4{DFPqZDbh}q<{g_>eR(A*C9Pjq#ANrgX#Yza12em4^DcO* zmt5kU3!Qqz!BwNPXq| z&04aL8$bT521OP)EDYsjf9I9FDZg=Ny_GcBeRcInA%PwsxB?27IJN+MUmLbG-NrKR z9Vb$hty`nDx2nheIQw7z2LF9`-djui_uifSUw9EVKV$P7FvO69gt#EQtatDC8n43@ f32)~0VM)LHGxr5{w!M>?2Xd&VtDnm{r-UW|Jjy9- diff --git a/mods/HUD/mcl_inventory/textures/crafting_inventory_9_slots.png b/mods/HUD/mcl_inventory/textures/crafting_inventory_9_slots.png deleted file mode 100644 index 4540f5086be57cc30b339fddb33ce1eb27b179c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1153 zcmeAS@N?(olHy`uVBq!ia0y~yVD_QR;{8ivP1hPA@Ck zWWqRGrMLLe^w|F`&5cYzt+>Gd!W74^=bruhRiRp+$etcnQu^nWy?L4cizUKV3n%-% zXz{aJC~Wl-P9cjUOT)y`wSmNex?$3AbLK<_Tz#^!8ss#KO$(~hi|cFO-0hfO(SG*o z=hgpj+^|Kl9G59jw;`KOtfLCk9787`f5!=Qz=IP_ujZcpyZ591Ug?LjX5q)z|0_=Z z4tFZdbYi_mq@#|^WDWI|e_!v9D{4^04@_L{6@9n)*fIY4n~dpkF|u>ndwRd`QZKp0 zIk&_KOkMC)2eRf~01H4VkTgsjSsEseBn>wQ$+$3x1*80a8~Gm?)T z+r3}95*Sw(D-QtU>g<#E{z$&Y7T-wHC^3sg99s-Nsh%I2DPd?<=Kq-y=nVIHTDhhD zlG5-0OBwy5uwAT4#`ir>mdK II;Vst0M<+6dH?_b diff --git a/mods/HUD/mcl_inventory/textures/crafting_inventory_creative.png b/mods/HUD/mcl_inventory/textures/crafting_inventory_creative.png index 918d670eb9812dd44004e73ead9bd47230f45402..b0348629e9ccb04b128edb25e98cff5f1e7e025d 100644 GIT binary patch literal 1246 zcmeAS@N?(olHy`uVBq!ia0y~yVBQGCMl8%g5l_u%86YJc;1lAS2xNf4|Ns9lT)2>t zk>T#{zIgHCxpU|Ko@@~UlwvFi@(X5gcy=QV#7XjYcVXyYmGuB}I14-?iy0WWg+Z8+ zVb&Z8pdfpRr>`sf6J}v98P@ylu@e~>SZq99978H@y}cYL$Ydzsa&YRTTgp&&dy@tjom!*=Mr)vajnxpo&M7=f)@&k68{Fj8B-sYn26wX-F^qos$dZK{`?1+s0>dPBWu}yz_JY8tH`_xUHVK-hamsQe_UYheP^?GLKXKilc e^EXsw!A0?cMdv--PF>s%67h8Pb6Mw<&;$T=8zn~o literal 1517 zcmeAS@N?(olHy`uVBq!ia0y~yVBQGCMl8%g5l_u%86YJQ;1l8sq=Df7|Nj>*T*%1C zaCdiKym;~4xpO^@6&3&`7)yfuf*Bm1-AH3#U~TqvaSW+oe0%#K=W92K){E9o*2yyp zr3}_7sxFCMd#9aOPf=7QKY!Bnwe1ormCq}muX+FOal0eP91=kMY8BnZ51;p+@m!f` zP_H_9vTWeWnRDKB=$*WBsKHBjxz)X^mx^W^sVz&qf9%w!)l*y}At*Ia42;5{e4r?X zP$)!+Sn5=qy5LG?ettEn^zFa29GkhDSINl#KAt!2-kiPeySL=!?D?B9|N5@{H)(-z z%i!8DOeV@Q3|(-8Q_rp5mZJSQ&N3%rI{z_Sb8pM5L5CBf@`67!{VF@PNC%A8tnZ$_ zCi}a2^5d6tLZAM)VgGJt$oU*Y+)M(OV_>Yd#ooo|2Z`PO&RyCbLI4o`Tg3P zr?*dcjf@x9kG%fwSpKogma9*F+*to6?d92<)myxc-yOT%|E+TE?_+sHB}QUWH9QtD zBkI|nEN?U8cT*0xmHtctx?xJNu4(har)I4B8jzg24d_-Jc@}QkU&-2&yUNV#jOU$; z4DIXx`*_~$)N}V1$3~f(-K*PjKKrhD*=AxAD^aN)ca#`C4~^b5wQ#+R*_zYrKsPL% zlLai5bhm5vyqtX+U&NcFx?ijN{g=P(@~bc95*Nt zk>T#{zIgHCxpU|Ko@@~UlwvFi@(X5gcy=QV#7XjYcVXyYmGuB}I14-?iy0WWg+Z8+ zVb&Z8pdfpRr>`sf6J}v98F3vuotq2{EH6D>978H@y}fghx5+`k^`d4YZxrX02Gt8q zW(i5Zb2hMC=Z`z5o9K7%eTe5I6^hXk?&~7gOHQ5ZzGRgueRI#bi%q;avwh4$w)Jm2 zyl(cPTjiThZb~@WwdMo}=|oNx1tV4MO-f*t;u;1<(}1#X8s;@u?>#w5^>_HqgXd+Q zP1T9qlmg^>Pa9VwxF%vv>tILX37kn}>4ImoP00C*kX>+H zu*~TV%8exJ(%!U-MdxP1&9dq@U8{XVQ-oh{xccs$faOiCO*1FIT^t${A4zd(123U^&R(>FVdQ&MBb@0DZGUM*si- literal 1516 zcmeAS@N?(olHy`uVBq!ia0y~yVBQGCMl8%g5l_u%86YJQ;1l8sq=Df7|Nj>*T*%1C zaCdiKym;~4xpO^@6&3&`7)yfuf*Bm1-AH3#U~TeraSW+oe0%3$r?R`u(TCx#_gfZt z`8jB?wLi!yy>wU6Lm~YE$D6&~Uw=KY^m*KvXL@Xw=DzoT(lvj4Tp;+SMV}jF7tz4$ z(&3D{n$uIJOgs3&J;;5I&eElQ7Lk6QZzTnmPIcaV>*JT0Y>D9BlYG%)seup_7CFTg zj6z{TQz3lU$W+M#Q^Hpr*U|c2{jcy;82A5Ar_yienC(u}?e{)CJO1;0t-ZMw$Nry8 z3&dv#)E==^gt(A8v)@Li7U_VHR`(_iFoN#uhvd@u^(8$$GuT zsoD49|Mpzp9C>Qt)M*DV6t9&OK2_%ejg|e5b2qKIZ)Z^!(;pe~?K|&rW3$s!(%q}y z^`#$w?f!emmgjxBM1?FdQG_QJm+iTJKJxU(n44>N=t=iI&zV+~v9$FdFg1N({d!ds z7W#FuHmQ;OE&n~(A-8$OoA=Uv={eIh&-Z=1BYVE@djGe=%=5Ch=@YW+=Wm|&c;}|* z!dNqz^EY*#Uhv{>e!2771MXL=gJJ3X@2-kdo9c@H94xd=3%q&XT;}`@o#1)0Z+BYH zlU*clSj+<_1TnVD#cLz^ z;{%9J*8kGKXrBIc_9OdoaDu*HV3WMrr?PCz^LG_xd+N6Idsn}^L7$9T{ddk*ne$Wc zcD>&8u;N^rW_wr^oAddt&o&*O1)5kPlzi+ehvczgS)%?;>C;S&Yk=J|9_Xs%yK{>#*!evUYh7ML)4;#r+$Y!_S2887N+%s(qF&wOHI%)|*S^$+at$lr5N z-{jXGV0E!n$V>f@pVLd18=fm3PxrG@o%_uB<&xl=nYL5>td`C_2IAb#v<7mH&RquL z+|9HEa-Pm@199$Wngcn1Hy-uwKWcNn0f{Wk5A=kh(53xJ$e*1G9H&W_6^Ku(r* zE{L<`as`m1WxY0i7sK3jmp#?yp0GN(L^x7?W{J{kmC1f!pZQLlAS+(8Rlc^Oea8CD S-vxo8#o+1c=d#Wzp$Py)NTCz} literal 1088 zcmeAS@N?(olHy`uVBq!ia0y~yVDTKP6*Z&*7n*USq&Ow>^(Xak1 zO}BAte0u+Vr@Z~*34Zf0pIlI~Nxk_J=UgtfrNP!#l2>Hz+C1KF`fDRl@Z>xmFZGgF z_8N2F0F^EBh6(K|H-ZQy@v&J;%I@2@>hfp)`k2Mi>;2;vf{p8Jn+w!homBtQWxLpcG=48v4F8jf%k%Vf0 zK5xlR@c;W9qVmO+daz2g4;{v|}?KZ+iS0>yc{TF|=n*Q?nctR-7xjP^Qlas%*09}?- zICXhX+`h%h$@`^cpY%P7d|_i^R_1@t9%e6!Ly+797Y8~Q*`2uE5B3IB+hx6d-)Bnp zc5d8QeTyIHj2)+f-Sp!hU)*@Vm#@hEqfUvLoW$Uvfy*n0Hh*?SV_uQTQ-T%!SM2a9b!GKZ_u?gvYZJOKpikz7DoJcXV?$eZu zr>|F()Li(_fN;!z;Z2*7vk-C;gotBvASmf$6UXL2NW@Gmd^!)wF+?*P>_2z)t>0!* Q8Vl0m>FVdQ&MBb@0L=l}?EnA( diff --git a/mods/ITEMS/mcl_chests/textures/mcl_chests_inventory_chest_large.png b/mods/ITEMS/mcl_chests/textures/mcl_chests_inventory_chest_large.png deleted file mode 100644 index 98f738faaa88d47e73c0786c910bb96d9ba70c41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1562 zcmeAS@N?(olHy`uVBq!ia0y~yVD@8RVBut828uA3xV`{V`~f~8u0Yz|-F@-m#dGJ* z{r~^}flbGk0)-e$g8YIR9G=}sV_;z2>FMGaQo;E4?#50XLjl)|*H5biXqNml)SUJ{ zOQ&;xfYWKqZ=dy^W=L4I1GVA;HZw!7Wl5O#s@p$gn_pA;-CDZ5_wHrel1rR(OPtg} z)CEsXGcnW(txtihHq%V|vF){r>MYr<{J@_;JFP5$FnVSbXW}&968A#5cQq zdGY%jH*A0YMKKxfL2!T|`~wmv)`h4pvG@uKiY@)U{dW*SasI}SZ{^D1p!nX`dw25v z`DB_7iZ-~Lk)spUv7NzKf3+Cw0Hr|HTqvtCuZ)AZp=czZWfj zRtv!bPzqTbSsEset_{Pu`nT2dLnDpf$;$6k2fC+0ee4}?|qzD%>;A>BrM)Z-v5{PMAqzmSo-6(k3Xvqz4u4*HIacr zN?<*K1cl6QP)NXlnt$5Vty0HqAOHTxen36`-r94=cprcM-tu4g6(U*)1~cgnpZvZy lEcO2TF+yjt1Jzf1=);T3K0RSi`o+AJN diff --git a/mods/ITEMS/mcl_crafting_table/depends.txt b/mods/ITEMS/mcl_crafting_table/depends.txt index e3b8528c2..97aafc582 100644 --- a/mods/ITEMS/mcl_crafting_table/depends.txt +++ b/mods/ITEMS/mcl_crafting_table/depends.txt @@ -1,2 +1,3 @@ mcl_init +mcl_formspec mcl_sounds diff --git a/mods/ITEMS/mcl_crafting_table/init.lua b/mods/ITEMS/mcl_crafting_table/init.lua index 9d6979a4e..bcc8fc43b 100644 --- a/mods/ITEMS/mcl_crafting_table/init.lua +++ b/mods/ITEMS/mcl_crafting_table/init.lua @@ -16,13 +16,17 @@ minetest.register_node("mcl_crafting_table:crafting_table", { player:get_inventory():set_size("craft", 9) local form = "size[9,8.75]".. - "background[-0.19,-0.25;9.41,9.49;crafting_formspec_bg2.png^crafting_inventory_workbench.png]".. + "background[-0.19,-0.25;9.41,9.49;crafting_inventory_workbench.png]".. "label[0,4;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. "list[current_player;main;0,4.5;9,3;9]".. + mcl_formspec.get_itemslot_bg(0,4.5,9,3).. "list[current_player;main;0,7.74;9,1;]".. + mcl_formspec.get_itemslot_bg(0,7.74,9,1).. "label[1.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Crafting"))).."]".. "list[current_player;craft;1.75,0.5;3,3;]".. + mcl_formspec.get_itemslot_bg(1.75,0.5,3,3).. "list[current_player;craftpreview;6.1,1.5;1,1;]".. + mcl_formspec.get_itemslot_bg(6.1,1.5,1,1).. "image_button[0.75,1.5;1,1;craftguide_book.png;__mcl_craftguide;]".. "tooltip[__mcl_craftguide;"..minetest.formspec_escape(S("Recipe book")).."]".. "listring[current_player;main]".. diff --git a/mods/ITEMS/mcl_crafting_table/textures/crafting_inventory_workbench.png b/mods/ITEMS/mcl_crafting_table/textures/crafting_inventory_workbench.png index 46ce1092eeae5ca86913be70ebbf4e76d120d6fd..807b25f02f8205ce0d841cf1c8a51bb51ce77964 100644 GIT binary patch literal 281 zcmeAS@N?(olHy`uVBq!ia0y~yVD%3lWUa{cx79#ec`nF*6i6cvc3<8ORsdAN@`;O0%SzUH&&#xQv zcKrRJRV}sn!HxaO7dYpZIH{Lh;+(tUSKgNsXLtO$F)w4|@*C-OU&Up@H>sEW`nI`N zy~Idk?wgYfN;auCXWi$V%j2b94H3Bo)ZBdO(=z>SGX4M5)o%y;{eq`D&?9qU6g*5o0zk)Lh(m*n zu=u}Eb$R>V-I#|fIiQF)==K?%ds+}vQd7VkR?zSNZRWYY?7p{|vY>Q9N^Bz~5=3&s zop^$`f44J!Jm>MPmdKI;Vst0A#K;Q~&?~ diff --git a/mods/ITEMS/mcl_furnaces/depends.txt b/mods/ITEMS/mcl_furnaces/depends.txt index 441fdfde6..365076c1f 100644 --- a/mods/ITEMS/mcl_furnaces/depends.txt +++ b/mods/ITEMS/mcl_furnaces/depends.txt @@ -1,4 +1,5 @@ mcl_init +mcl_formspec mcl_core mcl_sounds mcl_craftguide diff --git a/mods/ITEMS/mcl_furnaces/init.lua b/mods/ITEMS/mcl_furnaces/init.lua index c17b29b78..871e38ab0 100644 --- a/mods/ITEMS/mcl_furnaces/init.lua +++ b/mods/ITEMS/mcl_furnaces/init.lua @@ -7,14 +7,18 @@ local S = minetest.get_translator("mcl_furnaces") local function active_formspec(fuel_percent, item_percent) return "size[9,8.75]".. - "background[-0.19,-0.25;9.41,9.49;crafting_inventory_furnace.png]".. "label[0,4;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. "list[current_player;main;0,4.5;9,3;9]".. + mcl_formspec.get_itemslot_bg(0,4.5,9,3).. "list[current_player;main;0,7.74;9,1;]".. + mcl_formspec.get_itemslot_bg(0,7.74,9,1).. "label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Furnace"))).."]".. "list[current_name;src;2.75,0.5;1,1;]".. + mcl_formspec.get_itemslot_bg(2.75,0.5,1,1).. "list[current_name;fuel;2.75,2.5;1,1;]".. + mcl_formspec.get_itemslot_bg(2.75,2.5,1,1).. "list[current_name;dst;5.75,1.5;1,1;]".. + mcl_formspec.get_itemslot_bg(5.75,2.5,1,1).. "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:".. (100-fuel_percent)..":default_furnace_fire_fg.png]".. "image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[lowpart:".. @@ -30,14 +34,18 @@ local function active_formspec(fuel_percent, item_percent) end local inactive_formspec = "size[9,8.75]".. - "background[-0.19,-0.25;9.41,9.49;crafting_inventory_furnace.png]".. "label[0,4;"..minetest.formspec_escape(minetest.colorize("#313131", S("Inventory"))).."]".. "list[current_player;main;0,4.5;9,3;9]".. + mcl_formspec.get_itemslot_bg(0,4.5,9,3).. "list[current_player;main;0,7.74;9,1;]".. + mcl_formspec.get_itemslot_bg(0,7.74,9,1).. "label[2.75,0;"..minetest.formspec_escape(minetest.colorize("#313131", S("Furnace"))).."]".. "list[current_name;src;2.75,0.5;1,1;]".. + mcl_formspec.get_itemslot_bg(2.75,0.5,1,1).. "list[current_name;fuel;2.75,2.5;1,1;]".. + mcl_formspec.get_itemslot_bg(2.75,2.5,1,1).. "list[current_name;dst;5.75,1.5;1,1;]".. + mcl_formspec.get_itemslot_bg(5.75,1.5,1,1).. "image[2.75,1.5;1,1;default_furnace_fire_bg.png]".. "image[4.1,1.5;1.5,1;gui_furnace_arrow_bg.png^[transformR270]".. "image_button[8,0;1,1;craftguide_book.png;craftguide;]".. diff --git a/mods/ITEMS/mcl_furnaces/textures/crafting_inventory_furnace.png b/mods/ITEMS/mcl_furnaces/textures/crafting_inventory_furnace.png deleted file mode 100644 index 344c624786973aff2d0e3e95a3e8770f1a44c4d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1166 zcmeAS@N?(olHy`uVBq!ia0y~yVDXk~B;lSsJ7bBo3uejH`5?bgFvW{QdK8tkmKuc~tRvUY*USc~RW| z`Y&{bLd~VXc&MXct^zxsNaK#o;}2Ax{cK)=zjNR0_bavD|9m^|$8Fn-v-bOA_=HF! zu>}Bz3;*iBe;!ugk1LK)#6L{kHYfDgDoKB-`Fjp=eT$KKJhwN!_wHq@l1rR(OPtg} z)CEsnMa+U z*PXoNbI-<&)w|}upO54SLWaWJh;A879E;meR?iQ8Im6Jb%>O$mtfchsI~lgs zdVLem86P|L?q%J+dL*lf^)4vbkhH;r6UjsHP<>w;wlw+KjT^SHjELyj@N~_k@Z57Z zZoFr>w)y!ZiI+CXIdA5@d;YxzDYan4K2QKjnw)g|WbgS^B|Z|;yO)DX3N&y)Ua&u| TwRuvc8A!s@)z4*}Q$iB}i$H;4PxezmKQricsj z>|x=5e{^zfzS83ZADV$$aey6{78`}XpZHj8{+tGD-+8V3&n`apj&p8_llt5XV5;O2 z=iCdP>Rseir%Sj)B>|O8+1Kp}q%u&x*KEAtkgb-*46umQ8;A z7aUrUuqe%Wv-{%4`-z{yVex*C`k(*E9v~2RF#mxf8Ce@l94X4-X<*Oy$f=f(&uy$` zLc~o1*fH04l)fovVBh)qY2?eCJH}=Hb^aZ|!~loSnQhaQ0GLh*A e;bN+>4w%(9R>#V>JWt#RGSk!5&t;ucLK6UK|7Ak}