From 5de05b404e4b82150754fa257a0c1a5fcaef9346 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sat, 8 Jul 2017 16:28:25 +0200 Subject: [PATCH] Reorganize some GUI-related textures --- mods/HUD/mcl_inventory/creative.lua | 2 +- ..._blocks.png => mcl_inventory_fnt_blocks.png} | Bin ...{fnt_brew.png => mcl_inventory_fnt_brew.png} | Bin ..._combat.png => mcl_inventory_fnt_combat.png} | Bin ...{fnt_deco.png => mcl_inventory_fnt_deco.png} | Bin ...{fnt_food.png => mcl_inventory_fnt_food.png} | Bin ...{fnt_matr.png => mcl_inventory_fnt_matr.png} | Bin ...{fnt_misc.png => mcl_inventory_fnt_misc.png} | Bin .../{fnt_nix.png => mcl_inventory_fnt_nix.png} | Bin ...{fnt_rail.png => mcl_inventory_fnt_rail.png} | Bin ...stone.png => mcl_inventory_fnt_redstone.png} | Bin ...nt_tools.png => mcl_inventory_fnt_tools.png} | Bin mods/ITEMS/mcl_chests/init.lua | 16 ++++++++-------- .../textures/mcl_chests_fnt_chest.png} | Bin .../textures/mcl_chests_fnt_ender_chest.png} | Bin .../textures/mcl_chests_fnt_shulker_box.png} | Bin .../textures/mcl_chests_inventory_chest.png} | Bin .../mcl_chests_inventory_chest_large.png} | Bin 18 files changed, 9 insertions(+), 9 deletions(-) rename mods/HUD/mcl_inventory/textures/{fnt_blocks.png => mcl_inventory_fnt_blocks.png} (100%) rename mods/HUD/mcl_inventory/textures/{fnt_brew.png => mcl_inventory_fnt_brew.png} (100%) rename mods/HUD/mcl_inventory/textures/{fnt_combat.png => mcl_inventory_fnt_combat.png} (100%) rename mods/HUD/mcl_inventory/textures/{fnt_deco.png => mcl_inventory_fnt_deco.png} (100%) rename mods/HUD/mcl_inventory/textures/{fnt_food.png => mcl_inventory_fnt_food.png} (100%) rename mods/HUD/mcl_inventory/textures/{fnt_matr.png => mcl_inventory_fnt_matr.png} (100%) rename mods/HUD/mcl_inventory/textures/{fnt_misc.png => mcl_inventory_fnt_misc.png} (100%) rename mods/HUD/mcl_inventory/textures/{fnt_nix.png => mcl_inventory_fnt_nix.png} (100%) rename mods/HUD/mcl_inventory/textures/{fnt_rail.png => mcl_inventory_fnt_rail.png} (100%) rename mods/HUD/mcl_inventory/textures/{fnt_redstone.png => mcl_inventory_fnt_redstone.png} (100%) rename mods/HUD/mcl_inventory/textures/{fnt_tools.png => mcl_inventory_fnt_tools.png} (100%) rename mods/{HUD/mcl_inventory/textures/fnt_chest.png => ITEMS/mcl_chests/textures/mcl_chests_fnt_chest.png} (100%) rename mods/{HUD/mcl_inventory/textures/fnt_ender_chest.png => ITEMS/mcl_chests/textures/mcl_chests_fnt_ender_chest.png} (100%) rename mods/{HUD/mcl_inventory/textures/fnt_shulker_box.png => ITEMS/mcl_chests/textures/mcl_chests_fnt_shulker_box.png} (100%) rename mods/{HUD/mcl_inventory/textures/crafting_inventory_chest.png => ITEMS/mcl_chests/textures/mcl_chests_inventory_chest.png} (100%) rename mods/{HUD/mcl_inventory/textures/crafting_inventory_chest_large.png => ITEMS/mcl_chests/textures/mcl_chests_inventory_chest_large.png} (100%) diff --git a/mods/HUD/mcl_inventory/creative.lua b/mods/HUD/mcl_inventory/creative.lua index cbc78bd587..bd1f1b85b7 100644 --- a/mods/HUD/mcl_inventory/creative.lua +++ b/mods/HUD/mcl_inventory/creative.lua @@ -301,7 +301,7 @@ mcl_inventory.set_creative_formspec = function(player, start_i, pagenum, inv_siz end local fnt = "" if name ~= "inv" then - fnt = "image[0,1;5,0.75;fnt_"..name..".png]" + fnt = "image[0,1;5,0.75;mcl_inventory_fnt_"..name..".png]" end formspec = "size[10,9.3]".. mcl_vars.inventory_header.. diff --git a/mods/HUD/mcl_inventory/textures/fnt_blocks.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_blocks.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_blocks.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_blocks.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_brew.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_brew.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_brew.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_brew.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_combat.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_combat.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_combat.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_combat.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_deco.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_deco.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_deco.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_deco.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_food.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_food.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_food.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_food.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_matr.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_matr.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_matr.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_matr.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_misc.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_misc.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_misc.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_misc.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_nix.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_nix.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_nix.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_nix.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_rail.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_rail.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_rail.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_rail.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_redstone.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_redstone.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_redstone.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_redstone.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_tools.png b/mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_tools.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_tools.png rename to mods/HUD/mcl_inventory/textures/mcl_inventory_fnt_tools.png diff --git a/mods/ITEMS/mcl_chests/init.lua b/mods/ITEMS/mcl_chests/init.lua index 743b47707f..a276ed953b 100644 --- a/mods/ITEMS/mcl_chests/init.lua +++ b/mods/ITEMS/mcl_chests/init.lua @@ -119,8 +119,8 @@ minetest.register_node("mcl_chests:"..basename, { "mcl_chests:"..basename.."_"..pos.x.."_"..pos.y.."_"..pos.z, "size[9,8.75]".. mcl_vars.inventory_header.. - "background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]".. - "image[0,-0.2;5,0.75;fnt_chest.png]".. + "background[-0.19,-0.25;9.41,10.48;mcl_chests_inventory_chest.png]".. + "image[0,-0.2;5,0.75;mcl_chests_fnt_chest.png]".. "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]".. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. @@ -220,7 +220,7 @@ minetest.register_node("mcl_chests:"..basename.."_left", { minetest.show_formspec(clicker:get_player_name(), "mcl_chests:"..basename.."_"..pos.x.."_"..pos.y.."_"..pos.z, "size[9,11.5]".. - "background[-0.19,-0.25;9.41,12.5;crafting_inventory_chest_large.png]".. + "background[-0.19,-0.25;9.41,12.5;mcl_chests_inventory_chest_large.png]".. mcl_vars.inventory_header.. "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,0.5;9,3;]".. "list[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main;0,3.5;9,3;]".. @@ -329,7 +329,7 @@ minetest.register_node("mcl_chests:"..basename.."_right", { "mcl_chests:"..basename.."_"..pos.x.."_"..pos.y.."_"..pos.z, "size[9,11.5]".. - "background[-0.19,-0.25;9.41,12.5;crafting_inventory_chest_large.png]".. + "background[-0.19,-0.25;9.41,12.5;mcl_chests_inventory_chest_large.png]".. mcl_vars.inventory_header.. "list[nodemeta:"..pos_other.x..","..pos_other.y..","..pos_other.z..";main;0,0.5;9,3;]".. "list[nodemeta:"..pos.x..","..pos.y..","..pos.z..";main;0,3.5;9,3;]".. @@ -540,8 +540,8 @@ minetest.register_node("mcl_chests:ender_chest", { meta:set_string("formspec", "size[9,8.75]".. mcl_vars.inventory_header.. - "background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]".. - "image[0,-0.2;5,0.75;fnt_ender_chest.png]".. + "background[-0.19,-0.25;9.41,10.48;mcl_chests_inventory_chest.png]".. + "image[0,-0.2;5,0.75;mcl_chests_fnt_ender_chest.png]".. "list[current_player;enderchest;0,0.5;9,3;]".. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. @@ -610,8 +610,8 @@ for color, desc in pairs(boxtypes) do meta:set_string("formspec", "size[9,8.75]".. mcl_vars.inventory_header.. - "background[-0.19,-0.25;9.41,10.48;crafting_inventory_chest.png]".. - "image[0,-0.2;5,0.75;fnt_shulker_box.png]".. + "background[-0.19,-0.25;9.41,10.48;mcl_chests_inventory_chest.png]".. + "image[0,-0.2;5,0.75;mcl_chests_fnt_shulker_box.png]".. "list[current_name;main;0,0.5;9,3;]".. "list[current_player;main;0,4.5;9,3;9]".. "list[current_player;main;0,7.74;9,1;]".. diff --git a/mods/HUD/mcl_inventory/textures/fnt_chest.png b/mods/ITEMS/mcl_chests/textures/mcl_chests_fnt_chest.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_chest.png rename to mods/ITEMS/mcl_chests/textures/mcl_chests_fnt_chest.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_ender_chest.png b/mods/ITEMS/mcl_chests/textures/mcl_chests_fnt_ender_chest.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_ender_chest.png rename to mods/ITEMS/mcl_chests/textures/mcl_chests_fnt_ender_chest.png diff --git a/mods/HUD/mcl_inventory/textures/fnt_shulker_box.png b/mods/ITEMS/mcl_chests/textures/mcl_chests_fnt_shulker_box.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/fnt_shulker_box.png rename to mods/ITEMS/mcl_chests/textures/mcl_chests_fnt_shulker_box.png diff --git a/mods/HUD/mcl_inventory/textures/crafting_inventory_chest.png b/mods/ITEMS/mcl_chests/textures/mcl_chests_inventory_chest.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/crafting_inventory_chest.png rename to mods/ITEMS/mcl_chests/textures/mcl_chests_inventory_chest.png diff --git a/mods/HUD/mcl_inventory/textures/crafting_inventory_chest_large.png b/mods/ITEMS/mcl_chests/textures/mcl_chests_inventory_chest_large.png similarity index 100% rename from mods/HUD/mcl_inventory/textures/crafting_inventory_chest_large.png rename to mods/ITEMS/mcl_chests/textures/mcl_chests_inventory_chest_large.png