From f6f069025383350ca6ec50649cdd0bc5f84fd32e Mon Sep 17 00:00:00 2001 From: AFCMS Date: Sun, 1 May 2022 01:13:30 +0200 Subject: [PATCH] remove 2d inventory preview --- mods/HUD/mcl_inventory/creative.lua | 9 ++------- mods/HUD/mcl_inventory/init.lua | 7 +------ mods/ITEMS/mcl_armor/api.lua | 2 -- .../textures/mcl_armor_boots_chain_preview.png | Bin 156 -> 0 bytes .../textures/mcl_armor_boots_diamond_preview.png | Bin 157 -> 0 bytes .../textures/mcl_armor_boots_gold_preview.png | Bin 150 -> 0 bytes .../textures/mcl_armor_boots_iron_preview.png | Bin 140 -> 0 bytes .../textures/mcl_armor_boots_leather_preview.png | Bin 131 -> 0 bytes .../mcl_armor_chestplate_chain_preview.png | Bin 255 -> 0 bytes .../mcl_armor_chestplate_diamond_preview.png | Bin 210 -> 0 bytes .../mcl_armor_chestplate_gold_preview.png | Bin 202 -> 0 bytes .../mcl_armor_chestplate_iron_preview.png | Bin 215 -> 0 bytes .../mcl_armor_chestplate_leather_preview.png | Bin 150 -> 0 bytes .../textures/mcl_armor_helmet_chain_preview.png | Bin 149 -> 0 bytes .../textures/mcl_armor_helmet_diamond_preview.png | Bin 208 -> 0 bytes .../textures/mcl_armor_helmet_gold_preview.png | Bin 190 -> 0 bytes .../textures/mcl_armor_helmet_iron_preview.png | Bin 162 -> 0 bytes .../textures/mcl_armor_helmet_leather_preview.png | Bin 147 -> 0 bytes .../textures/mcl_armor_leggings_chain_preview.png | Bin 133 -> 0 bytes .../mcl_armor_leggings_diamond_preview.png | Bin 197 -> 0 bytes .../textures/mcl_armor_leggings_gold_preview.png | Bin 171 -> 0 bytes .../textures/mcl_armor_leggings_iron_preview.png | Bin 168 -> 0 bytes .../mcl_armor_leggings_leather_preview.png | Bin 165 -> 0 bytes settingtypes.txt | 3 --- 24 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_boots_chain_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_boots_diamond_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_boots_gold_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_boots_iron_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_boots_leather_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_chain_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_diamond_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_gold_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_iron_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_leather_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_chain_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_diamond_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_gold_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_iron_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_leather_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_chain_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_diamond_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_gold_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_iron_preview.png delete mode 100644 mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_leather_preview.png diff --git a/mods/HUD/mcl_inventory/creative.lua b/mods/HUD/mcl_inventory/creative.lua index d66aa06d2..2f557171e 100644 --- a/mods/HUD/mcl_inventory/creative.lua +++ b/mods/HUD/mcl_inventory/creative.lua @@ -340,12 +340,7 @@ function mcl_inventory.set_creative_formspec(player, start_i, pagenum, inv_size, inv_bg = "crafting_inventory_creative_survival.png" -- Show armor and player image - local player_preview - if minetest.settings:get_bool("3d_player_preview", true) then - player_preview = mcl_player.get_player_formspec_model(player, 3.9, 1.4, 1.2333, 2.4666, "") - else - player_preview = "image[3.9,1.4;1.2333,2.4666;"..mcl_player.player_get_preview(player).."]" - end + local player_preview = mcl_player.get_player_formspec_model(player, 3.9, 1.4, 1.2333, 2.4666, "") -- Background images for armor slots (hide if occupied) local armor_slot_imgs = "" @@ -368,7 +363,7 @@ function mcl_inventory.set_creative_formspec(player, start_i, pagenum, inv_size, end local stack_size = get_stack_size(player) - + -- 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).. diff --git a/mods/HUD/mcl_inventory/init.lua b/mods/HUD/mcl_inventory/init.lua index 0d411502d..81619263d 100644 --- a/mods/HUD/mcl_inventory/init.lua +++ b/mods/HUD/mcl_inventory/init.lua @@ -61,12 +61,7 @@ local function set_inventory(player, armor_change_only) inv:set_size("craft", 4) -- Show armor and player image - local player_preview - if minetest.settings:get_bool("3d_player_preview", true) then - player_preview = mcl_player.get_player_formspec_model(player, 1.0, 0.0, 2.25, 4.5, "") - else - player_preview = "image[1.1,0.2;2,4;"..mcl_player.player_get_preview(player).."]" - end + local player_preview = mcl_player.get_player_formspec_model(player, 1.0, 0.0, 2.25, 4.5, "") local armor_slots = {"helmet", "chestplate", "leggings", "boots"} local armor_slot_imgs = "" diff --git a/mods/ITEMS/mcl_armor/api.lua b/mods/ITEMS/mcl_armor/api.lua index 35db5e01d..7cbfb5c2f 100644 --- a/mods/ITEMS/mcl_armor/api.lua +++ b/mods/ITEMS/mcl_armor/api.lua @@ -94,7 +94,6 @@ function mcl_armor.register_set(def) local on_unequip_callbacks = def.on_unequip_callbacks or {} local on_break_callbacks = def.on_break_callbacks or {} local textures = def.textures or {} - local previews = def.previews or {} local inventory = def.inventory or {} local durabilities = def.durabilities or {} local element_groups = def.element_groups or {} @@ -135,7 +134,6 @@ function mcl_armor.register_set(def) _on_break = on_break_callbacks[name] or def.on_break, _mcl_armor_element = name, _mcl_armor_texture = textures[name] or modname .. "_" .. itemname .. ".png", - _mcl_armor_preview = previews[name] or modname .. "_" .. itemname .. "_preview.png", }) if def.craft_material then diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_chain_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_chain_preview.png deleted file mode 100644 index bf028c2724094d9a9bbce2c2fdba51ac58ba1aa3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNT~$)gt!7}RW%(aS5F;1V+$+$ zmb&uEeI4u9EDeu}wY9Yk3G~lSj{9>hE)1xSu_VYZn8D%MjWi%f&C|s(q=GS7Vxq$d zmlG^!IJCX>nT=I^R1}o@92nBhMD45+XJ%$7VqmMgTe~DWM4f8GI^p diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_diamond_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_diamond_preview.png deleted file mode 100644 index 768d7bcdec0545c89d30f4d7421c7b32fd6be2c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 157 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNXZ5Ggt!7}TU%RCPfr~ko#5#Q z&e?};C0vgKo5t-V%0^WXFT+qR~ZJ)(>QqmXnP!|)(NNczkwPVJYD@<);T3K0RUFT BFckm* diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_gold_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_gold_preview.png deleted file mode 100644 index f384a602c498dd728595a537e78282be558b5fc5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNC^e_gt!9fB^63nmYcphn6#@$ zYg&p*-n}i~fuf8hL4Lsu4$p3+0XasVE{-7;jL8y=4S@}T3}*sFL`2w(eOOrM9^?@f tbXPYxe9_aDbP0l+XkK(4r=$ diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_leather_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_leather_preview.png deleted file mode 100644 index d0457ce9a7d955896fd0f8d0139c8f0a5b39e674..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNC^e_gt#W>=k&JZm1Kk^1i7@; zX3d&XuTXwG5h%-8666=m;PC858jvIJ>Eakt!I&&@(;>h!fb)z28||b{UMcMcRLbD#>gTe~DWM4fx;`Vu diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_chain_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_chain_preview.png deleted file mode 100644 index af9c982fe54dd7307e125c4adfbfac6db0443727..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!3-pI!a4o{DVqSF5LX~Qxv%5o@q?;rI+2p{ zPOhFhdd3!3_Uji+Sifdzc5+;Vj= z^)r?P`2{mLJiCzw

