diff --git a/mods/HUD/mcl_inventory/creative.lua b/mods/HUD/mcl_inventory/creative.lua index d66aa06d2c..2f557171e4 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 0d411502d1..81619263d1 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 35db5e01d3..7cbfb5c2f0 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 bf028c2724..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_chain_preview.png and /dev/null differ 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 768d7bcdec..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_diamond_preview.png and /dev/null differ 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 f384a602c4..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_gold_preview.png and /dev/null differ diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_iron_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_iron_preview.png deleted file mode 100644 index 18cecdf557..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_iron_preview.png and /dev/null differ 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 d0457ce9a7..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_boots_leather_preview.png and /dev/null differ 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 af9c982fe5..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_chain_preview.png and /dev/null differ 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 d43b3cedec..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_diamond_preview.png and /dev/null differ 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 746ddda0a9..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_gold_preview.png and /dev/null differ diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_iron_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_iron_preview.png deleted file mode 100644 index 200e51d9cc..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_iron_preview.png and /dev/null differ 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 9d5a5a097e..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_chestplate_leather_preview.png and /dev/null differ 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 c76cd9d61b..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_chain_preview.png and /dev/null differ diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_diamond_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_diamond_preview.png deleted file mode 100644 index 1b8c5b1176..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_diamond_preview.png and /dev/null differ 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 4201916caa..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_gold_preview.png and /dev/null differ 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 00584e8de1..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_iron_preview.png and /dev/null differ 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 9f27bacb54..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_helmet_leather_preview.png and /dev/null differ 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 06a29c3c74..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_chain_preview.png and /dev/null differ 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 cbc9e032c4..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_diamond_preview.png and /dev/null differ diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_gold_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_gold_preview.png deleted file mode 100644 index 449eb5e1a2..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_gold_preview.png and /dev/null differ 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 452447fd71..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_iron_preview.png and /dev/null differ diff --git a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_leather_preview.png b/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_leather_preview.png deleted file mode 100644 index 6c032d690f..0000000000 Binary files a/mods/ITEMS/mcl_armor/textures/mcl_armor_leggings_leather_preview.png and /dev/null differ diff --git a/settingtypes.txt b/settingtypes.txt index 542711675a..8a0ebcce85 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