From 2c16c4db690b9a85c94978d5c528536b95243630 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Thu, 9 Mar 2017 06:55:03 +0100
Subject: [PATCH] Add armor slots in creative inventory (WIP)

---
 mods/HUD/craftingpack/crafting/creative.lua   |  21 +++++++++++++++---
 .../crafting_inventory_creative_survival.png  | Bin 0 -> 3804 bytes
 .../crafting/textures/fnt_inv.png             | Bin 895 -> 0 bytes
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 mods/HUD/craftingpack/crafting/textures/crafting_inventory_creative_survival.png
 delete mode 100644 mods/HUD/craftingpack/crafting/textures/fnt_inv.png

diff --git a/mods/HUD/craftingpack/crafting/creative.lua b/mods/HUD/craftingpack/crafting/creative.lua
index 1aa30142f7..29df46978c 100644
--- a/mods/HUD/craftingpack/crafting/creative.lua
+++ b/mods/HUD/craftingpack/crafting/creative.lua
@@ -209,15 +209,26 @@ crafting.set_creative_formspec = function(player, start_i, pagenum, show, page,
 	bg[name] = "crafting_creative_bg.png"
 		local inv_bg = "crafting_inventory_creative.png"
 		if name == "inv" then
+			inv_bg = "crafting_inventory_creative_survival.png"
 			-- Survival inventory slots
-			main_list = "image[-0.2,1.7;11.35,2.33;crafting_creative_bg.png]"..
-				"list[current_player;main;0,3.75;9,3;9]"..
+			main_list = "list[current_player;main;0,3.75;9,3;9]"..
+				-- 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]"..
+				--TODO: armor_slot_imgs..
 				-- crafting guide button
 				"image_button[9,1;1,1;craftguide_book.png;__mcl_craftguide;]"..
 				"tooltip[__mcl_craftguide;Show crafting recipes]"..
 				-- achievements button
 				"image_button[9,2;1,1;mcl_achievements_button.png;__mcl_achievements;]"..
 				"tooltip[__mcl_achievements;Achievements]"
+
+			-- For shortcuts
+			listrings = listrings ..
+				"listring[detached:"..playername.."_armor;armor]"..
+				"listring[current_player;main]"
 		else
 			inv_bg = inv_bg .. "^crafting_inventory_creative_scroll.png"
 			-- Creative inventory slots
@@ -237,6 +248,10 @@ crafting.set_creative_formspec = function(player, start_i, pagenum, show, page,
 			return "image[" .. offset[check] .. ";1.5,1.44;" .. img .. hoch[check].. "]" ..
 				"image[" .. boffset[check] .. ";1,1;crafting_creative_marker.png]"
 		end
+		local fnt = ""
+		if name ~= "inv" then
+			fnt = "image[0,1;5,0.75;fnt_"..name..".png]"
+		end
 		formspec = "size[10,9.3]"..
 			mcl_vars.inventory_header..
 			"background[-0.19,-0.25;10.5,9.87;"..inv_bg.."]"..
@@ -259,7 +274,7 @@ crafting.set_creative_formspec = function(player, start_i, pagenum, show, page,
 			"item_image_button[9.19,0;1,1;mcl_compass:compass;nix;]"..	--search
 			tab(name, "nix") ..
 			"tooltip[nix;Search Items]"..
-			"image[0,1;5,0.75;fnt_"..name..".png]"..
+			fnt..
 			"list[current_player;main;0,7;9,1;]"..
 			main_list..
 			"item_image_button[-0.1,8.37;1,1;mcl_core:apple;food;]"..	--foodstuff
diff --git a/mods/HUD/craftingpack/crafting/textures/crafting_inventory_creative_survival.png b/mods/HUD/craftingpack/crafting/textures/crafting_inventory_creative_survival.png
new file mode 100644
index 0000000000000000000000000000000000000000..c17a107214459e3eec99abf78b442ab19e54dd26
GIT binary patch
literal 3804
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
F{2Prna&rIx

literal 0
HcmV?d00001

diff --git a/mods/HUD/craftingpack/crafting/textures/fnt_inv.png b/mods/HUD/craftingpack/crafting/textures/fnt_inv.png
deleted file mode 100644
index 8012ea8ed9f4f60100fdfc3dbc2c846de28f0e3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 895
zcmbW0Ye-XZ7{>o)Wm&GEpxbImltomAk!j_jvdp5CE{d6(7hF{47B<bxwkX;t$VC^s
z+0F+U2U<46oRQ`UR}`2#<=U36X|v0j9p|XC?YJ}l$7UakzVzXFpWmkk9v<F{8T(SB
zqZUK~0HV`&rR)b_f;!9zQ>TP4S+BywHch%KyA*&mOUE_gj1DOSAYxrw%GQHt>O4JL
zuP%(4HR(C*7LKOiR{V;=$j^WI0vw8~czrGNZN_T0QDm@F(*ZYUEjXL}V<K?R{(lhR
z3T~v6VHm20@sHpZuf!Mhea`+O)3~IK7B3;qD^hO0{15JW?^?na-*JlAa>>uuSJJ#3
zRm9J`e>%nrx|>X6KBz~%!Z9~=(CMh5L6k|}5F*d|tT2;NyQDD>0&%Iz<foi*)Iy%1
zZdxmJ_H;wJ47bAkjYp>Hx4e0WY98XN$9%zFwn!!%^joN0r$nZl$D7-6d}gVStfwTM
zh`imX$iA0V34N7WOpa5qM{RP8wXiVTIYaL~>Myj^j=5<aUCpwsU+tWB9xw7jk5O60
z)e|?(^dRM}6@{t_HuC3)9h@hqNfsp$m;ujGc)S-~(u`XtLoFo2Ru67Q+qsfpGajol
z?bHx%)`Hmdy>uFxSP6}7V)C7~|2rG4KHpK?il-}4MX@;CR}ig!M(5<>zjGL7&}-3j
z4bjd1dRJq)LQf^|c~MOsE*Z+%N4LjYtmg;J5*a+8-X1E#Om(@08)phTwJlo=&SCPg
z0zU3Pq}qP!)=8uWgCBa$4z0a}DLsrUdI{-@!$>YMtl67{8fhch?0|JP0~(0uU$Uj!
zn?i-x%$TRmQ{gE?Fh7OC`zn*OAWO6}>5WfwED%g3<3nxw&@u>nDs)773)&469aVCb
z>4kXlB3ns6dXE^QwcJR9d6m4q6<!}Editn%{_+j9yRj_94ONR##`j7RUWj&ju+vI&
zK#02H9^Fn=H#?Z4<KY;h(9^q7ZwaCcl^PkgmKO<ZPd0s=5qUOZJ`aqVq~MdlYRdmM
n0ESiy0gw+&25)2k0y4qbv18)h^*03Jj{<2s_N6@BmUr$KOL6XJ