_kIEGX(-aT`bky(MqH84i$#lPL(0`D&<+JAyEX`kBbnh%CY zr+Al%1!VIbOrP)lajTrdc^M~7rI~yIr_QWe+xf$TVNV*X!w3Eedj);=YR~_?l_~I9 zf}E(x1>s|Jvd>%IOL${?Z$Ssg{`U>bc@22WQ%mvv4FO#tnw BVJZLs diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_diamond_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_diamond_preview.png deleted file mode 100644 index d43b3cedec607d213131735e032d8f939a1f2eef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNXZ5Ggt!7}TU%RCPtO&P{=fbH zUq?r${M_&ObvJ^iA9SsqcOvAgHc$m)NswPKgTu2MX+Tbrr;B4q1!M98xrC4)AqL}? zSRbCoDH_hZ3X3eA6`Wh0(hG0$EGui{W4zdR&fyqe+f2q&=k(mx7)!b^t6aJy70KLq zO8N5TbuejKib}Sht-qOeTinbR?vqkLMT{jue!&b5&u*jvIpLlzjv*C{$qVEJSQG^W zgvvr#F0RSya`a?$U|SrJG-DA%hoV%R6i3nqtyQd?tPK*4iy9XxuvM>|6;Q!A;h>?d w$(BuwOXkl!dXO`JMRcqSU@h_q|yB_#x;FVJRSNO&l;szcFl0?;M~Pgg&e IbxsLQ0O!F)0RR91 diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_leather_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_leather_preview.png deleted file mode 100644 index 9d5a5a097e73aeeefc06feeb97a2694c873fcc3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNC^e_gt!9fw%V*&Q|e1H!j>)R z-?n|p@@m6gpeSQWkY6x^!?PP{K#q~8i(^OyWAXwy0U@&x7Gsw=Au@_R0^#l diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_chain_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_chain_preview.png deleted file mode 100644 index c76cd9d61b8ac128b633c531a2331afb4210f87f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 149 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNQnmcgt!9f?BuwXy7KjFmYzI* zaB^SA(N-&lL`2{mLJiCzwH1W!N6lgserXL2J@k3dO~UogXeIACOA z`p;zRaa0{BXYc9a7*fHQoRA=3#2J>t(D>w2k+FgD9;H1(X9^M`4=|?rBqTH#$Vf<7 u9PBy4)~D&v^?OYW!|TKL(h_Z&3=9oST)#Ima|Zy8V(@hJb6Mw<&;$V7qDCtK diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_gold_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_gold_preview.png deleted file mode 100644 index 4201916caa17a5d9d514feb328865cec352aff37..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNT~$)gt!9fT|HXUQdE{yD7D4S z^tH*jvfT95!6cqM2EIB5o&pA*T!y*H3+sXEcuIo&f*Jlp03#C<(}wy32|#gMPZ!6K z3dZDw1OX$?uoMQy)Qb+v28Rvy`Usp6NDxn8Ha>EL=afPa=bO$1w#^K)874fMag-rs f)8@v+8B7cbMr_l|*Gc674Px+g^>bP0l+XkKt&==k diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_iron_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_iron_preview.png deleted file mode 100644 index 00584e8de1f73ca3749fd2553d24d7adbef73e81..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 162 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNJ#|vgt!9f?Buw~eI4u9EIoPr zU`t(jNTC1ICl9K`FN*=?7)yfuf*Bm1-ADs+EIeHtLn;`P6A}cB47pf>9NIQ+)S98V zVvQP08pj5117`^xMxBH@{8E&Bif diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_leather_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_leather_preview.png deleted file mode 100644 index 9f27bacb5416e3004514f22e4a820b7b9e82b0c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 147 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!VDx|E`RzTNC^e_gt!9fgdmrajIg%atXWg) zmo4dEQ@&ptD9Tt8KgoNzh8a;AW}pCk>8DmX3X=fr=SCUHx3vIVCg!0PY_m8~^|S diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_diamond_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_diamond_preview.png deleted file mode 100644 index cbc9e032c4c76ec69e16c6f131284552e3ca4033..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!3HFyJAa%3Qazq7jv*C{$qTF|OiW6gGC47k z>5`8Zmq3(PQ>$l0N2jODjF}S?k2C}taJe=1^_{Daj*d29+j#LO3opmKx)1e#c1b7j zBrX2PDa{ZZQ}^zBy-v;{wgV<>D!#}s<2=IFDVWZ%i_L_YQ~E)aHUAREmc&Gc=gm(t s3f9N5gDC+cTS| zJvzT?UT5X59<3|OOoaj3q&S!3+-1ZlnP@cAhSdAr*|t5=R_7E(S=PDJTsrWHP=J z6ytn==ex*vffZ7Ut_I3FuBIGkIQ#?sn>6?ey&JRIjd)rc*(R|uBztn6`la(>8qg#L MPgg&ebxsLQ02o3v!T5`8Zmq3(PQ>$l0N2jODjF}TNn%xd+NU$zmprZW7-p*$VWA4_-1fHbDA33ENf-JJV zY$cj+WYkzmFa+($@w5kW0_mdKI;Vst0FLlCT>t<8 diff --git a/settingtypes.txt b/settingtypes.txt index 542711675..8a0ebcce8 100644 --- a/settingtypes.txt +++ b/settingtypes.txt @@ -97,9 +97,6 @@ fire_animation_frames (Fire Animation Frames) int 8 # Whether to animate chests when open / close animated_chests (Animated chests) bool true -# Whether to preview the player in inventory in 3D (requires Minetest 5.4) -3d_player_preview (3D Player preview) bool true - # The maximum number of boss bars to simultaniously display on the screen max_bossbars (Maximum Boss bars) int 5