From fb251db925ce500cb81421290e5a47ddb6e6913d Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 18 Feb 2020 15:44:54 +0100 Subject: [PATCH] =?UTF-8?q?Rename=20mod:=203d=5Farmor=20=E2=86=92=20mcl=5F?= =?UTF-8?q?armor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mods/ENTITIES/mobs_mc/villager.lua | 18 +- mods/HUD/mcl_hbarmor/README.md | 2 +- mods/HUD/mcl_hbarmor/init.lua | 2 +- mods/HUD/mcl_hbarmor/mod.conf | 2 +- mods/HUD/mcl_inventory/creative.lua | 2 +- mods/HUD/mcl_inventory/depends.txt | 2 +- mods/HUD/mcl_inventory/init.lua | 2 +- .../ITEMS/REDSTONE/mcl_dispensers/depends.txt | 2 +- mods/ITEMS/mcl_fishing/init.lua | 2 +- .../sounds/3d_armor_equip_generic.ogg | Bin 17882 -> 0 bytes .../3d_armor_stand/README.txt | 4 +- .../3d_armor_stand/depends.txt | 2 +- .../minetest-3d_armor/3d_armor_stand/init.lua | 3 + mods/ITEMS/minetest-3d_armor/README.md | 32 +--- .../{3d_armor => mcl_armor}/README.txt | 14 +- .../minetest-3d_armor/mcl_armor/alias.lua | 23 +++ .../{3d_armor => mcl_armor}/armor.lua | 24 +-- .../{3d_armor => mcl_armor}/depends.txt | 0 .../{3d_armor => mcl_armor}/description.txt | 0 .../{3d_armor => mcl_armor}/init.lua | 164 +++++++++--------- .../locale/mcl_armor.de.tr} | 2 +- .../locale/mcl_armor.es.tr} | 2 +- .../locale/template.txt | 2 +- .../models/mcl_armor_character.b3d} | Bin .../models/mcl_armor_character.blend} | Bin .../sounds/mcl_armor_equip_chainmail.ogg} | Bin .../sounds/mcl_armor_equip_diamond.ogg} | Bin .../sounds/mcl_armor_equip_iron.ogg} | Bin .../sounds/mcl_armor_equip_leather.ogg} | Bin .../sounds/mcl_armor_unequip_chainmail.ogg} | Bin .../sounds/mcl_armor_unequip_diamond.ogg} | Bin .../sounds/mcl_armor_unequip_iron.ogg} | Bin .../sounds/mcl_armor_unequip_leather.ogg} | Bin .../textures/mcl_armor_boots_chain.png} | Bin .../mcl_armor_boots_chain_preview.png} | Bin .../textures/mcl_armor_boots_diamond.png} | Bin .../mcl_armor_boots_diamond_preview.png} | Bin .../textures/mcl_armor_boots_gold.png} | Bin .../mcl_armor_boots_gold_preview.png} | Bin .../textures/mcl_armor_boots_iron.png} | Bin .../mcl_armor_boots_iron_preview.png} | Bin .../textures/mcl_armor_boots_leather.png} | Bin .../mcl_armor_boots_leather_preview.png} | Bin .../textures/mcl_armor_chestplate_chain.png} | Bin .../mcl_armor_chestplate_chain_preview.png} | Bin .../mcl_armor_chestplate_diamond.png} | Bin .../mcl_armor_chestplate_diamond_preview.png} | Bin .../textures/mcl_armor_chestplate_gold.png} | Bin .../mcl_armor_chestplate_gold_preview.png} | Bin .../textures/mcl_armor_chestplate_iron.png} | Bin .../mcl_armor_chestplate_iron_preview.png} | Bin .../mcl_armor_chestplate_leather.png} | Bin .../mcl_armor_chestplate_leather_preview.png} | Bin .../textures/mcl_armor_helmet_chain.png} | Bin .../mcl_armor_helmet_chain_preview.png} | Bin .../textures/mcl_armor_helmet_diamond.png} | Bin .../mcl_armor_helmet_diamond_preview.png} | Bin .../textures/mcl_armor_helmet_gold.png} | Bin .../mcl_armor_helmet_gold_preview.png} | Bin .../textures/mcl_armor_helmet_iron.png} | Bin .../mcl_armor_helmet_iron_preview.png} | Bin .../textures/mcl_armor_helmet_leather.png} | Bin .../mcl_armor_helmet_leather_preview.png} | Bin .../textures/mcl_armor_inv_boots_chain.png} | Bin .../textures/mcl_armor_inv_boots_diamond.png} | Bin .../textures/mcl_armor_inv_boots_gold.png} | Bin .../textures/mcl_armor_inv_boots_iron.png} | Bin .../textures/mcl_armor_inv_boots_leather.png} | Bin .../mcl_armor_inv_chestplate_chain.png} | Bin .../mcl_armor_inv_chestplate_diamond.png} | Bin .../mcl_armor_inv_chestplate_gold.png} | Bin .../mcl_armor_inv_chestplate_iron.png} | Bin .../mcl_armor_inv_chestplate_leather.png} | Bin .../textures/mcl_armor_inv_helmet_chain.png} | Bin .../mcl_armor_inv_helmet_diamond.png} | Bin .../textures/mcl_armor_inv_helmet_gold.png} | Bin .../textures/mcl_armor_inv_helmet_iron.png} | Bin .../mcl_armor_inv_helmet_leather.png} | Bin .../mcl_armor_inv_leggings_chain.png} | Bin .../mcl_armor_inv_leggings_diamond.png} | Bin .../textures/mcl_armor_inv_leggings_gold.png} | Bin .../textures/mcl_armor_inv_leggings_iron.png} | Bin .../mcl_armor_inv_leggings_leather.png} | Bin .../textures/mcl_armor_leggings_chain.png} | Bin .../mcl_armor_leggings_chain_preview.png} | Bin .../textures/mcl_armor_leggings_diamond.png} | Bin .../mcl_armor_leggings_diamond_preview.png} | Bin .../textures/mcl_armor_leggings_gold.png} | Bin .../mcl_armor_leggings_gold_preview.png} | Bin .../textures/mcl_armor_leggings_iron.png} | Bin .../mcl_armor_leggings_iron_preview.png} | Bin .../textures/mcl_armor_leggings_leather.png} | Bin .../mcl_armor_leggings_leather_preview.png} | Bin .../minetest-3d_armor/wieldview/README.txt | 2 +- .../minetest-3d_armor/wieldview/depends.txt | 2 +- mods/MISC/mcl_temp_helper_recipes/init.lua | 8 +- mods/PLAYER/mcl_death_drop/depends.txt | 2 +- mods/PLAYER/mcl_playerinfo/depends.txt | 1 - mods/PLAYER/mcl_playerplus/depends.txt | 1 - mods/PLAYER/mcl_playerplus/init.lua | 1 - mods/PLAYER/mcl_skins/depends.txt | 2 +- mods/PLAYER/mcl_skins/init.lua | 2 +- tools/Conversion_Table.csv | 40 ++--- 103 files changed, 185 insertions(+), 182 deletions(-) delete mode 100644 mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_generic.ogg rename mods/ITEMS/minetest-3d_armor/{3d_armor => mcl_armor}/README.txt (73%) create mode 100644 mods/ITEMS/minetest-3d_armor/mcl_armor/alias.lua rename mods/ITEMS/minetest-3d_armor/{3d_armor => mcl_armor}/armor.lua (94%) rename mods/ITEMS/minetest-3d_armor/{3d_armor => mcl_armor}/depends.txt (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor => mcl_armor}/description.txt (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor => mcl_armor}/init.lua (60%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/locale/3d_armor.de.tr => mcl_armor/locale/mcl_armor.de.tr} (97%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/locale/3d_armor.es.tr => mcl_armor/locale/mcl_armor.es.tr} (97%) rename mods/ITEMS/minetest-3d_armor/{3d_armor => mcl_armor}/locale/template.txt (95%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/models/3d_armor_character.b3d => mcl_armor/models/mcl_armor_character.b3d} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/models/3d_armor_character.blend => mcl_armor/models/mcl_armor_character.blend} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/sounds/3d_armor_equip_chainmail.ogg => mcl_armor/sounds/mcl_armor_equip_chainmail.ogg} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/sounds/3d_armor_equip_diamond.ogg => mcl_armor/sounds/mcl_armor_equip_diamond.ogg} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/sounds/3d_armor_equip_iron.ogg => mcl_armor/sounds/mcl_armor_equip_iron.ogg} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/sounds/3d_armor_equip_leather.ogg => mcl_armor/sounds/mcl_armor_equip_leather.ogg} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/sounds/3d_armor_unequip_chainmail.ogg => mcl_armor/sounds/mcl_armor_unequip_chainmail.ogg} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/sounds/3d_armor_unequip_diamond.ogg => mcl_armor/sounds/mcl_armor_unequip_diamond.ogg} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/sounds/3d_armor_unequip_iron.ogg => mcl_armor/sounds/mcl_armor_unequip_iron.ogg} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/sounds/3d_armor_unequip_leather.ogg => mcl_armor/sounds/mcl_armor_unequip_leather.ogg} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_boots_chain.png => mcl_armor/textures/mcl_armor_boots_chain.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_boots_chain_preview.png => mcl_armor/textures/mcl_armor_boots_chain_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_boots_diamond.png => mcl_armor/textures/mcl_armor_boots_diamond.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_boots_diamond_preview.png => mcl_armor/textures/mcl_armor_boots_diamond_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_boots_gold.png => mcl_armor/textures/mcl_armor_boots_gold.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_boots_gold_preview.png => mcl_armor/textures/mcl_armor_boots_gold_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_boots_iron.png => mcl_armor/textures/mcl_armor_boots_iron.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_boots_iron_preview.png => mcl_armor/textures/mcl_armor_boots_iron_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_boots_leather.png => mcl_armor/textures/mcl_armor_boots_leather.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_boots_leather_preview.png => mcl_armor/textures/mcl_armor_boots_leather_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_chestplate_chain.png => mcl_armor/textures/mcl_armor_chestplate_chain.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_chestplate_chain_preview.png => mcl_armor/textures/mcl_armor_chestplate_chain_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_chestplate_diamond.png => mcl_armor/textures/mcl_armor_chestplate_diamond.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_chestplate_diamond_preview.png => mcl_armor/textures/mcl_armor_chestplate_diamond_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_chestplate_gold.png => mcl_armor/textures/mcl_armor_chestplate_gold.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_chestplate_gold_preview.png => mcl_armor/textures/mcl_armor_chestplate_gold_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_chestplate_iron.png => mcl_armor/textures/mcl_armor_chestplate_iron.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_chestplate_iron_preview.png => mcl_armor/textures/mcl_armor_chestplate_iron_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_chestplate_leather.png => mcl_armor/textures/mcl_armor_chestplate_leather.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_chestplate_leather_preview.png => mcl_armor/textures/mcl_armor_chestplate_leather_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_helmet_chain.png => mcl_armor/textures/mcl_armor_helmet_chain.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_helmet_chain_preview.png => mcl_armor/textures/mcl_armor_helmet_chain_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_helmet_diamond.png => mcl_armor/textures/mcl_armor_helmet_diamond.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_helmet_diamond_preview.png => mcl_armor/textures/mcl_armor_helmet_diamond_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_helmet_gold.png => mcl_armor/textures/mcl_armor_helmet_gold.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_helmet_gold_preview.png => mcl_armor/textures/mcl_armor_helmet_gold_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_helmet_iron.png => mcl_armor/textures/mcl_armor_helmet_iron.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_helmet_iron_preview.png => mcl_armor/textures/mcl_armor_helmet_iron_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_helmet_leather.png => mcl_armor/textures/mcl_armor_helmet_leather.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_helmet_leather_preview.png => mcl_armor/textures/mcl_armor_helmet_leather_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_boots_chain.png => mcl_armor/textures/mcl_armor_inv_boots_chain.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_boots_diamond.png => mcl_armor/textures/mcl_armor_inv_boots_diamond.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_boots_gold.png => mcl_armor/textures/mcl_armor_inv_boots_gold.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_boots_iron.png => mcl_armor/textures/mcl_armor_inv_boots_iron.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_boots_leather.png => mcl_armor/textures/mcl_armor_inv_boots_leather.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_chestplate_chain.png => mcl_armor/textures/mcl_armor_inv_chestplate_chain.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_chestplate_diamond.png => mcl_armor/textures/mcl_armor_inv_chestplate_diamond.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_chestplate_gold.png => mcl_armor/textures/mcl_armor_inv_chestplate_gold.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_chestplate_iron.png => mcl_armor/textures/mcl_armor_inv_chestplate_iron.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_chestplate_leather.png => mcl_armor/textures/mcl_armor_inv_chestplate_leather.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_helmet_chain.png => mcl_armor/textures/mcl_armor_inv_helmet_chain.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_helmet_diamond.png => mcl_armor/textures/mcl_armor_inv_helmet_diamond.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_helmet_gold.png => mcl_armor/textures/mcl_armor_inv_helmet_gold.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_helmet_iron.png => mcl_armor/textures/mcl_armor_inv_helmet_iron.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_helmet_leather.png => mcl_armor/textures/mcl_armor_inv_helmet_leather.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_leggings_chain.png => mcl_armor/textures/mcl_armor_inv_leggings_chain.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_leggings_diamond.png => mcl_armor/textures/mcl_armor_inv_leggings_diamond.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_leggings_gold.png => mcl_armor/textures/mcl_armor_inv_leggings_gold.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_leggings_iron.png => mcl_armor/textures/mcl_armor_inv_leggings_iron.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_inv_leggings_leather.png => mcl_armor/textures/mcl_armor_inv_leggings_leather.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_leggings_chain.png => mcl_armor/textures/mcl_armor_leggings_chain.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_leggings_chain_preview.png => mcl_armor/textures/mcl_armor_leggings_chain_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_leggings_diamond.png => mcl_armor/textures/mcl_armor_leggings_diamond.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_leggings_diamond_preview.png => mcl_armor/textures/mcl_armor_leggings_diamond_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_leggings_gold.png => mcl_armor/textures/mcl_armor_leggings_gold.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_leggings_gold_preview.png => mcl_armor/textures/mcl_armor_leggings_gold_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_leggings_iron.png => mcl_armor/textures/mcl_armor_leggings_iron.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_leggings_iron_preview.png => mcl_armor/textures/mcl_armor_leggings_iron_preview.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_leggings_leather.png => mcl_armor/textures/mcl_armor_leggings_leather.png} (100%) rename mods/ITEMS/minetest-3d_armor/{3d_armor/textures/3d_armor_leggings_leather_preview.png => mcl_armor/textures/mcl_armor_leggings_leather_preview.png} (100%) diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua index 4e3229c56..13d547f94 100644 --- a/mods/ENTITIES/mobs_mc/villager.lua +++ b/mods/ENTITIES/mobs_mc/villager.lua @@ -203,25 +203,25 @@ local professions = { trades = { { { { "mcl_core:coal_lump", 16, 24 }, E1 }, - { { "mcl_core:emerald", 4, 6 }, { "3d_armor:helmet_iron", 1, 1 } }, + { { "mcl_core:emerald", 4, 6 }, { "mcl_armor:helmet_iron", 1, 1 } }, }, { { { "mcl_core:iron_ingot", 7, 9 }, E1 }, - { { "mcl_core:emerald", 10, 14 }, { "3d_armor:chestplate_iron", 1, 1 } }, + { { "mcl_core:emerald", 10, 14 }, { "mcl_armor:chestplate_iron", 1, 1 } }, }, { { { "mcl_core:diamond", 3, 4 }, E1 }, -- TODO: enchant - { { "mcl_core:emerald", 16, 19 }, { "3d_armor:chestplate_diamond", 1, 1 } }, + { { "mcl_core:emerald", 16, 19 }, { "mcl_armor:chestplate_diamond", 1, 1 } }, }, { - { { "mcl_core:emerald", 5, 7 }, { "3d_armor:boots_chain", 1, 1 } }, - { { "mcl_core:emerald", 9, 11 }, { "3d_armor:leggings_chain", 1, 1 } }, - { { "mcl_core:emerald", 5, 7 }, { "3d_armor:helmet_chain", 1, 1 } }, - { { "mcl_core:emerald", 11, 15 }, { "3d_armor:chestplate_chain", 1, 1 } }, + { { "mcl_core:emerald", 5, 7 }, { "mcl_armor:boots_chain", 1, 1 } }, + { { "mcl_core:emerald", 9, 11 }, { "mcl_armor:leggings_chain", 1, 1 } }, + { { "mcl_core:emerald", 5, 7 }, { "mcl_armor:helmet_chain", 1, 1 } }, + { { "mcl_core:emerald", 11, 15 }, { "mcl_armor:chestplate_chain", 1, 1 } }, }, }, }, @@ -231,12 +231,12 @@ local professions = { trades = { { { { "mcl_mobitems:leather", 9, 12 }, E1 }, - { { "mcl_core:emerald", 2, 4 }, { "3d_armor:leggings_leather", 2, 4 } }, + { { "mcl_core:emerald", 2, 4 }, { "mcl_armor:leggings_leather", 2, 4 } }, }, { -- TODO: enchant - { { "mcl_core:emerald", 7, 12 }, { "3d_armor:chestplate_leather", 1, 1 } }, + { { "mcl_core:emerald", 7, 12 }, { "mcl_armor:chestplate_leather", 1, 1 } }, }, { diff --git a/mods/HUD/mcl_hbarmor/README.md b/mods/HUD/mcl_hbarmor/README.md index 0f4816e4a..0eccd6916 100644 --- a/mods/HUD/mcl_hbarmor/README.md +++ b/mods/HUD/mcl_hbarmor/README.md @@ -1,4 +1,4 @@ -# MineClone 2 HUD bar for `3d_armor` [`mcl_hbarmor`] +# MineClone 2 HUD bar for `mcl_armor` [`mcl_hbarmor`] ## Description This mod adds a simple HUD bar which displays the player's armor points. diff --git a/mods/HUD/mcl_hbarmor/init.lua b/mods/HUD/mcl_hbarmor/init.lua index f05d50459..36dad2a50 100644 --- a/mods/HUD/mcl_hbarmor/init.lua +++ b/mods/HUD/mcl_hbarmor/init.lua @@ -1,7 +1,7 @@ local S = minetest.get_translator("mcl_hbarmor") if (not armor) or (not armor.def) then - minetest.log("error", "[mcl_hbarmor] Outdated 3d_armor version. Please update your version of 3d_armor!") + minetest.log("error", "[mcl_hbarmor] Outdated mcl_armor version. Please update your version of mcl_armor!") end local mcl_hbarmor = {} diff --git a/mods/HUD/mcl_hbarmor/mod.conf b/mods/HUD/mcl_hbarmor/mod.conf index 4d595c8c9..de5a2f20a 100644 --- a/mods/HUD/mcl_hbarmor/mod.conf +++ b/mods/HUD/mcl_hbarmor/mod.conf @@ -1,2 +1,2 @@ name = mcl_hbarmor -depends = hudbars, 3d_armor +depends = hudbars, mcl_armor diff --git a/mods/HUD/mcl_inventory/creative.lua b/mods/HUD/mcl_inventory/creative.lua index bcca4772d..7032994a0 100644 --- a/mods/HUD/mcl_inventory/creative.lua +++ b/mods/HUD/mcl_inventory/creative.lua @@ -7,7 +7,7 @@ local players = {} -- Containing all the items for each Creative Mode tab local inventory_lists = {} -local show_armor = minetest.get_modpath("3d_armor") ~= nil +local show_armor = minetest.get_modpath("mcl_armor") ~= nil local mod_player = minetest.get_modpath("mcl_player") ~= nil -- TODO: Brewing is disabled. Add brewing (uncommented code) when it is implemented properly diff --git a/mods/HUD/mcl_inventory/depends.txt b/mods/HUD/mcl_inventory/depends.txt index 46d93c42a..056b070d3 100644 --- a/mods/HUD/mcl_inventory/depends.txt +++ b/mods/HUD/mcl_inventory/depends.txt @@ -1,4 +1,4 @@ mcl_init mcl_player? _mcl_autogroup? -3d_armor? +mcl_armor? diff --git a/mods/HUD/mcl_inventory/init.lua b/mods/HUD/mcl_inventory/init.lua index 03227e85d..84f255244 100644 --- a/mods/HUD/mcl_inventory/init.lua +++ b/mods/HUD/mcl_inventory/init.lua @@ -3,7 +3,7 @@ local F = minetest.formspec_escape mcl_inventory = {} -local show_armor = minetest.get_modpath("3d_armor") ~= nil +local show_armor = minetest.get_modpath("mcl_armor") ~= nil local mod_player = minetest.get_modpath("mcl_player") ~= nil local mod_craftguide = minetest.get_modpath("mcl_craftguide") ~= nil diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt b/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt index c17d2db09..9eb136da4 100644 --- a/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt +++ b/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt @@ -6,6 +6,6 @@ mcl_worlds mcl_core mcl_nether 3d_armor_stand -3d_armor +mcl_armor doc? screwdriver? diff --git a/mods/ITEMS/mcl_fishing/init.lua b/mods/ITEMS/mcl_fishing/init.lua index fd4697813..4ca7976f3 100644 --- a/mods/ITEMS/mcl_fishing/init.lua +++ b/mods/ITEMS/mcl_fishing/init.lua @@ -65,7 +65,7 @@ local fish = function(itemstack, player) { itemstring = "mcl_core:bowl", weight = 10 }, { itemstring = "mcl_fishing:fishing_rod", weight = 2, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage { itemstring = "mcl_mobitems:leather", weight = 10 }, - { itemstring = "3d_armor:boots_leather", weight = 10, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage + { itemstring = "mcl_armor:boots_leather", weight = 10, wear_min = 6554, wear_max = 65535 }, -- 10%-100% damage { itemstring = "mcl_mobitems:rotten_flesh", weight = 10 }, { itemstring = "mcl_core:stick", weight = 5 }, { itemstring = "mcl_mobitems:string", weight = 5 }, diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_generic.ogg b/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_generic.ogg deleted file mode 100644 index 29b4bcd5f56c46fe96a9d0b5995b55a926a7ac0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17882 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 -* 3d_armor_equip_iron.ogg -* 3d_armor_unequip_iron.ogg +* mcl_armor_equip_iron.ogg +* mcl_armor_unequip_iron.ogg Licensed CC0, by Freesound.org user mtchanary. Source: diff --git a/mods/ITEMS/minetest-3d_armor/mcl_armor/alias.lua b/mods/ITEMS/minetest-3d_armor/mcl_armor/alias.lua new file mode 100644 index 000000000..19c2424d0 --- /dev/null +++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/alias.lua @@ -0,0 +1,23 @@ +minetest.register_alias("3d_armor:helmet_leather", "mcl_armor:helmet_leather") +minetest.register_alias("3d_armor:helmet_iron", "mcl_armor:helmet_iron") +minetest.register_alias("3d_armor:helmet_chain", "mcl_armor:helmet_chain") +minetest.register_alias("3d_armor:helmet_gold", "mcl_armor:helmet_gold") +minetest.register_alias("3d_armor:helmet_diamond", "mcl_armor:helmet_diamond") + +minetest.register_alias("3d_armor:chestplate_leather", "mcl_armor:chestplate_leather") +minetest.register_alias("3d_armor:chestplate_iron", "mcl_armor:chestplate_iron") +minetest.register_alias("3d_armor:chestplate_chain", "mcl_armor:chestplate_chain") +minetest.register_alias("3d_armor:chestplate_gold", "mcl_armor:chestplate_gold") +minetest.register_alias("3d_armor:chestplate_diamond", "mcl_armor:chestplate_diamond") + +minetest.register_alias("3d_armor:leggings_leather", "mcl_armor:leggings_leather") +minetest.register_alias("3d_armor:leggings_iron", "mcl_armor:leggings_iron") +minetest.register_alias("3d_armor:leggings_chain", "mcl_armor:leggings_chain") +minetest.register_alias("3d_armor:leggings_gold", "mcl_armor:leggings_gold") +minetest.register_alias("3d_armor:leggings_diamond", "mcl_armor:leggings_diamond") + +minetest.register_alias("3d_armor:boots_leather", "mcl_armor:boots_leather") +minetest.register_alias("3d_armor:boots_iron", "mcl_armor:boots_iron") +minetest.register_alias("3d_armor:boots_chain", "mcl_armor:boots_chain") +minetest.register_alias("3d_armor:boots_gold", "mcl_armor:boots_gold") +minetest.register_alias("3d_armor:boots_diamond", "mcl_armor:boots_diamond") diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/armor.lua b/mods/ITEMS/minetest-3d_armor/mcl_armor/armor.lua similarity index 94% rename from mods/ITEMS/minetest-3d_armor/3d_armor/armor.lua rename to mods/ITEMS/minetest-3d_armor/mcl_armor/armor.lua index 007bb2744..d06d5444d 100644 --- a/mods/ITEMS/minetest-3d_armor/3d_armor/armor.lua +++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/armor.lua @@ -18,7 +18,6 @@ armor = { .."listring[current_player;craft]", textures = {}, default_skin = "character", - version = "0.4.6", } if minetest.get_modpath("mcl_skins") then @@ -71,6 +70,9 @@ armor.set_player_armor = function(self, player) for i=1, 6 do local stack = player_inv:get_stack("armor", i) local item = stack:get_name() + if minetest.registered_aliases[item] then + item = minetest.registered_aliases[item] + end if stack:get_count() == 1 then local def = stack:get_definition() for k, v in pairs(elements) do @@ -177,11 +179,11 @@ end armor.get_armor_formspec = function(self, name) if not armor.textures[name] then - minetest.log("error", "3d_armor: Player texture["..name.."] is nil [get_armor_formspec]") + minetest.log("error", "mcl_armor: Player texture["..name.."] is nil [get_armor_formspec]") return "" end if not armor.def[name] then - minetest.log("error", "3d_armor: Armor def["..name.."] is nil [get_armor_formspec]") + minetest.log("error", "mcl_armor: Armor def["..name.."] is nil [get_armor_formspec]") return "" end local formspec = armor.formspec.."list[detached:"..name.."_armor;armor;0,1;2,3;]" @@ -197,25 +199,25 @@ end armor.get_valid_player = function(self, player, msg) msg = msg or "" if not player then - minetest.log("error", "3d_armor: Player reference is nil "..msg) + minetest.log("error", "mcl_armor: Player reference is nil "..msg) return end local name = player:get_player_name() if not name then - minetest.log("error", "3d_armor: Player name is nil "..msg) + minetest.log("error", "mcl_armor: Player name is nil "..msg) return end local pos = player:get_pos() local player_inv = player:get_inventory() local armor_inv = minetest.get_inventory({type="detached", name=name.."_armor"}) if not pos then - minetest.log("error", "3d_armor: Player position is nil "..msg) + minetest.log("error", "mcl_armor: Player position is nil "..msg) return elseif not player_inv then - minetest.log("error", "3d_armor: Player inventory is nil "..msg) + minetest.log("error", "mcl_armor: Player inventory is nil "..msg) return elseif not armor_inv then - minetest.log("error", "3d_armor: Detached armor inventory is nil "..msg) + minetest.log("error", "mcl_armor: Detached armor inventory is nil "..msg) return end return name, player_inv, armor_inv, pos @@ -230,7 +232,7 @@ armor.play_equip_sound = function(self, player, stack, unequip) local snd = def.sounds and def.sounds["_mcl_armor_"..estr] if not snd then -- Fallback sound - snd = { name = "3d_armor_"..estr.."_iron" } + snd = { name = "mcl_armor_"..estr.."_iron" } end if snd then minetest.sound_play(snd, {object=player, gain=0.5, max_hear_distance=8}) @@ -239,7 +241,7 @@ end -- Register Player Model -mcl_player.player_register_model("3d_armor_character.b3d", { +mcl_player.player_register_model("mcl_armor_character.b3d", { animation_speed = 30, textures = { armor.default_skin..".png", @@ -282,7 +284,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields) end) minetest.register_on_joinplayer(function(player) - mcl_player.player_set_model(player, "3d_armor_character.b3d") + mcl_player.player_set_model(player, "mcl_armor_character.b3d") local name = player:get_player_name() local player_inv = player:get_inventory() local armor_inv = minetest.create_detached_inventory(name.."_armor", { diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/depends.txt b/mods/ITEMS/minetest-3d_armor/mcl_armor/depends.txt similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/depends.txt rename to mods/ITEMS/minetest-3d_armor/mcl_armor/depends.txt diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/description.txt b/mods/ITEMS/minetest-3d_armor/mcl_armor/description.txt similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/description.txt rename to mods/ITEMS/minetest-3d_armor/mcl_armor/description.txt diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/init.lua b/mods/ITEMS/minetest-3d_armor/mcl_armor/init.lua similarity index 60% rename from mods/ITEMS/minetest-3d_armor/3d_armor/init.lua rename to mods/ITEMS/minetest-3d_armor/mcl_armor/init.lua index 774bd07a3..42ad8f240 100644 --- a/mods/ITEMS/minetest-3d_armor/3d_armor/init.lua +++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/init.lua @@ -1,258 +1,259 @@ -local S = minetest.get_translator("3d_armor") +local S = minetest.get_translator("mcl_armor") dofile(minetest.get_modpath(minetest.get_current_modname()).."/armor.lua") +dofile(minetest.get_modpath(minetest.get_current_modname()).."/alias.lua") -- Regisiter Head Armor local longdesc = S("This is a piece of equippable armor which reduces the amount of damage you receive.") local usage = S("To equip it, put it on the corresponding armor slot in your inventory menu.") -minetest.register_tool("3d_armor:helmet_leather", { +minetest.register_tool("mcl_armor:helmet_leather", { description = S("Leather Cap"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_helmet_leather.png", + inventory_image = "mcl_armor_inv_helmet_leather.png", groups = {armor_head=1, mcl_armor_points=1, mcl_armor_uses=56}, _repair_material = "mcl_mobitems:leather", sounds = { - _mcl_armor_equip = "3d_armor_equip_leather", - _mcl_armor_unequip = "3d_armor_unequip_leather", + _mcl_armor_equip = "mcl_armor_equip_leather", + _mcl_armor_unequip = "mcl_armor_unequip_leather", }, }) -minetest.register_tool("3d_armor:helmet_iron", { +minetest.register_tool("mcl_armor:helmet_iron", { description = S("Iron Helmet"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_helmet_iron.png", + inventory_image = "mcl_armor_inv_helmet_iron.png", groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=166}, _repair_material = "mcl_core:iron_ingot", sounds = { - _mcl_armor_equip = "3d_armor_equip_iron", - _mcl_armor_unequip = "3d_armor_unequip_iron", + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", }, }) -minetest.register_tool("3d_armor:helmet_gold", { +minetest.register_tool("mcl_armor:helmet_gold", { description = S("Golden Helmet"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_helmet_gold.png", + inventory_image = "mcl_armor_inv_helmet_gold.png", groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=78}, _repair_material = "mcl_core:gold_ingot", }) -minetest.register_tool("3d_armor:helmet_diamond",{ +minetest.register_tool("mcl_armor:helmet_diamond",{ description = S("Diamond Helmet"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_helmet_diamond.png", + inventory_image = "mcl_armor_inv_helmet_diamond.png", groups = {armor_head=1, mcl_armor_points=3, mcl_armor_uses=364, mcl_armor_toughness=2}, _repair_material = "mcl_core:diamond", sounds = { - _mcl_armor_equip = "3d_armor_equip_diamond", - _mcl_armor_unequip = "3d_armor_unequip_diamond", + _mcl_armor_equip = "mcl_armor_equip_diamond", + _mcl_armor_unequip = "mcl_armor_unequip_diamond", }, }) -minetest.register_tool("3d_armor:helmet_chain", { +minetest.register_tool("mcl_armor:helmet_chain", { description = S("Chain Helmet"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_helmet_chain.png", + inventory_image = "mcl_armor_inv_helmet_chain.png", groups = {armor_head=1, mcl_armor_points=2, mcl_armor_uses=166}, _repair_material = "mcl_core:iron_ingot", sounds = { - _mcl_armor_equip = "3d_armor_equip_chainmail", - _mcl_armor_unequip = "3d_armor_unequip_chainmail", + _mcl_armor_equip = "mcl_armor_equip_chainmail", + _mcl_armor_unequip = "mcl_armor_unequip_chainmail", }, }) -- Regisiter Torso Armor -minetest.register_tool("3d_armor:chestplate_leather", { +minetest.register_tool("mcl_armor:chestplate_leather", { description = S("Leather Tunic"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_chestplate_leather.png", + inventory_image = "mcl_armor_inv_chestplate_leather.png", groups = {armor_torso=1, mcl_armor_points=3, mcl_armor_uses=81}, _repair_material = "mcl_mobitems:leather", sounds = { - _mcl_armor_equip = "3d_armor_equip_leather", - _mcl_armor_unequip = "3d_armor_unequip_leather", + _mcl_armor_equip = "mcl_armor_equip_leather", + _mcl_armor_unequip = "mcl_armor_unequip_leather", }, }) -minetest.register_tool("3d_armor:chestplate_iron", { +minetest.register_tool("mcl_armor:chestplate_iron", { description = S("Iron Chestplate"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_chestplate_iron.png", + inventory_image = "mcl_armor_inv_chestplate_iron.png", groups = {armor_torso=1, mcl_armor_points=6, mcl_armor_uses=241}, _repair_material = "mcl_core:iron_ingot", sounds = { - _mcl_armor_equip = "3d_armor_equip_iron", - _mcl_armor_unequip = "3d_armor_unequip_iron", + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", }, }) -minetest.register_tool("3d_armor:chestplate_gold", { +minetest.register_tool("mcl_armor:chestplate_gold", { description = S("Golden Chestplate"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_chestplate_gold.png", + inventory_image = "mcl_armor_inv_chestplate_gold.png", groups = {armor_torso=1, mcl_armor_points=5, mcl_armor_uses=113}, _repair_material = "mcl_core:gold_ingot", }) -minetest.register_tool("3d_armor:chestplate_diamond",{ +minetest.register_tool("mcl_armor:chestplate_diamond",{ description = S("Diamond Chestplate"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_chestplate_diamond.png", + inventory_image = "mcl_armor_inv_chestplate_diamond.png", groups = {armor_torso=1, mcl_armor_points=8, mcl_armor_uses=529, mcl_armor_toughness=2}, _repair_material = "mcl_core:diamond", sounds = { - _mcl_armor_equip = "3d_armor_equip_diamond", - _mcl_armor_unequip = "3d_armor_unequip_diamond", + _mcl_armor_equip = "mcl_armor_equip_diamond", + _mcl_armor_unequip = "mcl_armor_unequip_diamond", }, }) -minetest.register_tool("3d_armor:chestplate_chain", { +minetest.register_tool("mcl_armor:chestplate_chain", { description = S("Chain Chestplate"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_chestplate_chain.png", + inventory_image = "mcl_armor_inv_chestplate_chain.png", groups = {armor_torso=1, mcl_armor_points=5, mcl_armor_uses=241}, _repair_material = "mcl_core:iron_ingot", sounds = { - _mcl_armor_equip = "3d_armor_equip_chainmail", - _mcl_armor_unequip = "3d_armor_unequip_chainmail", + _mcl_armor_equip = "mcl_armor_equip_chainmail", + _mcl_armor_unequip = "mcl_armor_unequip_chainmail", }, }) -- Regisiter Leg Armor -minetest.register_tool("3d_armor:leggings_leather", { +minetest.register_tool("mcl_armor:leggings_leather", { description = S("Leather Pants"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_leggings_leather.png", + inventory_image = "mcl_armor_inv_leggings_leather.png", groups = {armor_legs=1, mcl_armor_points=2, mcl_armor_uses=76}, _repair_material = "mcl_mobitems:leather", sounds = { - _mcl_armor_equip = "3d_armor_equip_leather", - _mcl_armor_unequip = "3d_armor_unequip_leather", + _mcl_armor_equip = "mcl_armor_equip_leather", + _mcl_armor_unequip = "mcl_armor_unequip_leather", }, }) -minetest.register_tool("3d_armor:leggings_iron", { +minetest.register_tool("mcl_armor:leggings_iron", { description = S("Iron Leggings"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_leggings_iron.png", + inventory_image = "mcl_armor_inv_leggings_iron.png", groups = {armor_legs=1, mcl_armor_points=5, mcl_armor_uses=226}, _repair_material = "mcl_core:iron_ingot", sounds = { - _mcl_armor_equip = "3d_armor_equip_iron", - _mcl_armor_unequip = "3d_armor_unequip_iron", + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", }, }) -minetest.register_tool("3d_armor:leggings_gold", { +minetest.register_tool("mcl_armor:leggings_gold", { description = S("Golden Leggings"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_leggings_gold.png", + inventory_image = "mcl_armor_inv_leggings_gold.png", groups = {armor_legs=1, mcl_armor_points=3, mcl_armor_uses=106}, _repair_material = "mcl_core:gold_ingot", }) -minetest.register_tool("3d_armor:leggings_diamond",{ +minetest.register_tool("mcl_armor:leggings_diamond",{ description = S("Diamond Leggings"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_leggings_diamond.png", + inventory_image = "mcl_armor_inv_leggings_diamond.png", groups = {armor_legs=1, mcl_armor_points=6, mcl_armor_uses=496, mcl_armor_toughness=2}, _repair_material = "mcl_core:diamond", sounds = { - _mcl_armor_equip = "3d_armor_equip_diamond", - _mcl_armor_unequip = "3d_armor_unequip_diamond", + _mcl_armor_equip = "mcl_armor_equip_diamond", + _mcl_armor_unequip = "mcl_armor_unequip_diamond", }, }) -minetest.register_tool("3d_armor:leggings_chain", { +minetest.register_tool("mcl_armor:leggings_chain", { description = S("Chain Leggings"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_leggings_chain.png", + inventory_image = "mcl_armor_inv_leggings_chain.png", groups = {armor_legs=1, mcl_armor_points=4, mcl_armor_uses=226}, _repair_material = "mcl_core:iron_ingot", sounds = { - _mcl_armor_equip = "3d_armor_equip_chainmail", - _mcl_armor_unequip = "3d_armor_unequip_chainmail", + _mcl_armor_equip = "mcl_armor_equip_chainmail", + _mcl_armor_unequip = "mcl_armor_unequip_chainmail", }, }) -- Regisiter Boots -minetest.register_tool("3d_armor:boots_leather", { +minetest.register_tool("mcl_armor:boots_leather", { description = S("Leather Boots"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_boots_leather.png", + inventory_image = "mcl_armor_inv_boots_leather.png", groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=66}, _repair_material = "mcl_mobitems:leather", sounds = { - _mcl_armor_equip = "3d_armor_equip_leather", - _mcl_armor_unequip = "3d_armor_unequip_leather", + _mcl_armor_equip = "mcl_armor_equip_leather", + _mcl_armor_unequip = "mcl_armor_unequip_leather", }, }) -minetest.register_tool("3d_armor:boots_iron", { +minetest.register_tool("mcl_armor:boots_iron", { description = S("Iron Boots"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_boots_iron.png", + inventory_image = "mcl_armor_inv_boots_iron.png", groups = {armor_feet=1, mcl_armor_points=2, mcl_armor_uses=196}, _repair_material = "mcl_core:iron_ingot", sounds = { - _mcl_armor_equip = "3d_armor_equip_iron", - _mcl_armor_unequip = "3d_armor_unequip_iron", + _mcl_armor_equip = "mcl_armor_equip_iron", + _mcl_armor_unequip = "mcl_armor_unequip_iron", }, }) -minetest.register_tool("3d_armor:boots_gold", { +minetest.register_tool("mcl_armor:boots_gold", { description = S("Golden Boots"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_boots_gold.png", + inventory_image = "mcl_armor_inv_boots_gold.png", groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=92}, _repair_material = "mcl_core:gold_ingot", }) -minetest.register_tool("3d_armor:boots_diamond",{ +minetest.register_tool("mcl_armor:boots_diamond",{ description = S("Diamond Boots"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_boots_diamond.png", + inventory_image = "mcl_armor_inv_boots_diamond.png", groups = {armor_feet=1, mcl_armor_points=3, mcl_armor_uses=430, mcl_armor_toughness=2}, _repair_material = "mcl_core:diamond", sounds = { - _mcl_armor_equip = "3d_armor_equip_diamond", - _mcl_armor_unequip = "3d_armor_unequip_diamond", + _mcl_armor_equip = "mcl_armor_equip_diamond", + _mcl_armor_unequip = "mcl_armor_unequip_diamond", }, }) -minetest.register_tool("3d_armor:boots_chain", { +minetest.register_tool("mcl_armor:boots_chain", { description = S("Chain Boots"), _doc_items_longdesc = longdesc, _doc_items_usagehelp = usage, - inventory_image = "3d_armor_inv_boots_chain.png", + inventory_image = "mcl_armor_inv_boots_chain.png", groups = {armor_feet=1, mcl_armor_points=1, mcl_armor_uses=196}, _repair_material = "mcl_core:iron_ingot", sounds = { - _mcl_armor_equip = "3d_armor_equip_chainmail", - _mcl_armor_unequip = "3d_armor_unequip_chainmail", + _mcl_armor_equip = "mcl_armor_equip_chainmail", + _mcl_armor_unequip = "mcl_armor_unequip_chainmail", }, }) @@ -273,7 +274,7 @@ for k, v in pairs(craft_ingreds) do local c = v[2] if m ~= nil then minetest.register_craft({ - output = "3d_armor:helmet_"..k, + output = "mcl_armor:helmet_"..k, recipe = { {m, m, m}, {m, "", m}, @@ -281,7 +282,7 @@ for k, v in pairs(craft_ingreds) do }, }) minetest.register_craft({ - output = "3d_armor:chestplate_"..k, + output = "mcl_armor:chestplate_"..k, recipe = { {m, "", m}, {m, m, m}, @@ -289,7 +290,7 @@ for k, v in pairs(craft_ingreds) do }, }) minetest.register_craft({ - output = "3d_armor:leggings_"..k, + output = "mcl_armor:leggings_"..k, recipe = { {m, m, m}, {m, "", m}, @@ -297,7 +298,7 @@ for k, v in pairs(craft_ingreds) do }, }) minetest.register_craft({ - output = "3d_armor:boots_"..k, + output = "mcl_armor:boots_"..k, recipe = { {m, "", m}, {m, "", m}, @@ -308,26 +309,27 @@ for k, v in pairs(craft_ingreds) do minetest.register_craft({ type = "cooking", output = c, - recipe = "3d_armor:helmet_"..k, + recipe = "mcl_armor:helmet_"..k, cooktime = 10, }) minetest.register_craft({ type = "cooking", output = c, - recipe = "3d_armor:chestplate_"..k, + recipe = "mcl_armor:chestplate_"..k, cooktime = 10, }) minetest.register_craft({ type = "cooking", output = c, - recipe = "3d_armor:leggings_"..k, + recipe = "mcl_armor:leggings_"..k, cooktime = 10, }) minetest.register_craft({ type = "cooking", output = c, - recipe = "3d_armor:boots_"..k, + recipe = "mcl_armor:boots_"..k, cooktime = 10, }) end end + diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.de.tr b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.de.tr similarity index 97% rename from mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.de.tr rename to mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.de.tr index 12c7c09eb..09da3a9cc 100644 --- a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.de.tr +++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.de.tr @@ -1,4 +1,4 @@ -# textdomain: 3d_armor +# textdomain: mcl_armor This is a piece of equippable armor which reduces the amount of damage you receive.=Dies ist ein Teil einer tragbaren Rüstung, die die Menge an Schaden, den Sie erleiden, reduziert. To equip it, put it on the corresponding armor slot in your inventory menu.=Um es zu tragen, legen Sie es in den passenden Rüstungsplatz in ihrem Inventarmenü. Leather Cap=Lederkappe diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.es.tr b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.es.tr similarity index 97% rename from mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.es.tr rename to mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.es.tr index 6606d2ff9..e770dff0c 100644 --- a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/3d_armor.es.tr +++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/mcl_armor.es.tr @@ -1,4 +1,4 @@ -# textdomain: 3d_armor +# textdomain: mcl_armor This is a piece of equippable armor which reduces the amount of damage you receive.=Dies ist ein Teil einer tragbaren Rüstung, die die Menge an Schaden, den Sie erleiden, reduziert. To equip it, put it on the corresponding armor slot in your inventory menu.=Um es zu tragen, legen Sie es in den passenden Rüstungsplatz in ihrem Inventarmenü. Leather Cap=Sombrero de cuero diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/template.txt b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/template.txt similarity index 95% rename from mods/ITEMS/minetest-3d_armor/3d_armor/locale/template.txt rename to mods/ITEMS/minetest-3d_armor/mcl_armor/locale/template.txt index f0126bca9..8a95fca02 100644 --- a/mods/ITEMS/minetest-3d_armor/3d_armor/locale/template.txt +++ b/mods/ITEMS/minetest-3d_armor/mcl_armor/locale/template.txt @@ -1,4 +1,4 @@ -# textdomain: 3d_armor +# textdomain: mcl_armor This is a piece of equippable armor which reduces the amount of damage you receive.= To equip it, put it on the corresponding armor slot in your inventory menu.= Leather Cap= diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/models/3d_armor_character.b3d b/mods/ITEMS/minetest-3d_armor/mcl_armor/models/mcl_armor_character.b3d similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/models/3d_armor_character.b3d rename to mods/ITEMS/minetest-3d_armor/mcl_armor/models/mcl_armor_character.b3d diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/models/3d_armor_character.blend b/mods/ITEMS/minetest-3d_armor/mcl_armor/models/mcl_armor_character.blend similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/models/3d_armor_character.blend rename to mods/ITEMS/minetest-3d_armor/mcl_armor/models/mcl_armor_character.blend diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_chainmail.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_chainmail.ogg similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_chainmail.ogg rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_chainmail.ogg diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_diamond.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_diamond.ogg similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_diamond.ogg rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_diamond.ogg diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_iron.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_iron.ogg similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_iron.ogg rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_iron.ogg diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_leather.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_leather.ogg similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_equip_leather.ogg rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_equip_leather.ogg diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_chainmail.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_chainmail.ogg similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_chainmail.ogg rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_chainmail.ogg diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_diamond.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_diamond.ogg similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_diamond.ogg rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_diamond.ogg diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_iron.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_iron.ogg similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_iron.ogg rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_iron.ogg diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_leather.ogg b/mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_leather.ogg similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/sounds/3d_armor_unequip_leather.ogg rename to mods/ITEMS/minetest-3d_armor/mcl_armor/sounds/mcl_armor_unequip_leather.ogg diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_chain.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_chain.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_chain.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_chain_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_chain_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_chain_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_chain_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_diamond.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_diamond.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_diamond.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_diamond_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_diamond_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_diamond_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_diamond_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_gold.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_gold.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_gold.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_gold_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_gold_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_gold_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_gold_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_iron.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_iron.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_iron.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_iron_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_iron_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_iron_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_iron_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_leather.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_leather.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_leather.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_leather_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_leather_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_boots_leather_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_boots_leather_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_chain.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_chain.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_chain.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_chain_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_chain_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_chain_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_chain_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_diamond.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_diamond.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_diamond.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_diamond_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_diamond_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_diamond_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_diamond_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_gold.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_gold.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_gold.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_gold_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_gold_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_gold_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_gold_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_iron.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_iron.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_iron.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_iron_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_iron_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_iron_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_iron_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_leather.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_leather.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_leather.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_leather_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_leather_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_chestplate_leather_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_chestplate_leather_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_chain.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_chain.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_chain.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_chain_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_chain_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_chain_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_chain_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_diamond.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_diamond.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_diamond.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_diamond_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_diamond_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_diamond_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_diamond_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_gold.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_gold.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_gold.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_gold_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_gold_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_gold_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_gold_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_iron.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_iron.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_iron.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_iron_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_iron_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_iron_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_iron_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_leather.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_leather.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_leather.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_leather_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_leather_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_helmet_leather_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_helmet_leather_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_chain.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_chain.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_chain.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_diamond.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_diamond.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_diamond.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_gold.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_gold.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_gold.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_iron.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_iron.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_iron.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_leather.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_boots_leather.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_boots_leather.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_chain.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_chain.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_chain.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_diamond.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_diamond.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_diamond.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_gold.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_gold.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_gold.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_iron.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_iron.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_iron.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_leather.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_chestplate_leather.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_chestplate_leather.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_chain.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_chain.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_chain.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_diamond.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_diamond.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_diamond.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_gold.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_gold.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_gold.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_iron.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_iron.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_iron.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_leather.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_helmet_leather.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_helmet_leather.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_chain.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_chain.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_chain.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_diamond.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_diamond.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_diamond.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_gold.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_gold.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_gold.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_iron.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_iron.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_iron.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_leather.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_inv_leggings_leather.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_inv_leggings_leather.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_chain.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_chain.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_chain.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_chain.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_chain_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_chain_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_chain_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_chain_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_diamond.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_diamond.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_diamond.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_diamond.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_diamond_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_diamond_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_diamond_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_diamond_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_gold.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_gold.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_gold.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_gold.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_gold_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_gold_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_gold_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_gold_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_iron.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_iron.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_iron.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_iron.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_iron_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_iron_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_iron_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_iron_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_leather.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_leather.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_leather.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_leather.png diff --git a/mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_leather_preview.png b/mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_leather_preview.png similarity index 100% rename from mods/ITEMS/minetest-3d_armor/3d_armor/textures/3d_armor_leggings_leather_preview.png rename to mods/ITEMS/minetest-3d_armor/mcl_armor/textures/mcl_armor_leggings_leather_preview.png diff --git a/mods/ITEMS/minetest-3d_armor/wieldview/README.txt b/mods/ITEMS/minetest-3d_armor/wieldview/README.txt index e6be7490a..66133c745 100644 --- a/mods/ITEMS/minetest-3d_armor/wieldview/README.txt +++ b/mods/ITEMS/minetest-3d_armor/wieldview/README.txt @@ -1,7 +1,7 @@ [mod] visible wielded items [wieldview] ======================================= -Depends on: 3d_armor +Depends on: mcl_armor Makes hand wielded items visible to other players. diff --git a/mods/ITEMS/minetest-3d_armor/wieldview/depends.txt b/mods/ITEMS/minetest-3d_armor/wieldview/depends.txt index b6cac2191..2bbf820fd 100644 --- a/mods/ITEMS/minetest-3d_armor/wieldview/depends.txt +++ b/mods/ITEMS/minetest-3d_armor/wieldview/depends.txt @@ -1 +1 @@ -3d_armor +mcl_armor diff --git a/mods/MISC/mcl_temp_helper_recipes/init.lua b/mods/MISC/mcl_temp_helper_recipes/init.lua index 2bb7ff61e..fdde8004f 100644 --- a/mods/MISC/mcl_temp_helper_recipes/init.lua +++ b/mods/MISC/mcl_temp_helper_recipes/init.lua @@ -40,7 +40,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "3d_armor:helmet_chain", + output = "mcl_armor:helmet_chain", recipe = { { "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" }, { "xpanes:bar_flat", "", "xpanes:bar_flat" }, @@ -48,7 +48,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "3d_armor:leggings_chain", + output = "mcl_armor:leggings_chain", recipe = { { "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" }, { "xpanes:bar_flat", "", "xpanes:bar_flat" }, @@ -57,7 +57,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "3d_armor:boots_chain", + output = "mcl_armor:boots_chain", recipe = { { "xpanes:bar_flat", "", "xpanes:bar_flat" }, { "xpanes:bar_flat", "", "xpanes:bar_flat" }, @@ -65,7 +65,7 @@ minetest.register_craft({ }) minetest.register_craft({ - output = "3d_armor:chestplate_chain", + output = "mcl_armor:chestplate_chain", recipe = { { "xpanes:bar_flat", "", "xpanes:bar_flat" }, { "xpanes:bar_flat", "mcl_core:iron_ingot", "xpanes:bar_flat" }, diff --git a/mods/PLAYER/mcl_death_drop/depends.txt b/mods/PLAYER/mcl_death_drop/depends.txt index b6cac2191..2bbf820fd 100644 --- a/mods/PLAYER/mcl_death_drop/depends.txt +++ b/mods/PLAYER/mcl_death_drop/depends.txt @@ -1 +1 @@ -3d_armor +mcl_armor diff --git a/mods/PLAYER/mcl_playerinfo/depends.txt b/mods/PLAYER/mcl_playerinfo/depends.txt index 3fb372019..d0334ff54 100644 --- a/mods/PLAYER/mcl_playerinfo/depends.txt +++ b/mods/PLAYER/mcl_playerinfo/depends.txt @@ -2,4 +2,3 @@ mcl_init mcl_core mcl_particles mcl_death_messages -3d_armor? diff --git a/mods/PLAYER/mcl_playerplus/depends.txt b/mods/PLAYER/mcl_playerplus/depends.txt index 3e89821cc..6bbe4cbdb 100644 --- a/mods/PLAYER/mcl_playerplus/depends.txt +++ b/mods/PLAYER/mcl_playerplus/depends.txt @@ -5,6 +5,5 @@ mcl_hunger mcl_death_messages playerphysics mcl_playerinfo -3d_armor? mcl_weather mcl_spawn diff --git a/mods/PLAYER/mcl_playerplus/init.lua b/mods/PLAYER/mcl_playerplus/init.lua index 19e5c2d54..99939d1df 100644 --- a/mods/PLAYER/mcl_playerplus/init.lua +++ b/mods/PLAYER/mcl_playerplus/init.lua @@ -3,7 +3,6 @@ local S = minetest.get_translator("mcl_playerplus") -- Internal player state local mcl_playerplus_internal = {} -local armor_mod = minetest.get_modpath("3d_armor") local def = {} local time = 0 diff --git a/mods/PLAYER/mcl_skins/depends.txt b/mods/PLAYER/mcl_skins/depends.txt index e0804a6f9..09bdf5205 100644 --- a/mods/PLAYER/mcl_skins/depends.txt +++ b/mods/PLAYER/mcl_skins/depends.txt @@ -1,4 +1,4 @@ mcl_player mcl_inventory? intllib? -3d_armor? +mcl_armor? diff --git a/mods/PLAYER/mcl_skins/init.lua b/mods/PLAYER/mcl_skins/init.lua index 401ba1600..c1f557d94 100644 --- a/mods/PLAYER/mcl_skins/init.lua +++ b/mods/PLAYER/mcl_skins/init.lua @@ -105,7 +105,7 @@ mcl_skins.set_player_skin = function(player, skin_id) mcl_skins.previews[playername] = preview player:get_meta():set_string("mcl_skins:skin_id", tostring(skin_id)) mcl_skins.update_player_skin(player) - if minetest.get_modpath("3d_armor") then + if minetest.get_modpath("mcl_armor") then armor.textures[playername].skin = skin_file armor:update_player_visuals(player) end diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index ab4a94519..db82bd1f2 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -589,26 +589,26 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/blocks,wool_colored_purple.png,/mods/ITEMS/mcl_wool/textures,wool_violet.png,,,,,,, /assets/minecraft/textures/blocks,wool_colored_white.png,/mods/ITEMS/mcl_wool/textures,wool_white.png,,,,,,, /assets/minecraft/textures/blocks,wool_colored_yellow.png,/mods/ITEMS/mcl_wool/textures,wool_yellow.png,,,,,,, -/assets/minecraft/textures/items,chainmail_boots.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_boots_chain.png,,,,,,, -/assets/minecraft/textures/items,diamond_boots.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_boots_diamond.png,,,,,,, -/assets/minecraft/textures/items,gold_boots.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_boots_gold.png,,,,,,, -/assets/minecraft/textures/items,iron_boots.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_boots_iron.png,,,,,,, -/assets/minecraft/textures/items,leather_boots.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_boots_leather.png,,,,,,, -/assets/minecraft/textures/items,chainmail_chestplate.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_chestplate_chain.png,,,,,,, -/assets/minecraft/textures/items,diamond_chestplate.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_chestplate_diamond.png,,,,,,, -/assets/minecraft/textures/items,gold_chestplate.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_chestplate_gold.png,,,,,,, -/assets/minecraft/textures/items,iron_chestplate.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_chestplate_iron.png,,,,,,, -/assets/minecraft/textures/items,leather_chestplate.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_chestplate_leather.png,,,,,,, -/assets/minecraft/textures/items,chainmail_helmet.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_helmet_chain.png,,,,,,, -/assets/minecraft/textures/items,diamond_helmet.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_helmet_diamond.png,,,,,,, -/assets/minecraft/textures/items,gold_helmet.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_helmet_gold.png,,,,,,, -/assets/minecraft/textures/items,iron_helmet.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_helmet_iron.png,,,,,,, -/assets/minecraft/textures/items,leather_helmet.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_helmet_leather.png,,,,,,, -/assets/minecraft/textures/items,chainmail_leggings.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_leggings_chain.png,,,,,,, -/assets/minecraft/textures/items,diamond_leggings.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_leggings_diamond.png,,,,,,, -/assets/minecraft/textures/items,gold_leggings.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_leggings_gold.png,,,,,,, -/assets/minecraft/textures/items,iron_leggings.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_leggings_iron.png,,,,,,, -/assets/minecraft/textures/items,leather_leggings.png,/mods/ITEMS/minetest-3d_armor/3d_armor/textures,3d_armor_inv_leggings_leather.png,,,,,,, +/assets/minecraft/textures/items,chainmail_boots.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_boots_chain.png,,,,,,, +/assets/minecraft/textures/items,diamond_boots.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_boots_diamond.png,,,,,,, +/assets/minecraft/textures/items,gold_boots.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_boots_gold.png,,,,,,, +/assets/minecraft/textures/items,iron_boots.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_boots_iron.png,,,,,,, +/assets/minecraft/textures/items,leather_boots.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_boots_leather.png,,,,,,, +/assets/minecraft/textures/items,chainmail_chestplate.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_chestplate_chain.png,,,,,,, +/assets/minecraft/textures/items,diamond_chestplate.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_chestplate_diamond.png,,,,,,, +/assets/minecraft/textures/items,gold_chestplate.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_chestplate_gold.png,,,,,,, +/assets/minecraft/textures/items,iron_chestplate.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_chestplate_iron.png,,,,,,, +/assets/minecraft/textures/items,leather_chestplate.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_chestplate_leather.png,,,,,,, +/assets/minecraft/textures/items,chainmail_helmet.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_helmet_chain.png,,,,,,, +/assets/minecraft/textures/items,diamond_helmet.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_helmet_diamond.png,,,,,,, +/assets/minecraft/textures/items,gold_helmet.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_helmet_gold.png,,,,,,, +/assets/minecraft/textures/items,iron_helmet.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_helmet_iron.png,,,,,,, +/assets/minecraft/textures/items,leather_helmet.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_helmet_leather.png,,,,,,, +/assets/minecraft/textures/items,chainmail_leggings.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_leggings_chain.png,,,,,,, +/assets/minecraft/textures/items,diamond_leggings.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_leggings_diamond.png,,,,,,, +/assets/minecraft/textures/items,gold_leggings.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_leggings_gold.png,,,,,,, +/assets/minecraft/textures/items,iron_leggings.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_leggings_iron.png,,,,,,, +/assets/minecraft/textures/items,leather_leggings.png,/mods/ITEMS/minetest-3d_armor/mcl_armor/textures,mcl_armor_inv_leggings_leather.png,,,,,,, /assets/minecraft/textures/items,wooden_armorstand.png,/mods/ITEMS/minetest-3d_armor/3d_armor_stand/textures,3d_armor_stand_item.png,,,,,,, /assets/minecraft/textures/blocks,dispenser_front_horizontal.png,/mods/ITEMS/REDSTONE/mcl_dispensers/textures,mcl_dispensers_dispenser_front_horizontal.png,,,,,,, /assets/minecraft/textures/blocks,dispenser_front_vertical.png,/mods/ITEMS/REDSTONE/mcl_dispensers/textures,mcl_dispensers_dispenser_front_vertical.png,,,,,,,