Rename itemframes mod to mcl_itemframes

This commit is contained in:
Wuzzy 2018-05-12 18:18:17 +02:00
parent b0fa20df75
commit d8ff91e089
7 changed files with 17 additions and 15 deletions

@ -1,6 +1,6 @@
local tmp = {}
minetest.register_entity("itemframes:item",{
minetest.register_entity("mcl_itemframes:item",{
hp_max = 1,
visual="wielditem",
visual_size={x=0.3,y=0.3},
@ -43,12 +43,12 @@ facedir[3] = {x=-1,y=0,z=0}
local remove_item = function(pos, node)
local objs = nil
if node.name == "itemframes:frame" then
if node.name == "mcl_itemframes:item_frame" then
objs = minetest.get_objects_inside_radius(pos, .5)
end
if objs then
for _, obj in ipairs(objs) do
if obj and obj:get_luaentity() and obj:get_luaentity().name == "itemframes:item" then
if obj and obj:get_luaentity() and obj:get_luaentity().name == "mcl_itemframes:item" then
obj:remove()
end
end
@ -59,7 +59,7 @@ local update_item = function(pos, node)
remove_item(pos, node)
local meta = minetest.get_meta(pos)
if meta:get_string("item") ~= "" then
if node.name == "itemframes:frame" then
if node.name == "mcl_itemframes:item_frame" then
local posad = facedir[node.param2]
pos.x = pos.x + posad.x*6.5/16
pos.y = pos.y + posad.y*6.5/16
@ -67,8 +67,8 @@ local update_item = function(pos, node)
end
tmp.nodename = node.name
tmp.texture = ItemStack(meta:get_string("item")):get_name()
local e = minetest.add_entity(pos,"itemframes:item")
if node.name == "itemframes:frame" then
local e = minetest.add_entity(pos,"mcl_itemframes:item")
if node.name == "mcl_itemframes:item_frame" then
local yaw = math.pi*2 - node.param2 * math.pi/2
e:setyaw(yaw)
end
@ -77,7 +77,7 @@ end
local drop_item = function(pos, node, meta)
if meta:get_string("item") ~= "" then
if node.name == "itemframes:frame" and not minetest.settings:get_bool("creative_mode") then
if node.name == "mcl_itemframes:item_frame" and not minetest.settings:get_bool("creative_mode") then
local item = ItemStack(minetest.deserialize(meta:get_string("itemdata")))
minetest.add_item(pos, item)
end
@ -92,18 +92,18 @@ if minetest.get_modpath("screwdriver") then
on_rotate = screwdriver.disallow
end
minetest.register_node("itemframes:frame",{
minetest.register_node("mcl_itemframes:item_frame",{
description = "Item Frame",
_doc_items_longdesc = "Item frames are decorative blocks in which items can be placed.",
_doc_items_usagehelp = "Hold any item in your hand and right-click the item frame to place the item into the frame. Rightclick the item frame again to retrieve the item.",
drawtype = "mesh",
is_ground_content = false,
mesh = "itemframes_itemframe1facedir.obj",
mesh = "mcl_itemframes_itemframe1facedir.obj",
selection_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} },
collision_box = { type = "fixed", fixed = {-6/16, -6/16, 7/16, 6/16, 6/16, 0.5} },
tiles = {"itemframe_background.png", "itemframe_background.png", "itemframe_background.png", "itemframe_background.png", "default_wood.png", "itemframe_background.png"},
inventory_image = "itemframes_frame.png",
wield_image = "itemframes_frame.png",
tiles = {"mcl_itemframes_itemframe_background.png", "mcl_itemframes_itemframe_background.png", "mcl_itemframes_itemframe_background.png", "mcl_itemframes_itemframe_background.png", "default_wood.png", "mcl_itemframes_itemframe_background.png"},
inventory_image = "mcl_itemframes_item_frame.png",
wield_image = "mcl_itemframes_item_frame.png",
paramtype = "light",
paramtype2 = "facedir",
sunlight_propagates = true,
@ -135,10 +135,12 @@ minetest.register_node("itemframes:frame",{
})
minetest.register_craft({
output = 'itemframes:frame',
output = 'mcl_itemframes:item_frame',
recipe = {
{'mcl_core:stick', 'mcl_core:stick', 'mcl_core:stick'},
{'mcl_core:stick', 'mcl_mobitems:leather', 'mcl_core:stick'},
{'mcl_core:stick', 'mcl_core:stick', 'mcl_core:stick'},
}
})
minetest.register_alias("itemframes:frame", "mcl_itemframes:item_frame")

Before

Width:  |  Height:  |  Size: 232 B

After

Width:  |  Height:  |  Size: 232 B

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 225 B

@ -11,7 +11,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
/assets/minecraft/textures/items,bucket_water.png,/mods/ITEMS/mcl_buckets/textures,bucket_water.png,,,,,,,
/assets/minecraft/textures/items,bucket_water.png,/mods/ITEMS/mcl_buckets/textures,bucket_river_water.png,,,,,,,
/assets/minecraft/textures/items,bucket_lava.png,/mods/ITEMS/mcl_buckets/textures,bucket_lava.png,,,,,,,
/assets/minecraft/textures/items,item_frame.png,/mods/ITEMS/itemframes/textures,itemframes_frame.png,,,,,,,
/assets/minecraft/textures/items,item_frame.png,/mods/ITEMS/mcl_itemframes/textures,mcl_itemframes_item_frame.png,,,,,,,
/assets/minecraft/textures/blocks,anvil_base.png,/mods/ITEMS/mcl_anvils/textures,mcl_anvils_anvil_base.png,,,,,,,
/assets/minecraft/textures/blocks,anvil_top_damaged_0.png,/mods/ITEMS/mcl_anvils/textures,mcl_anvils_anvil_top_damaged_0.png,,,,,,,
/assets/minecraft/textures/blocks,anvil_top_damaged_1.png,/mods/ITEMS/mcl_anvils/textures,mcl_anvils_anvil_top_damaged_1.png,,,,,,,
@ -20,7 +20,7 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt,Blacklisted?
/assets/minecraft/textures/blocks,anvil_side.png,/mods/ITEMS/mcl_anvils/textures,mcl_anvils_anvil_side.png,,,,,,,
/assets/minecraft/textures/items,name_tag.png,/mods/ENTITIES/mobs/textures,mobs_nametag.png,,,,,,,
/assets/minecraft/textures/gui,icons.png,/mods/ENTITIES/mobs/textures,mobs_blood.png,16,0,9,9,0,0,y
/assets/minecraft/textures/blocks,itemframe_background.png,/mods/ITEMS/itemframes/textures,itemframe_background.png,,,,,,,
/assets/minecraft/textures/blocks,itemframe_background.png,/mods/ITEMS/mcl_itemframes/textures,mcl_itemframes_itemframe_background.png,,,,,,,
/assets/minecraft/textures/items,bed.png,/mods/ITEMS/mcl_beds/textures,mcl_beds_bed_red.png,,,,,,,
/assets/minecraft/textures/items,acacia_boat.png,/mods/ENTITIES/mcl_boats/textures,mcl_boats_acacia_boat.png,,,,,,,
/assets/minecraft/textures/items,oak_boat.png,/mods/ENTITIES/mcl_boats/textures,mcl_boats_oak_boat.png,,,,,,,

1 Source path Source file Target path Target file xs ys xl yl xt yt Blacklisted?
11 /assets/minecraft/textures/items bucket_water.png /mods/ITEMS/mcl_buckets/textures bucket_water.png
12 /assets/minecraft/textures/items bucket_water.png /mods/ITEMS/mcl_buckets/textures bucket_river_water.png
13 /assets/minecraft/textures/items bucket_lava.png /mods/ITEMS/mcl_buckets/textures bucket_lava.png
14 /assets/minecraft/textures/items item_frame.png /mods/ITEMS/itemframes/textures /mods/ITEMS/mcl_itemframes/textures itemframes_frame.png mcl_itemframes_item_frame.png
15 /assets/minecraft/textures/blocks anvil_base.png /mods/ITEMS/mcl_anvils/textures mcl_anvils_anvil_base.png
16 /assets/minecraft/textures/blocks anvil_top_damaged_0.png /mods/ITEMS/mcl_anvils/textures mcl_anvils_anvil_top_damaged_0.png
17 /assets/minecraft/textures/blocks anvil_top_damaged_1.png /mods/ITEMS/mcl_anvils/textures mcl_anvils_anvil_top_damaged_1.png
20 /assets/minecraft/textures/blocks anvil_side.png /mods/ITEMS/mcl_anvils/textures mcl_anvils_anvil_side.png
21 /assets/minecraft/textures/items name_tag.png /mods/ENTITIES/mobs/textures mobs_nametag.png
22 /assets/minecraft/textures/gui icons.png /mods/ENTITIES/mobs/textures mobs_blood.png 16 0 9 9 0 0 y
23 /assets/minecraft/textures/blocks itemframe_background.png /mods/ITEMS/itemframes/textures /mods/ITEMS/mcl_itemframes/textures itemframe_background.png mcl_itemframes_itemframe_background.png
24 /assets/minecraft/textures/items bed.png /mods/ITEMS/mcl_beds/textures mcl_beds_bed_red.png
25 /assets/minecraft/textures/items acacia_boat.png /mods/ENTITIES/mcl_boats/textures mcl_boats_acacia_boat.png
26 /assets/minecraft/textures/items oak_boat.png /mods/ENTITIES/mcl_boats/textures mcl_boats_oak_boat.png