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 4e3229c5..13d547f9 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 0f4816e4..0eccd691 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 f05d5045..36dad2a5 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 4d595c8c..de5a2f20 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 bcca4772..7032994a 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 46d93c42..056b070d 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 03227e85..84f25524 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 c17d2db0..9eb136da 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 fd469781..4ca7976f 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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

!g7>dxTv+SS zT2uRY^YJy(Z&pXy&NB5r!pzWM$auww_f)2G+nJ@YT9=~=j=$e_KO*`_@$IA9Q-cpR zb~{YU3~)Q@om_7JI@##4^0~D?udMKU`d{l-mvT*z_(sF{U2S0tx?FNUUjII^OK3;6 z_v7-;EX}oZ_ISNtsVh;k^6~GC-`~Gj{q(ijX*VHVEnM0p`n~f8zhCBGD~ldf)qnL= zZpquZREur){PSK%xMz^9L+dP}NIJ>sVP0O%9eg9r|)&H0O&JVQgS~;6#cDY09 z59QS9QEQK6^uD(|6aVb#wJ7Uf@#Qv`w`^LZXKMZC`&;$JGS`1eU!0w4)R)ZIpPu`C z854h^`7%) zUB2h}_3yhX;(G6OG@jd(KKs=5BNyHunPxX@b@Nr}hd zYMZU+zpxjLo{@ZMt@wwa=k>*hrT^L9uZfxMbaQL*JB@z=zkgow%K3R`>l@Br6Zlr2 zsw(?)SwLDR2Y{r)}A_130)_eAVj%$n}LlYhDL{8BwtnfWW_|Jm=FeQXJr zf7$(g-&;QYt#owy6c}{h=fwHX>X${!-ZAem%iHwj=lgT<@A4P@n|Jj6nyNpk&3n(q e+`oO}@c-|r>GR^c?$0}3z<2(;Q2@gkMg{ -* 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 00000000..19c2424d --- /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 007bb274..d06d5444 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 774bd07a..42ad8f24 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 12c7c09e..09da3a9c 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 6606d2ff..e770dff0 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 f0126bca..8a95fca0 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 e6be7490..66133c74 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 b6cac219..2bbf820f 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 2bb7ff61..fdde8004 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 b6cac219..2bbf820f 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 3fb37201..d0334ff5 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 3e89821c..6bbe4cbd 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 19e5c2d5..99939d1d 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 e0804a6f..09bdf520 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 401ba160..c1f557d9 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 ab4a9451..db82bd1f 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,,,,,,,