From a52976a918ba85055a344101062a9f29da432b20 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Tue, 18 Feb 2020 16:00:02 +0100 Subject: [PATCH] Rename 3d_armor_stand to mcl_armor_stand --- mods/ITEMS/3d_armor_stand/README.txt | 6 ----- .../ITEMS/REDSTONE/mcl_dispensers/depends.txt | 2 +- mods/ITEMS/REDSTONE/mcl_dispensers/init.lua | 6 ++--- .../LICENSE.txt | 4 ++-- mods/ITEMS/mcl_armor_stand/README.txt | 6 +++++ .../depends.txt | 0 .../init.lua | 21 +++++++++--------- .../locale/mcl_armor_stand.de.tr} | 2 +- .../locale/mcl_armor_stand.es.tr} | 2 +- .../locale/template.txt | 2 +- .../models/3d_armor_entity.obj | 0 .../models/3d_armor_stand.obj | 0 .../textures/3d_armor_stand_item.png | Bin tools/Conversion_Table.csv | 2 +- 14 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 mods/ITEMS/3d_armor_stand/README.txt rename mods/ITEMS/{3d_armor_stand => mcl_armor_stand}/LICENSE.txt (59%) create mode 100644 mods/ITEMS/mcl_armor_stand/README.txt rename mods/ITEMS/{3d_armor_stand => mcl_armor_stand}/depends.txt (100%) rename mods/ITEMS/{3d_armor_stand => mcl_armor_stand}/init.lua (92%) rename mods/ITEMS/{3d_armor_stand/locale/3d_armor_stand.de.tr => mcl_armor_stand/locale/mcl_armor_stand.de.tr} (96%) rename mods/ITEMS/{3d_armor_stand/locale/3d_armor_stand.es.tr => mcl_armor_stand/locale/mcl_armor_stand.es.tr} (96%) rename mods/ITEMS/{3d_armor_stand => mcl_armor_stand}/locale/template.txt (91%) rename mods/ITEMS/{3d_armor_stand => mcl_armor_stand}/models/3d_armor_entity.obj (100%) rename mods/ITEMS/{3d_armor_stand => mcl_armor_stand}/models/3d_armor_stand.obj (100%) rename mods/ITEMS/{3d_armor_stand => mcl_armor_stand}/textures/3d_armor_stand_item.png (100%) diff --git a/mods/ITEMS/3d_armor_stand/README.txt b/mods/ITEMS/3d_armor_stand/README.txt deleted file mode 100644 index d5a2c18f4e..0000000000 --- a/mods/ITEMS/3d_armor_stand/README.txt +++ /dev/null @@ -1,6 +0,0 @@ -[mod] 3d Armor Stand [3d_armor_stand] -===================================== - -Depends: mcl_armor - -Adds an armor stand for armor storage and display. diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt b/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt index 9eb136da49..ad7c191c27 100644 --- a/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt +++ b/mods/ITEMS/REDSTONE/mcl_dispensers/depends.txt @@ -5,7 +5,7 @@ mcl_tnt mcl_worlds mcl_core mcl_nether -3d_armor_stand +mcl_armor_stand mcl_armor doc? screwdriver? diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua index 30d704065e..5dd0a6a255 100644 --- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua +++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua @@ -156,9 +156,9 @@ local dispenserdef = { local dropnode_below = minetest.get_node(droppos_below) -- Put armor on player or armor stand local standpos - if dropnode.name == "3d_armor_stand:armor_stand" then + if dropnode.name == "mcl_armor_stand:armor_stand" then standpos = droppos - elseif dropnode_below.name == "3d_armor_stand:armor_stand" then + elseif dropnode_below.name == "mcl_armor_stand:armor_stand" then standpos = droppos_below end if standpos then @@ -166,7 +166,7 @@ local dispenserdef = { local dropinv = dropmeta:get_inventory() if dropinv:room_for_item(armor_type, dropitem) then dropinv:add_item(armor_type, dropitem) - minetest.registered_nodes["3d_armor_stand:armor_stand"].on_metadata_inventory_put(standpos) + minetest.registered_nodes["mcl_armor_stand:armor_stand"].on_metadata_inventory_put(standpos) stack:take_item() inv:set_stack("main", stack_id, stack) armor_dispensed = true diff --git a/mods/ITEMS/3d_armor_stand/LICENSE.txt b/mods/ITEMS/mcl_armor_stand/LICENSE.txt similarity index 59% rename from mods/ITEMS/3d_armor_stand/LICENSE.txt rename to mods/ITEMS/mcl_armor_stand/LICENSE.txt index d1947b5651..3ef9506742 100644 --- a/mods/ITEMS/3d_armor_stand/LICENSE.txt +++ b/mods/ITEMS/mcl_armor_stand/LICENSE.txt @@ -1,5 +1,5 @@ -[mod] 3d Armor Stand [3d_armor_stand] -===================================== +[mod] 3d Armor Stand [mcl_armor_stand] +====================================== License Source Code: LGPL v2.1 diff --git a/mods/ITEMS/mcl_armor_stand/README.txt b/mods/ITEMS/mcl_armor_stand/README.txt new file mode 100644 index 0000000000..4ecbbba656 --- /dev/null +++ b/mods/ITEMS/mcl_armor_stand/README.txt @@ -0,0 +1,6 @@ +[mod] 3d Armor Stand [mcl_armor_stand] +====================================== + +Depends: mcl_armor + +Adds an armor stand for armor storage and display. diff --git a/mods/ITEMS/3d_armor_stand/depends.txt b/mods/ITEMS/mcl_armor_stand/depends.txt similarity index 100% rename from mods/ITEMS/3d_armor_stand/depends.txt rename to mods/ITEMS/mcl_armor_stand/depends.txt diff --git a/mods/ITEMS/3d_armor_stand/init.lua b/mods/ITEMS/mcl_armor_stand/init.lua similarity index 92% rename from mods/ITEMS/3d_armor_stand/init.lua rename to mods/ITEMS/mcl_armor_stand/init.lua index 98d3b6a7ca..5ebb8d621d 100644 --- a/mods/ITEMS/3d_armor_stand/init.lua +++ b/mods/ITEMS/mcl_armor_stand/init.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("3d_armor_stand") +local S = minetest.get_translator("mcl_armor_stand") local elements = {"head", "torso", "legs", "feet"} @@ -8,7 +8,7 @@ local function get_stand_object(pos) for _, obj in pairs(objects) do local ent = obj:get_luaentity() if ent then - if ent.name == "3d_armor_stand:armor_entity" then + if ent.name == "mcl_armor_stand:armor_entity" then -- Remove duplicates if object then obj:remove() @@ -25,12 +25,12 @@ local function update_entity(pos) local node = minetest.get_node(pos) local object = get_stand_object(pos) if object then - if not string.find(node.name, "3d_armor_stand:") then + if not string.find(node.name, "mcl_armor_stand:") then object:remove() return end else - object = minetest.add_entity(pos, "3d_armor_stand:armor_entity") + object = minetest.add_entity(pos, "mcl_armor_stand:armor_entity") end if object then local texture = "blank.png" @@ -87,7 +87,7 @@ local drop_armor = function(pos) end -- TODO: The armor stand should be an entity -minetest.register_node("3d_armor_stand:armor_stand", { +minetest.register_node("mcl_armor_stand:armor_stand", { description = S("Armor Stand"), _doc_items_longdesc = S("An armor stand is a decorative object which can display different pieces of armor. Anything which players can wear as armor can also be put on an armor stand."), _doc_items_usagehelp = S("Just place an armor item on the armor stand. To take the top piece of armor from the armor stand, select your hand and use the place key on the armor stand."), @@ -186,7 +186,7 @@ minetest.register_node("3d_armor_stand:armor_stand", { return itemstack end, after_place_node = function(pos) - minetest.add_entity(pos, "3d_armor_stand:armor_entity") + minetest.add_entity(pos, "mcl_armor_stand:armor_entity") end, allow_metadata_inventory_take = function(pos, listname, index, stack, player) local name = player:get_player_name() @@ -242,7 +242,7 @@ minetest.register_node("3d_armor_stand:armor_stand", { end, }) -minetest.register_entity("3d_armor_stand:armor_entity", { +minetest.register_entity("mcl_armor_stand:armor_entity", { physical = true, visual = "mesh", mesh = "3d_armor_entity.obj", @@ -282,8 +282,8 @@ minetest.register_entity("3d_armor_stand:armor_entity", { -- FIXME: Armor helper entity can get destroyed by /clearobjects minetest.register_lbm({ label = "Respawn armor stand entities", - name = "3d_armor_stand:respawn_entities", - nodenames = {"3d_armor_stand:armor_stand"}, + name = "mcl_armor_stand:respawn_entities", + nodenames = {"mcl_armor_stand:armor_stand"}, run_at_every_load = true, action = function(pos, node) update_entity(pos, node) @@ -291,7 +291,7 @@ minetest.register_lbm({ }) minetest.register_craft({ - output = "3d_armor_stand:armor_stand", + output = "mcl_armor_stand:armor_stand", recipe = { {"mcl_core:stick", "mcl_core:stick", "mcl_core:stick"}, {"", "mcl_core:stick", ""}, @@ -299,3 +299,4 @@ minetest.register_craft({ } }) +minetest.register_alias("3d_armor_stand:armor_stand", "mcl_armor_stand:armor_stand") diff --git a/mods/ITEMS/3d_armor_stand/locale/3d_armor_stand.de.tr b/mods/ITEMS/mcl_armor_stand/locale/mcl_armor_stand.de.tr similarity index 96% rename from mods/ITEMS/3d_armor_stand/locale/3d_armor_stand.de.tr rename to mods/ITEMS/mcl_armor_stand/locale/mcl_armor_stand.de.tr index b947719bb3..61b1efa529 100644 --- a/mods/ITEMS/3d_armor_stand/locale/3d_armor_stand.de.tr +++ b/mods/ITEMS/mcl_armor_stand/locale/mcl_armor_stand.de.tr @@ -1,4 +1,4 @@ -# textdomain: 3d_armor_stand +# textdomain: mcl_armor_stand Armor Stand=Rüstungsständer An armor stand is a decorative object which can display different pieces of armor. Anything which players can wear as armor can also be put on an armor stand.=Ein Rüstungsständer ist ein dekoratives Objekt, welches verschiedene Teile einer Rüstung präsentiert. Alles, was Spieler als Rüstung tragen kann, kann auch an einem Rüstungsständer platziert werden. Just place an armor item on the armor stand. To take the top piece of armor from the armor stand, select your hand and use the place key on the armor stand.=Platzieren Sie einfach einen Rüstungsgegenstand auf den Rüstungsständer. Um das oberte Rüstungsteil zu nehmen, wählen Sie Ihre Hand aus und benutzen Sie die Platzieren-Taste auf dem Rüstungsständer. diff --git a/mods/ITEMS/3d_armor_stand/locale/3d_armor_stand.es.tr b/mods/ITEMS/mcl_armor_stand/locale/mcl_armor_stand.es.tr similarity index 96% rename from mods/ITEMS/3d_armor_stand/locale/3d_armor_stand.es.tr rename to mods/ITEMS/mcl_armor_stand/locale/mcl_armor_stand.es.tr index 510a7398d3..8e33389a3e 100644 --- a/mods/ITEMS/3d_armor_stand/locale/3d_armor_stand.es.tr +++ b/mods/ITEMS/mcl_armor_stand/locale/mcl_armor_stand.es.tr @@ -1,4 +1,4 @@ -# textdomain: 3d_armor_stand +# textdomain: mcl_armor_stand Armor Stand=Soporte para armadura An armor stand is a decorative object which can display different pieces of armor. Anything which players can wear as armor can also be put on an armor stand.=Un soporte para armadura es un objeto decorativo que puede mostrar diferentes piezas de armadura. Cualquier cosa que los jugadores puedan usar como armadura también se puede poner en un soporte para armadura. Just place an armor item on the armor stand. To take the top piece of armor from the armor stand, select your hand and use the place key on the armor stand.=Simplemente coloca un objeto de armadura en el soporte para armadura. Para tomar la pieza superior de armadura del soporte para armadura, seleccione su mano y use la tecla de posición en el soporte para armadura. diff --git a/mods/ITEMS/3d_armor_stand/locale/template.txt b/mods/ITEMS/mcl_armor_stand/locale/template.txt similarity index 91% rename from mods/ITEMS/3d_armor_stand/locale/template.txt rename to mods/ITEMS/mcl_armor_stand/locale/template.txt index 9f7d0ca4cf..fa6acb73b4 100644 --- a/mods/ITEMS/3d_armor_stand/locale/template.txt +++ b/mods/ITEMS/mcl_armor_stand/locale/template.txt @@ -1,4 +1,4 @@ -# textdomain: 3d_armor_stand +# textdomain: mcl_armor_stand Armor Stand= An armor stand is a decorative object which can display different pieces of armor. Anything which players can wear as armor can also be put on an armor stand.= Just place an armor item on the armor stand. To take the top piece of armor from the armor stand, select your hand and use the place key on the armor stand.= diff --git a/mods/ITEMS/3d_armor_stand/models/3d_armor_entity.obj b/mods/ITEMS/mcl_armor_stand/models/3d_armor_entity.obj similarity index 100% rename from mods/ITEMS/3d_armor_stand/models/3d_armor_entity.obj rename to mods/ITEMS/mcl_armor_stand/models/3d_armor_entity.obj diff --git a/mods/ITEMS/3d_armor_stand/models/3d_armor_stand.obj b/mods/ITEMS/mcl_armor_stand/models/3d_armor_stand.obj similarity index 100% rename from mods/ITEMS/3d_armor_stand/models/3d_armor_stand.obj rename to mods/ITEMS/mcl_armor_stand/models/3d_armor_stand.obj diff --git a/mods/ITEMS/3d_armor_stand/textures/3d_armor_stand_item.png b/mods/ITEMS/mcl_armor_stand/textures/3d_armor_stand_item.png similarity index 100% rename from mods/ITEMS/3d_armor_stand/textures/3d_armor_stand_item.png rename to mods/ITEMS/mcl_armor_stand/textures/3d_armor_stand_item.png diff --git a/tools/Conversion_Table.csv b/tools/Conversion_Table.csv index 57a84c1593..987ab64e1b 100644 --- a/tools/Conversion_Table.csv +++ b/tools/Conversion_Table.csv @@ -609,7 +609,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted? /assets/minecraft/textures/items,gold_leggings.png,/mods/ITEMS/mcl_armor/textures,mcl_armor_inv_leggings_gold.png,,,,,,, /assets/minecraft/textures/items,iron_leggings.png,/mods/ITEMS/mcl_armor/textures,mcl_armor_inv_leggings_iron.png,,,,,,, /assets/minecraft/textures/items,leather_leggings.png,/mods/ITEMS/mcl_armor/textures,mcl_armor_inv_leggings_leather.png,,,,,,, -/assets/minecraft/textures/items,wooden_armorstand.png,/mods/ITEMS/3d_armor_stand/textures,3d_armor_stand_item.png,,,,,,, +/assets/minecraft/textures/items,wooden_armorstand.png,/mods/ITEMS/mcl_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,,,,,,, /assets/minecraft/textures/blocks,dropper_front_horizontal.png,/mods/ITEMS/REDSTONE/mcl_droppers/textures,mcl_droppers_dropper_front_horizontal.png,,,,,,,