diff --git a/mods/MAPGEN/mcl_portals/LICENSE b/mods/MAPGEN/mcl_portals/LICENSE new file mode 100644 index 00000000..ece42d0a --- /dev/null +++ b/mods/MAPGEN/mcl_portals/LICENSE @@ -0,0 +1,7 @@ +The MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/mods/MAPGEN/mcl_portals/README.md b/mods/MAPGEN/mcl_portals/README.md new file mode 100644 index 00000000..09b4f311 --- /dev/null +++ b/mods/MAPGEN/mcl_portals/README.md @@ -0,0 +1,9 @@ +# Portals mod for MineClone 2 +## How to create portals + +Nether portal: Build an upright frame of obsidian, 4 blocks wide and 5 blocks high, and use a flint and steel inside it. +End portal: Build an upright frame of red nether brick blocks, 4 blocks wide and 5 blocks high, and use an eye of ender inside it. + +## Credits +Created by maikerumine and Wuzzy. +License: MIT License (see `LICENSE`). diff --git a/mods/MAPGEN/mcl_portals/depends.txt b/mods/MAPGEN/mcl_portals/depends.txt new file mode 100644 index 00000000..fbb8a6e2 --- /dev/null +++ b/mods/MAPGEN/mcl_portals/depends.txt @@ -0,0 +1,7 @@ +mcl_init +mcl_util +mcl_core +mcl_fire +mcl_nether +mcl_end +doc? diff --git a/mods/MAPGEN/mcl_portals/description.txt b/mods/MAPGEN/mcl_portals/description.txt new file mode 100644 index 00000000..fe84531f --- /dev/null +++ b/mods/MAPGEN/mcl_portals/description.txt @@ -0,0 +1 @@ +Adds buildable portals to the Nether and End dimensions. diff --git a/mods/MAPGEN/mcl_portals/init.lua b/mods/MAPGEN/mcl_portals/init.lua new file mode 100644 index 00000000..cf4716c4 --- /dev/null +++ b/mods/MAPGEN/mcl_portals/init.lua @@ -0,0 +1,10 @@ +-- Load files + +-- Nether portal: +-- Obsidian frame, activated by flint and steel +dofile(minetest.get_modpath("mcl_portals").."/portal_nether.lua") + +-- End portal (W.I.P): +-- Red nether brick block frame, activated by an eye of ender +dofile(minetest.get_modpath("mcl_portals").."/portal_end.lua") + diff --git a/mods/MAPGEN/mcl_portals/mod.conf b/mods/MAPGEN/mcl_portals/mod.conf new file mode 100644 index 00000000..e82fbe6c --- /dev/null +++ b/mods/MAPGEN/mcl_portals/mod.conf @@ -0,0 +1 @@ +name = mcl_portals diff --git a/mods/MAPGEN/mcl_portals/portal_end.lua b/mods/MAPGEN/mcl_portals/portal_end.lua new file mode 100644 index 00000000..2de6174f --- /dev/null +++ b/mods/MAPGEN/mcl_portals/portal_end.lua @@ -0,0 +1,385 @@ +-- Parameters + +local END_DEPTH = mcl_vars.mg_end_min +local TCAVE = 0.6 +local nobj_cave = nil +-- 3D noise + +local np_cave = { + offset = 0, + scale = 1, + spread = {x = 384, y = 128, z = 384}, -- squashed 3:1 + seed = 59033, + octaves = 5, + persist = 0.7 +} + +-- Nodes +minetest.register_node("mcl_portals:portal_end", { + description = "End Portal", + tiles = { + "blank.png", + "blank.png", + "blank.png", + "blank.png", + { + name = "mcl_portals_end_portal.png", + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 2.0, + }, + }, + { + name = "mcl_portals_end_portal.png", + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 2.0, + }, + }, + }, + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + sunlight_propagates = true, + use_texture_alpha = true, + walkable = false, + diggable = false, + pointable = false, + buildable_to = false, + is_ground_content = false, + drop = "", + -- This is 15 in MC. + light_source = 14, + post_effect_color = {a = 192, r = 0, g = 0, b = 0}, + alpha = 192, + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.1, 0.5, 0.5, 0.1}, + }, + }, + groups = {not_in_creative_inventory = 1} +}) + +local function build_end_portal(pos, target3) + local p = {x = pos.x - 1, y = pos.y - 1, z = pos.z} + local p1 = {x = pos.x - 1, y = pos.y - 1, z = pos.z} + local p2 = {x = p1.x + 3, y = p1.y + 4, z = p1.z} + + for i = 1, 4 do + minetest.set_node(p, {name = "mcl_nether:red_nether_brick"}) + p.y = p.y + 1 + end + for i = 1, 3 do + minetest.set_node(p, {name = "mcl_nether:red_nether_brick"}) + p.x = p.x + 1 + end + for i = 1, 4 do + minetest.set_node(p, {name = "mcl_nether:red_nether_brick"}) + p.y = p.y - 1 + end + for i = 1, 3 do + minetest.set_node(p, {name = "mcl_nether:red_nether_brick"}) + p.x = p.x - 1 + end + + for x = p1.x, p2.x do + for y = p1.y, p2.y do + p = {x = x, y = y, z = p1.z} + if not (x == p1.x or x == p2.x or y == p1.y or y == p2.y) then + minetest.set_node(p, {name = "mcl_portals:portal_end", param2 = 0}) + end + local meta = minetest.get_meta(p) + meta:set_string("p1", minetest.pos_to_string(p1)) + meta:set_string("p2", minetest.pos_to_string(p2)) + meta:set_string("target3", minetest.pos_to_string(target3)) + + if y ~= p1.y then + for z = -2, 2 do + if z ~= 0 then + p.z = p.z + z + if minetest.registered_nodes[ + minetest.get_node(p).name].is_ground_content then + minetest.remove_node(p) + end + p.z = p.z - z + end + end + end + end + end +end + +local function find_end_target3_y2(target3_x, target3_z) + local start_y = END_DEPTH + math.random(20, 120) -- Search start + local nobj_cave_point = minetest.get_perlin(np_cave) + local air = 0 -- Consecutive air nodes found + + for y = start_y, start_y - 120, -1 do + local nval_cave = nobj_cave_point:get3d({x = target3_x, y = y, z = target3_z}) + + if nval_cave > TCAVE then -- Cavern + air = air + 1 + else -- Not cavern, check if 4 nodes of space above + if air >= 4 then + return y + 2 + else -- Not enough space, reset air to zero + air = 0 + end + end + end + + return start_y -- Fallback +end + +local function move_check2(p1, max, dir) + local p = {x = p1.x, y = p1.y, z = p1.z} + local d = math.abs(max - p1[dir]) / (max - p1[dir]) + + while p[dir] ~= max do + p[dir] = p[dir] + d + if minetest.get_node(p).name ~= "mcl_nether:red_nether_brick" then + return false + end + end + + return true +end + +local function check_end_portal(p1, p2) + if p1.x ~= p2.x then + if not move_check2(p1, p2.x, "x") then + return false + end + if not move_check2(p2, p1.x, "x") then + return false + end + elseif p1.z ~= p2.z then + if not move_check2(p1, p2.z, "z") then + return false + end + if not move_check2(p2, p1.z, "z") then + return false + end + else + return false + end + + if not move_check2(p1, p2.y, "y") then + return false + end + if not move_check2(p2, p1.y, "y") then + return false + end + + return true +end + +local function is_end_portal(pos) + for d = -3, 3 do + for y = -4, 4 do + local px = {x = pos.x + d, y = pos.y + y, z = pos.z} + local pz = {x = pos.x, y = pos.y + y, z = pos.z + d} + + if check_end_portal(px, {x = px.x + 3, y = px.y + 4, z = px.z}) then + return px, {x = px.x + 3, y = px.y + 4, z = px.z} + end + if check_end_portal(pz, {x = pz.x, y = pz.y + 4, z = pz.z + 3}) then + return pz, {x = pz.x, y = pz.y + 4, z = pz.z + 3} + end + end + end +end + +local function make_end_portal(pos) + local p1, p2 = is_end_portal(pos) + if not p1 or not p2 then + return false + end + + for d = 1, 2 do + for y = p1.y + 1, p2.y - 1 do + local p + if p1.z == p2.z then + p = {x = p1.x + d, y = y, z = p1.z} + else + p = {x = p1.x, y = y, z = p1.z + d} + end + if minetest.get_node(p).name ~= "air" then + return false + end + end + end + + local param2 + if p1.z == p2.z then + param2 = 0 + else + param2 = 1 + end + + local target3 = {x = p1.x, y = p1.y, z = p1.z} + target3.x = target3.x + 1 + if target3.y < END_DEPTH then + target3.y = math.random(-52, 100) + else + target3.y = find_end_target3_y2(target3.x, target3.z) + end + + for d = 0, 3 do + for y = p1.y, p2.y do + local p = {} + if param2 == 0 then + p = {x = p1.x + d, y = y, z = p1.z} + else + p = {x = p1.x, y = y, z = p1.z + d} + end + if minetest.get_node(p).name == "air" then + minetest.set_node(p, {name = "mcl_portals:portal_end", param2 = param2}) + end + local meta = minetest.get_meta(p) + meta:set_string("p1", minetest.pos_to_string(p1)) + meta:set_string("p2", minetest.pos_to_string(p2)) + meta:set_string("target3", minetest.pos_to_string(target3)) + end + end + + return true +end + +minetest.register_abm({ + label = "End portal teleportation", + nodenames = {"mcl_portals:portal_end"}, + interval = 1, + chance = 2, + action = function(pos, node) + for _,obj in ipairs(minetest.get_objects_inside_radius(pos,1)) do --maikerumine added for objects to travel + local lua_entity = obj:get_luaentity() --maikerumine added for objects to travel + if obj:is_player() or lua_entity then + local meta = minetest.get_meta(pos) + local target3 = minetest.string_to_pos(meta:get_string("target3")) + if target3 then + -- force emerge of target3 area + minetest.get_voxel_manip():read_from_map(target3, target3) + if not minetest.get_node_or_nil(target3) then + minetest.emerge_area( + vector.subtract(target3, 4), vector.add(target3, 4)) + end + -- teleport the player + minetest.after(3, function(obj, pos, target3) + local objpos = obj:getpos() + if objpos == nil then return end --maikerumine added for objects to travel + objpos.y = objpos.y + 0.1 -- Fix some glitches at -8000. FIXME: WTF? + if minetest.get_node(objpos).name ~= "mcl_portals:portal_end" then + return + end + + obj:setpos(target3) + minetest.sound_play("tng_transporter1", {pos=target3,gain=0.5,max_hear_distance = 8,}) -- maikerumine added sound when travel + + local function check_and_build_end_portal(pos, target3) + local n = minetest.get_node_or_nil(target3) + if n and n.name ~= "mcl_portals:portal_end" then + build_end_portal(target3, pos) + minetest.after(2, check_and_build_end_portal, pos, target3) + minetest.after(4, check_and_build_end_portal, pos, target3) + elseif not n then + minetest.after(1, check_and_build_end_portal, pos, target3) + end + end + + minetest.after(1, check_and_build_end_portal, pos, target3) + + end, obj, pos, target3) + end + end + end + end, +}) + + +--[[ ITEM OVERRIDES ]] + +-- Frame material +minetest.override_item("mcl_nether:red_nether_brick", { + on_destruct = function(pos) + local meta = minetest.get_meta(pos) + local p1 = minetest.string_to_pos(meta:get_string("p1")) + local p2 = minetest.string_to_pos(meta:get_string("p2")) + local target3 = minetest.string_to_pos(meta:get_string("target3")) + if not p1 or not p2 then + return + end + + for x = p1.x, p2.x do + for y = p1.y, p2.y do + for z = p1.z, p2.z do + local nn = minetest.get_node({x = x, y = y, z = z}).name + if nn == "mcl_nether:red_nether_brick" or nn == "mcl_portals:portal_end" then + if nn == "mcl_portals:portal_end" then + minetest.remove_node({x = x, y = y, z = z}) + end + local m = minetest.get_meta({x = x, y = y, z = z}) + m:set_string("p1", "") + m:set_string("p2", "") + m:set_string("target3", "") + end + end + end + end + + meta = minetest.get_meta(target3) + if not meta then + return + end + p1 = minetest.string_to_pos(meta:get_string("p1")) + p2 = minetest.string_to_pos(meta:get_string("p2")) + if not p1 or not p2 then + return + end + + for x = p1.x, p2.x do + for y = p1.y, p2.y do + for z = p1.z, p2.z do + local nn = minetest.get_node({x = x, y = y, z = z}).name + if nn == "mcl_nether:red_nether_brick" or nn == "mcl_portals:portal_end" then + if nn == "mcl_portals:portal_end" then + minetest.remove_node({x = x, y = y, z = z}) + end + local m = minetest.get_meta({x = x, y = y, z = z}) + m:set_string("p1", "") + m:set_string("p2", "") + m:set_string("target3", "") + end + end + end + end + end, +}) + +-- Portal opener +minetest.override_item("mcl_end:ender_eye", { + _doc_items_longdesc = "An eye of ander can be used to open a portal to the End.", + _doc_items_usagehelp = "To open an End portal, place an upright frame of red nether brick blocks with a length of 4 and a height of 5 blocks, leaving only air in the center. After placing this frame, use the nether quartz on the frame.", + on_place = function(itemstack, user, pointed_thing) + local nodedef = minetest.registered_nodes[minetest.get_node(pointed_thing.under).name] --new + + minetest.sound_play( + "fire_flint_and_steel", + {pos = pointed_thing.above, gain = 0.5, max_hear_distance = 8} + ) + if pointed_thing.under and minetest.get_node(pointed_thing.under).name == "mcl_nether:red_nether_brick" then + make_end_portal(pointed_thing.under) + end + + if not minetest.setting_getbool("creative_mode") and used == true then + itemstack:take_item() -- 1 use + end + return itemstack + end, +}) + diff --git a/mods/MAPGEN/mcl_portals/portal_nether.lua b/mods/MAPGEN/mcl_portals/portal_nether.lua new file mode 100644 index 00000000..94ed0986 --- /dev/null +++ b/mods/MAPGEN/mcl_portals/portal_nether.lua @@ -0,0 +1,416 @@ +-- Parameters + +local NETHER_DEPTH = mcl_vars.mg_nether_min +local TCAVE = 0.6 +local nobj_cave = nil + +-- 3D noise +local np_cave = { + offset = 0, + scale = 1, + spread = {x = 384, y = 128, z = 384}, + seed = 59033, + octaves = 5, + persist = 0.7 +} + +minetest.register_node("mcl_portals:portal", { + description = "Nether Portal", + tiles = { + "blank.png", + "blank.png", + "blank.png", + "blank.png", + { + name = "mcl_portals_portal.png", + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 0.5, + }, + }, + { + name = "mcl_portals_portal.png", + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 0.5, + }, + }, + }, + drawtype = "nodebox", + paramtype = "light", + paramtype2 = "facedir", + sunlight_propagates = true, + use_texture_alpha = true, + walkable = false, + diggable = false, + pointable = false, + buildable_to = false, + is_ground_content = false, + drop = "", + light_source = 11, + post_effect_color = {a = 180, r = 128, g = 23, b = 23}, + alpha = 192, + node_box = { + type = "fixed", + fixed = { + {-0.5, -0.5, -0.1, 0.5, 0.5, 0.1}, + }, + }, + groups = {not_in_creative_inventory = 1} +}) + + + +-- Functions +--Build arrival portal +local function build_portal(pos, target) + local p = {x = pos.x - 1, y = pos.y - 1, z = pos.z} + local p1 = {x = pos.x - 1, y = pos.y - 1, z = pos.z} + local p2 = {x = p1.x + 3, y = p1.y + 4, z = p1.z} + + for i = 1, 4 do + minetest.set_node(p, {name = "mcl_core:obsidian"}) + p.y = p.y + 1 + end + for i = 1, 3 do + minetest.set_node(p, {name = "mcl_core:obsidian"}) + p.x = p.x + 1 + end + for i = 1, 4 do + minetest.set_node(p, {name = "mcl_core:obsidian"}) + p.y = p.y - 1 + end + for i = 1, 3 do + minetest.set_node(p, {name = "mcl_core:obsidian"}) + p.x = p.x - 1 + end + + for x = p1.x, p2.x do + for y = p1.y, p2.y do + p = {x = x, y = y, z = p1.z} + if not (x == p1.x or x == p2.x or y == p1.y or y == p2.y) then + minetest.set_node(p, {name = "mcl_portals:portal", param2 = 0}) + end + local meta = minetest.get_meta(p) + meta:set_string("p1", minetest.pos_to_string(p1)) + meta:set_string("p2", minetest.pos_to_string(p2)) + meta:set_string("target", minetest.pos_to_string(target)) + + if y ~= p1.y then + for z = -2, 2 do + if z ~= 0 then + p.z = p.z + z + if minetest.registered_nodes[ + minetest.get_node(p).name].is_ground_content then + minetest.remove_node(p) + end + p.z = p.z - z + end + end + end + end + end +end + +local function find_nether_target_y(target_x, target_z) + local start_y = NETHER_DEPTH + math.random(38, 117) -- Search start + local nobj_cave_point = minetest.get_perlin(np_cave) + local air = 4 + + for y = start_y, start_y -117, -1 do + local nval_cave = nobj_cave_point:get3d({x = target_x, y = y, z = target_z}) + + if nval_cave > TCAVE then -- Cavern + air = air + 1 + else -- Not cavern, check if 4 nodes of space above + if air >= 4 then + return y + 2 + else -- Not enough space, reset air to zero + air = 0 + end + end + end + + return start_y -- Fallback +end + +local function move_check(p1, max, dir) + local p = {x = p1.x, y = p1.y, z = p1.z} + local d = math.abs(max - p1[dir]) / (max - p1[dir]) + + while p[dir] ~= max do + p[dir] = p[dir] + d + if minetest.get_node(p).name ~= "mcl_core:obsidian" then + return false + end + end + + return true +end + +local function check_portal(p1, p2) + if p1.x ~= p2.x then + if not move_check(p1, p2.x, "x") then + return false + end + if not move_check(p2, p1.x, "x") then + return false + end + elseif p1.z ~= p2.z then + if not move_check(p1, p2.z, "z") then + return false + end + if not move_check(p2, p1.z, "z") then + return false + end + else + return false + end + + if not move_check(p1, p2.y, "y") then + return false + end + if not move_check(p2, p1.y, "y") then + return false + end + + return true +end + +local function is_portal(pos) + for d = -3, 3 do + for y = -4, 4 do + local px = {x = pos.x + d, y = pos.y + y, z = pos.z} + local pz = {x = pos.x, y = pos.y + y, z = pos.z + d} + + if check_portal(px, {x = px.x + 3, y = px.y + 4, z = px.z}) then + return px, {x = px.x + 3, y = px.y + 4, z = px.z} + end + if check_portal(pz, {x = pz.x, y = pz.y + 4, z = pz.z + 3}) then + return pz, {x = pz.x, y = pz.y + 4, z = pz.z + 3} + end + end + end +end + +local function make_portal(pos) + local p1, p2 = is_portal(pos) + if not p1 or not p2 then + return false + end + + for d = 1, 2 do + for y = p1.y + 1, p2.y - 1 do + local p + if p1.z == p2.z then + p = {x = p1.x + d, y = y, z = p1.z} + else + p = {x = p1.x, y = y, z = p1.z + d} + end + if minetest.get_node(p).name ~= "air" then + return false + end + end + end + + local param2 + if p1.z == p2.z then + param2 = 0 + else + param2 = 1 + end + + local target = {x = p1.x, y = p1.y, z = p1.z} + target.x = target.x + 1 + if target.y < NETHER_DEPTH then + target.y = math.random(-52, 100) + else + target.y = find_nether_target_y(target.x, target.z) + end + + for d = 0, 3 do + for y = p1.y, p2.y do + local p = {} + if param2 == 0 then + p = {x = p1.x + d, y = y, z = p1.z} + else + p = {x = p1.x, y = y, z = p1.z + d} + end + if minetest.get_node(p).name == "air" + then + minetest.set_node(p, {name = "mcl_portals:portal", param2 = param2}) + end + local meta = minetest.get_meta(p) + meta:set_string("p1", minetest.pos_to_string(p1)) + meta:set_string("p2", minetest.pos_to_string(p2)) + meta:set_string("target", minetest.pos_to_string(target)) + end + end + + return true +end + + +minetest.register_abm({ + label = "Nether portal teleportation and particles", + nodenames = {"mcl_portals:portal"}, + interval = 1, + chance = 2, + action = function(pos, node) + minetest.add_particlespawner( + 32, --amount + 4, --time + {x = pos.x - 0.25, y = pos.y - 0.25, z = pos.z - 0.25}, --minpos + {x = pos.x + 0.25, y = pos.y + 0.25, z = pos.z + 0.25}, --maxpos + {x = -0.8, y = -0.8, z = -0.8}, --minvel + {x = 0.8, y = 0.8, z = 0.8}, --maxvel + {x = 0, y = 0, z = 0}, --minacc + {x = 0, y = 0, z = 0}, --maxacc + 0.5, --minexptime + 1, --maxexptime + 1, --minsize + 2, --maxsize + false, --collisiondetection + "mcl_portals_particle.png" --texture + ) + for _,obj in ipairs(minetest.get_objects_inside_radius(pos,1)) do --maikerumine added for objects to travel + local lua_entity = obj:get_luaentity() --maikerumine added for objects to travel + if obj:is_player() or lua_entity then + local meta = minetest.get_meta(pos) + local target = minetest.string_to_pos(meta:get_string("target")) + if target then + -- force emerge of target area + minetest.get_voxel_manip():read_from_map(target, target) + if not minetest.get_node_or_nil(target) then + minetest.emerge_area( + vector.subtract(target, 4), vector.add(target, 4)) + end + -- teleport the player + minetest.after(3, function(obj, pos, target) + local objpos = obj:getpos() if objpos == nil then return end --maikerumine added for objects to travel + objpos.y = objpos.y + 0.1 -- Fix some glitches at -8000 + if minetest.get_node(objpos).name ~= "mcl_portals:portal" then + return + end + + obj:setpos(target) + minetest.sound_play("tng_transporter1", {pos=target,gain=0.5,max_hear_distance = 8,}) --maikerumine added sound when travel + local function check_and_build_portal(pos, target) + local n = minetest.get_node_or_nil(target) + if n and n.name ~= "mcl_portals:portal" then + build_portal(target, pos) + minetest.after(2, check_and_build_portal, pos, target) + minetest.after(4, check_and_build_portal, pos, target) + elseif not n then + minetest.after(1, check_and_build_portal, pos, target) + end + end + + minetest.after(1, check_and_build_portal, pos, target) + + end, obj, pos, target) + end + end + end + end, +}) + + +--[[ ITEM OVERRIDES ]] + +-- Frame material +minetest.override_item("mcl_core:obsidian", { + on_destruct = function(pos) + local meta = minetest.get_meta(pos) + local p1 = minetest.string_to_pos(meta:get_string("p1")) + local p2 = minetest.string_to_pos(meta:get_string("p2")) + local target = minetest.string_to_pos(meta:get_string("target")) + if not p1 or not p2 then + return + end + + for x = p1.x, p2.x do + for y = p1.y, p2.y do + for z = p1.z, p2.z do + local nn = minetest.get_node({x = x, y = y, z = z}).name + if nn == "mcl_core:obsidian" or nn == "mcl_portals:portal" then + if nn == "mcl_portals:portal" then + minetest.remove_node({x = x, y = y, z = z}) + end + local m = minetest.get_meta({x = x, y = y, z = z}) + m:set_string("p1", "") + m:set_string("p2", "") + m:set_string("target", "") + end + end + end + end + + meta = minetest.get_meta(target) + if not meta then + return + end + p1 = minetest.string_to_pos(meta:get_string("p1")) + p2 = minetest.string_to_pos(meta:get_string("p2")) + if not p1 or not p2 then + return + end + + for x = p1.x, p2.x do + for y = p1.y, p2.y do + for z = p1.z, p2.z do + local nn = minetest.get_node({x = x, y = y, z = z}).name + if nn == "mcl_core:obsidian" or nn == "mcl_portals:portal" then + if nn == "mcl_portals:portal" then + minetest.remove_node({x = x, y = y, z = z}) + end + local m = minetest.get_meta({x = x, y = y, z = z}) + m:set_string("p1", "") + m:set_string("p2", "") + m:set_string("target", "") + end + end + end + end + end, +}) + +-- Portal opener +minetest.override_item("mcl_fire:flint_and_steel", { + _doc_items_longdesc = "Flint and steel is a tool to start fires, ignite blocks and open portals.", + _doc_items_usagehelp = "Rightclick the surface of a block to attempt to light a fire in front of it. On netherrack it will start an eternal fire. Using it on TNT will ignite it. To open a Nether portal, place an upright frame of obsidian with a length of 4 and a height of 5 blocks, leaving only air in the center. After placing this frame, use the flint and steel on inside of the frame.", + on_place = function(itemstack, user, pointed_thing) + local idef = itemstack:get_definition() + minetest.sound_play( + "fire_flint_and_steel", + {pos = pointed_thing.above, gain = 0.5, max_hear_distance = 8} + ) + local used = false + + if pointed_thing.under and minetest.get_node(pointed_thing.under).name == "mcl_core:obsidian" then + done = make_portal(pointed_thing.under) + else + if pointed_thing.type == "node" then + local nodedef = minetest.registered_nodes[minetest.get_node(pointed_thing.under).name] + if nodedef._on_ignite then + nodedef._on_ignite(pointed_thing.under, user) + else + mcl_fire.set_fire(pointed_thing) + end + used = true + end + end + if itemstack:get_count() == 0 and idef.sound and idef.sound.breaks then + minetest.sound_play(idef.sound.breaks, {pos=user:getpos(), gain=0.5}) + end + if not minetest.setting_getbool("creative_mode") and used == true then + itemstack:add_wear(65535/65) -- 65 uses + end + return itemstack + end, +}) + diff --git a/mods/MAPGEN/mcl_portals/textures/mcl_portals_end_portal.png b/mods/MAPGEN/mcl_portals/textures/mcl_portals_end_portal.png new file mode 100644 index 00000000..975be7f7 Binary files /dev/null and b/mods/MAPGEN/mcl_portals/textures/mcl_portals_end_portal.png differ diff --git a/mods/MAPGEN/mcl_portals/textures/mcl_portals_particle.png b/mods/MAPGEN/mcl_portals/textures/mcl_portals_particle.png new file mode 100644 index 00000000..56a5b78c Binary files /dev/null and b/mods/MAPGEN/mcl_portals/textures/mcl_portals_particle.png differ diff --git a/mods/MAPGEN/mcl_portals/textures/mcl_portals_portal.png b/mods/MAPGEN/mcl_portals/textures/mcl_portals_portal.png new file mode 100644 index 00000000..4fad43cb Binary files /dev/null and b/mods/MAPGEN/mcl_portals/textures/mcl_portals_portal.png differ