1
0
Fork 0

Rename 3d_armor_stand to mcl_armor_stand

This commit is contained in:
Wuzzy 2020-02-18 16:00:02 +01:00
parent ab4e46f97b
commit a52976a918
14 changed files with 27 additions and 26 deletions

View File

@ -1,6 +0,0 @@
[mod] 3d Armor Stand [3d_armor_stand]
=====================================
Depends: mcl_armor
Adds an armor stand for armor storage and display.

View File

@ -5,7 +5,7 @@ mcl_tnt
mcl_worlds mcl_worlds
mcl_core mcl_core
mcl_nether mcl_nether
3d_armor_stand mcl_armor_stand
mcl_armor mcl_armor
doc? doc?
screwdriver? screwdriver?

View File

@ -156,9 +156,9 @@ local dispenserdef = {
local dropnode_below = minetest.get_node(droppos_below) local dropnode_below = minetest.get_node(droppos_below)
-- Put armor on player or armor stand -- Put armor on player or armor stand
local standpos local standpos
if dropnode.name == "3d_armor_stand:armor_stand" then if dropnode.name == "mcl_armor_stand:armor_stand" then
standpos = droppos 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 standpos = droppos_below
end end
if standpos then if standpos then
@ -166,7 +166,7 @@ local dispenserdef = {
local dropinv = dropmeta:get_inventory() local dropinv = dropmeta:get_inventory()
if dropinv:room_for_item(armor_type, dropitem) then if dropinv:room_for_item(armor_type, dropitem) then
dropinv:add_item(armor_type, dropitem) 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() stack:take_item()
inv:set_stack("main", stack_id, stack) inv:set_stack("main", stack_id, stack)
armor_dispensed = true armor_dispensed = true

View File

@ -1,5 +1,5 @@
[mod] 3d Armor Stand [3d_armor_stand] [mod] 3d Armor Stand [mcl_armor_stand]
===================================== ======================================
License Source Code: LGPL v2.1 License Source Code: LGPL v2.1

View File

@ -0,0 +1,6 @@
[mod] 3d Armor Stand [mcl_armor_stand]
======================================
Depends: mcl_armor
Adds an armor stand for armor storage and display.

View File

@ -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"} local elements = {"head", "torso", "legs", "feet"}
@ -8,7 +8,7 @@ local function get_stand_object(pos)
for _, obj in pairs(objects) do for _, obj in pairs(objects) do
local ent = obj:get_luaentity() local ent = obj:get_luaentity()
if ent then if ent then
if ent.name == "3d_armor_stand:armor_entity" then if ent.name == "mcl_armor_stand:armor_entity" then
-- Remove duplicates -- Remove duplicates
if object then if object then
obj:remove() obj:remove()
@ -25,12 +25,12 @@ local function update_entity(pos)
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
local object = get_stand_object(pos) local object = get_stand_object(pos)
if object then 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() object:remove()
return return
end end
else else
object = minetest.add_entity(pos, "3d_armor_stand:armor_entity") object = minetest.add_entity(pos, "mcl_armor_stand:armor_entity")
end end
if object then if object then
local texture = "blank.png" local texture = "blank.png"
@ -87,7 +87,7 @@ local drop_armor = function(pos)
end end
-- TODO: The armor stand should be an entity -- 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"), 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_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."), _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 return itemstack
end, end,
after_place_node = function(pos) after_place_node = function(pos)
minetest.add_entity(pos, "3d_armor_stand:armor_entity") minetest.add_entity(pos, "mcl_armor_stand:armor_entity")
end, end,
allow_metadata_inventory_take = function(pos, listname, index, stack, player) allow_metadata_inventory_take = function(pos, listname, index, stack, player)
local name = player:get_player_name() local name = player:get_player_name()
@ -242,7 +242,7 @@ minetest.register_node("3d_armor_stand:armor_stand", {
end, end,
}) })
minetest.register_entity("3d_armor_stand:armor_entity", { minetest.register_entity("mcl_armor_stand:armor_entity", {
physical = true, physical = true,
visual = "mesh", visual = "mesh",
mesh = "3d_armor_entity.obj", 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 -- FIXME: Armor helper entity can get destroyed by /clearobjects
minetest.register_lbm({ minetest.register_lbm({
label = "Respawn armor stand entities", label = "Respawn armor stand entities",
name = "3d_armor_stand:respawn_entities", name = "mcl_armor_stand:respawn_entities",
nodenames = {"3d_armor_stand:armor_stand"}, nodenames = {"mcl_armor_stand:armor_stand"},
run_at_every_load = true, run_at_every_load = true,
action = function(pos, node) action = function(pos, node)
update_entity(pos, node) update_entity(pos, node)
@ -291,7 +291,7 @@ minetest.register_lbm({
}) })
minetest.register_craft({ minetest.register_craft({
output = "3d_armor_stand:armor_stand", output = "mcl_armor_stand:armor_stand",
recipe = { recipe = {
{"mcl_core:stick", "mcl_core:stick", "mcl_core:stick"}, {"mcl_core:stick", "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")

View File

@ -1,4 +1,4 @@
# textdomain: 3d_armor_stand # textdomain: mcl_armor_stand
Armor Stand=Rüstungsständer 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. 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. 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.

View File

@ -1,4 +1,4 @@
# textdomain: 3d_armor_stand # textdomain: mcl_armor_stand
Armor Stand=Soporte para armadura 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. 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. 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.

View File

@ -1,4 +1,4 @@
# textdomain: 3d_armor_stand # textdomain: mcl_armor_stand
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.= 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.= 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.=

View File

Before

Width:  |  Height:  |  Size: 201 B

After

Width:  |  Height:  |  Size: 201 B

View File

@ -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,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,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,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_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,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,,,,,,, /assets/minecraft/textures/blocks,dropper_front_horizontal.png,/mods/ITEMS/REDSTONE/mcl_droppers/textures,mcl_droppers_dropper_front_horizontal.png,,,,,,,

1 Source path Source file Target path Target file xs ys xl yl xt yt Blacklisted?
609 /assets/minecraft/textures/items gold_leggings.png /mods/ITEMS/mcl_armor/textures mcl_armor_inv_leggings_gold.png
610 /assets/minecraft/textures/items iron_leggings.png /mods/ITEMS/mcl_armor/textures mcl_armor_inv_leggings_iron.png
611 /assets/minecraft/textures/items leather_leggings.png /mods/ITEMS/mcl_armor/textures mcl_armor_inv_leggings_leather.png
612 /assets/minecraft/textures/items wooden_armorstand.png /mods/ITEMS/3d_armor_stand/textures /mods/ITEMS/mcl_armor_stand/textures 3d_armor_stand_item.png
613 /assets/minecraft/textures/blocks dispenser_front_horizontal.png /mods/ITEMS/REDSTONE/mcl_dispensers/textures mcl_dispensers_dispenser_front_horizontal.png
614 /assets/minecraft/textures/blocks dispenser_front_vertical.png /mods/ITEMS/REDSTONE/mcl_dispensers/textures mcl_dispensers_dispenser_front_vertical.png
615 /assets/minecraft/textures/blocks dropper_front_horizontal.png /mods/ITEMS/REDSTONE/mcl_droppers/textures mcl_droppers_dropper_front_horizontal.png