diff --git a/mods/ITEMS/mcl_portals/portal_end.lua b/mods/ITEMS/mcl_portals/portal_end.lua index 8ed499b599..545a54a3cd 100644 --- a/mods/ITEMS/mcl_portals/portal_end.lua +++ b/mods/ITEMS/mcl_portals/portal_end.lua @@ -415,13 +415,62 @@ minetest.register_abm({ local portal_open_help = "To open an End portal, place an upright frame of quartz blocks with a length of 4 blocks and a height of 5 blocks, leaving only air in the center. After placing this frame, use an eye of ender on the frame. The eye of ender is destroyed in the process." --- Frame material +-- Fake frame material minetest.override_item(portal_frame, { _doc_items_longdesc = "A block of quartz can be used to create End portals.", _doc_items_usagehelp = portal_open_help, on_destruct = destroy_portal, }) + +-- End Portal Frame (TODO) +minetest.register_node("mcl_portals:end_portal_frame", { + description = "End Portal Frame", + groups = { creative_breakable = 1, deco_block = 1 }, + tiles = { "mcl_portals_endframe_top.png", "mcl_portals_endframe_top.png", "mcl_portals_endframe_side.png" }, + paramtype2 = "facedir", + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { -0.5, -0.5, -0.5, 0.5, 5/16, 0.5 }, + }, + is_ground_content = false, + sounds = mcl_sounds.node_sound_stone_defaults(), + paramtype = "light", + sunlight_propagates = false, + light_source = 1, + _mcl_blast_resistance = 18000000, + _mcl_hardness = -1, +}) + +minetest.register_node("mcl_portals:end_portal_frame_eye", { + description = "End Portal Frame with Eye of Ender", + _doc_items_create_entry = false, + groups = { creative_breakable = 1, not_in_creative_inventory = 1 }, + tiles = { "mcl_portals_endframe_top.png^[lowpart:75:mcl_portals_endframe_eye.png", "mcl_portals_endframe_top.png", "mcl_portals_endframe_eye.png^mcl_portals_endframe_side.png" }, + paramtype2 = "facedir", + drawtype = "nodebox", + node_box = { + type = "fixed", + fixed = { + { -0.5, -0.5, -0.5, 0.5, 5/16, 0.5 }, -- Frame + { -4/16, 5/16, -4/16, 4/16, 0.5, 4/16 }, -- Eye + }, + }, + is_ground_content = false, + sounds = mcl_sounds.node_sound_stone_defaults(), + paramtype = "light", + sunlight_propagates = false, + light_source = 1, + _mcl_blast_resistance = 18000000, + _mcl_hardness = -1, +}) + +if minetest.get_modpath("doc") then + doc.add_entry_alias("nodes", "mcl_portals:end_portal_frame", "nodes", "mcl_portals:end_portal_frame_eye") +end + + -- Portal opener minetest.override_item("mcl_end:ender_eye", { _doc_items_longdesc = "An eye of ender can be used to open End portals.", diff --git a/mods/ITEMS/mcl_portals/textures/mcl_portals_endframe_eye.png b/mods/ITEMS/mcl_portals/textures/mcl_portals_endframe_eye.png new file mode 100644 index 0000000000..c1d3a2bb62 Binary files /dev/null and b/mods/ITEMS/mcl_portals/textures/mcl_portals_endframe_eye.png differ diff --git a/mods/ITEMS/mcl_portals/textures/mcl_portals_endframe_side.png b/mods/ITEMS/mcl_portals/textures/mcl_portals_endframe_side.png new file mode 100644 index 0000000000..a2370ecefe Binary files /dev/null and b/mods/ITEMS/mcl_portals/textures/mcl_portals_endframe_side.png differ diff --git a/mods/ITEMS/mcl_portals/textures/mcl_portals_endframe_top.png b/mods/ITEMS/mcl_portals/textures/mcl_portals_endframe_top.png new file mode 100644 index 0000000000..ad2b729fff Binary files /dev/null and b/mods/ITEMS/mcl_portals/textures/mcl_portals_endframe_top.png differ diff --git a/mods/MISC/mcl_wip/init.lua b/mods/MISC/mcl_wip/init.lua index 2028d4b8c6..c6a986f1b2 100644 --- a/mods/MISC/mcl_wip/init.lua +++ b/mods/MISC/mcl_wip/init.lua @@ -21,6 +21,8 @@ local wip_items = { "mcl_minecarts:tnt_minecart", "mcl_minecarts:activator_rail", "mcl_minecarts:detector_rail", + "mcl_portals:end_portal_frame", + "mcl_portals:end_portal_frame_eye", } for i=1,#wip_items do diff --git a/tools/Texture_Conversion_Table.csv b/tools/Texture_Conversion_Table.csv index d1a8ea3ea7..5e052639e0 100644 --- a/tools/Texture_Conversion_Table.csv +++ b/tools/Texture_Conversion_Table.csv @@ -858,3 +858,6 @@ Source path,Source file,Target path,Target file,xs,ys,xl,yl,xt,yt /assets/minecraft/textures/entity/chest,normal.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_normal.png,,,,,, /assets/minecraft/textures/entity/chest,normal_double.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_normal_double.png,,,,,, /assets/minecraft/textures/entity/chest,ender.png,/mods/ITEMS/mcl_chests/textures,mcl_chests_ender.png,,,,,, +/assets/minecraft/textures/blocks,endframe_top.png,/mods/ITEMS/mcl_portals/textures,mcl_portals_endframe_top.png,,,,,, +/assets/minecraft/textures/blocks,endframe_side.png,/mods/ITEMS/mcl_portals/textures,mcl_portals_endframe_side.png,,,,,, +/assets/minecraft/textures/blocks,endframe_eye.png,/mods/ITEMS/mcl_portals/textures,mcl_portals_endframe_eye.png,,,,,,