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 zcmV;N0Av4&P)8IuY0000aP)t-s0000b zCM-flNh~fiI66Oses`0Oh_9@rS6W>?Jv~%WPitdd{MKGp00001bW%=J06^y0W&i*H zCP_p=RCobn7?D88M92ip2rEl312ZH{Bp@P=KmcaUTDf``0|NkZ00w%nd}$^C0000< KMNUMnLSTX!d@6GQ 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 zcmV;O0Al}%P)8IuY0000UP)t-s0000z zJv~WDNh~ZZQ{eKuFO@8O(4ENezQAO5IDqj0iZRC88C~NH2q`F;bo=$-n>r4PFT<$U@Ki00000 LNkvXXu0mjfR>d$C 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 zcmV;H0BQe;P)8IuY0000IP)t-s0001_ zcp}uNHR{1)x{NB8WF&6hwD$l200DGTPE!Ct=GbNc001&cL_t(|0b>{efKh-^0L)Mn z6ch$COauj;!3-48IuY0000LP)t-s0001l zes`0Oh-+hBudJm#Jv~%WPcZQ|i~s-t0d!JMQvg8b*k%9#03}I8K~#7FV;GS@NZ3#q u%n(sFQ3f+i9E~6hBW0*mSZY`*0|Njq9&#Q 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 zcmV-}0DS+6P)8IuY0000IP)t-sV{dGY zgl=?bR$x*@hJ9+9lz$+1$6){f00DGTPE!Ct=GbNc0019JL_t(|0b>~1Ku}3g3Cu7C l0x-kHCDaAX2n7NL1^_g<1E?o?8%6*C002ovPDHLkV1l|nBgOy# 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 zcmVwNGr#gt2S7Eo&r!DpXK@wFZx&m2N2BAE_Q%FL>*iTFqWyk-SJ@DGr^5lp=+ zpYyc>QRZMC6%^1D#++-8IuY0000UP)t-s0000z zJv~WDNvPug?f3sIEG&1<`(LiuQhQ#tw#=0m{xUMyxX# zL<1z!(i&L)zS05sha?7=qNK>z>% M07*qoM6N<$g7R%ibpQYW diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_gold_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_gold_preview.png deleted file mode 100644 index 746ddda0a9f897d3d5be67088bc258ecec59a3e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmV;*05$)KP)8IuY0000XP)t-s0002G zj4ITpHDE}5O+09%cp~b-VwPkiYfe2+HY~YY#7P)8IuY0000dP)t-s0001! zj)=*}!GwNyYhzwpK{0DiJ+G{#R8ddm8IuY0000IP)t-s0001n zeQKJNe{^V8rlgOyx1^_gF^vEK00DGTPE!Ct=GbNc001&cL_t(|0b`&Z5E3?21T#dO zR2(6U5LZW3DMJ+}VF<%D1dU8IuY0000LP)t-s0001M zV_t-Qcdx9a$;ZKyj)>*t;M&k1egFUf0d!JMQvg8b*k%9#04_;HK~#7FV_;wqGBH(T z00B{B(;zS-P$f_a%rIaxU3eEa?XibwxlYv=LgG4Rzf@DwlvPd~_$%kbo9awEvFk|4ie zhW~KD$i(!Y$=2hjIs*fPy{C&~NCjhZLV|!1XIKhD+DuMgWxOSEY+Ff=f6{ocsT9l*fAz~JfX=d#Wzp$P!o CqDCtK 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!ia0y~yU=UznU{GLTW?*1=x%}yW1_lO|0G|+71_p**JzCRJ zRF+gIwZ+Z!waK`$-1ODKB%VA5zB&e;0tTL3hPlZL>lqjrcuIo&f*Jlp03#C<(}wy3 z2@DJjww^AIAr*|t2?+v5oM9;pjHwqLlno9W?DY{iBak4Tz-)Zv2G1#lAkH_P32d7g pW;0B9G~*~k$fnJWi8GiO5{%fUm#>q`VPIfj@O1TaS?83{1OTm*JX-(& 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!ia0y~yU=UznU{GLTW?*1=x%}yW1_lO+0G|+71_p-g+Lp#Re+530m3i!m@TFqQ=Q1v5B2yOGAgz+mC&;uuoFn4FLxU}VU} z66Dafaii7@#T9GRSkgE)a2q&F=rHOev~e*v3%m3(a=U~lF|3w2yn&TL`Vfn5poSL6 OZU#?RKbLh*2~7ZS<1PCD 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 zcmV;E0Brw>P)8IuY0000IP)t-s0001B zQbcrUR)&3Qnv{R0q>rq3zbgO$00DGTPE!Ct=GbNc001vZL_t(|0b^ib5Hb{2WB>t^ zKoMs!!$?s`8O$(XR$vA*6c`wozzhKf21bSv1OSC_0%cLwiN*i`002ovPDHLkV1l&4 BC!YWS diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_chain_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_chain_preview.png deleted file mode 100644 index 06a29c3c74e153f1169a4fbbf327b4830037ddae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmV;00DAw4P)8IuY0000IP)t-s0000b zCM-flNh~fiI66O9T3y)OJJA3D00DGTPE!Ct=GbNc001FLL_t(|0b>}%K*&VM1k7*_ nbPfbFL`_5~5pe_p65Rj*@+b&-1c<)N00000NkvXXu0mjf?jIr? 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 zcmV;$06PDPP)ok1PutD ze(-<%x*K2&Vx#d18vs*We(v{wENsFCz%;CQ^dF`P#0H5GX8^heGy@46;95HmqydCs zVF2fY@o?r}Oqwy&>fO0QTAB+M3YZ8IuY0000UP)t-s0000_ zHY-~}F>6je%(Ir_&#In@dAf`$)TcG-!D61;qb>jd00DGTPE!Ct=GbNc0028lL_t(| z0b>|6KuB3g5zKH6Gz|eWTtY%13|CiI7ce8m#l?+~IqU`O1z-lp1da({24@3j144>4 Z004+P2`fx=L7)Ht002ovPDHLkV1i&TGOPdq diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_iron_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_iron_preview.png deleted file mode 100644 index 452447fd71f86f3ab4417ebf1d88a76ec46b56dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmV;Z09XHsP)8IuY0000OP)t-s0000~ zQBP}QUOhcMgnoCEj)RB!pd=&gKR!&90d2KeU<_iT z@d+CMQaEc$Js5-7XnZ;t08+SYNk15a*ib%&1|azK^#V*2h)r4`;=?pZdZPdUIrFz% T^XTRM00000NkvXXu0mjfj_@~K 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