From 789bb57ebc098087754c42c1e223fbdc6421e119 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 24 Sep 2016 15:33:36 +0200 Subject: Make teleporter mod work again after being moved around. --- teleporter/init.lua | 6 ++-- teleporter/teleporter.lua | 71 +++++++++++++++++++++++------------------------ 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/teleporter/init.lua b/teleporter/init.lua index 4b7dbff..7a218e4 100644 --- a/teleporter/init.lua +++ b/teleporter/init.lua @@ -1,7 +1,7 @@ -aasimine = {} +teleporter = {} -aasimine.modpath = minetest.get_modpath("aasimine") +teleporter.modpath = minetest.get_modpath("teleporter") -dofile(aasimine.modpath .. '/teleporter.lua') +dofile(teleporter.modpath .. '/teleporter.lua') teleporter:load() diff --git a/teleporter/teleporter.lua b/teleporter/teleporter.lua index d032348..a037803 100644 --- a/teleporter/teleporter.lua +++ b/teleporter/teleporter.lua @@ -1,12 +1,11 @@ -- -- Teleporter -- +teleporter.config = {} +teleporter.config.filename = minetest.get_worldpath() .. "/teleporter.cfg" +teleporter.positions = {} -aasimine.teleporter.config = {} -aasimine.teleporter.config.filename = minetest.get_worldpath() .. "/teleporter.cfg" -aasimine.teleporter.positions = {} - -function aasimine.teleporter:load() +function teleporter:load() local file, err = io.open(self.config.filename, "r") if err then minetest.log('error', 'could not read ' .. self.config.filename ) @@ -24,7 +23,7 @@ function aasimine.teleporter:load() file:close() end -function aasimine.teleporter:save() +function teleporter:save() local datastr = minetest.serialize(self.positions) if not datastr then minetest.log("error", "[teleporter] Failed to serialize teleporter positions!") @@ -38,7 +37,7 @@ function aasimine.teleporter:save() file:close() end -minetest.register_node("aasimine:teleporter", +minetest.register_node("teleporter:teleporter", { description = "Teleporter", buildable_to = false, @@ -102,12 +101,12 @@ minetest.register_node("aasimine:teleporter", function(itemstack, placer, pointed_thing) local player_name = placer:get_player_name() - if aasimine.teleporter.positions[player_name] == nil then - aasimine.teleporter.positions[player_name] = {} + if teleporter.positions[player_name] == nil then + teleporter.positions[player_name] = {} end - local pos1 = aasimine.teleporter.positions[player_name].first - local pos2 = aasimine.teleporter.positions[player_name].second + local pos1 = teleporter.positions[player_name].first + local pos2 = teleporter.positions[player_name].second if pos1 == nil or pos2 == nil then minetest.item_place(itemstack, placer, pointed_thing) else @@ -118,22 +117,22 @@ minetest.register_node("aasimine:teleporter", function(pos, placer, itemstack, pointed_thing) local player_name = placer:get_player_name() - if aasimine.teleporter.positions[player_name] == nil then - aasimine.teleporter.positions[player_name] = {} + if teleporter.positions[player_name] == nil then + teleporter.positions[player_name] = {} end local meta = minetest.get_meta(pos) meta:set_string("infotext", "Teleporter owned by " .. player_name) - if aasimine.teleporter.positions[player_name].first == nil then - aasimine.teleporter.positions[player_name].first = pos - aasimine.teleporter:save() + if teleporter.positions[player_name].first == nil then + teleporter.positions[player_name].first = pos + teleporter:save() return end - if aasimine.teleporter.positions[player_name].second == nil then - aasimine.teleporter.positions[player_name].second = pos - aasimine.teleporter:save() + if teleporter.positions[player_name].second == nil then + teleporter.positions[player_name].second = pos + teleporter:save() return end @@ -143,26 +142,26 @@ minetest.register_node("aasimine:teleporter", function(pos, oldnode, oldmetadata, digger) local player_name = digger:get_player_name() - if aasimine.teleporter.positions[player_name] == nil then - aasimine.teleporter.positions[player_name] = {} + if teleporter.positions[player_name] == nil then + teleporter.positions[player_name] = {} end - local pos1 = aasimine.teleporter.positions[player_name].first - local pos2 = aasimine.teleporter.positions[player_name].second + local pos1 = teleporter.positions[player_name].first + local pos2 = teleporter.positions[player_name].second if pos1 ~= nil and pos1.x == pos.x and pos1.y == pos.y and pos1.z == pos.z then - aasimine.teleporter.positions[player_name].first = nil + teleporter.positions[player_name].first = nil print('deleting first') - aasimine.teleporter:save() + teleporter:save() return end if pos2 ~= nil and pos2.x == pos.x and pos2.y == pos.y and pos2.z == pos.z then - aasimine.teleporter.positions[player_name].second = nil + teleporter.positions[player_name].second = nil print('deleting second') - aasimine.teleporter:save() + teleporter:save() return end @@ -174,12 +173,12 @@ minetest.register_node("aasimine:teleporter", function(pos, player) local player_name = player:get_player_name() - if aasimine.teleporter.positions[player_name] == nil then - aasimine.teleporter.positions[player_name] = {} + if teleporter.positions[player_name] == nil then + teleporter.positions[player_name] = {} end - local pos1 = aasimine.teleporter.positions[player_name].first - local pos2 = aasimine.teleporter.positions[player_name].second + local pos1 = teleporter.positions[player_name].first + local pos2 = teleporter.positions[player_name].second local pos0 = nil if pos1 ~= nil and @@ -202,12 +201,12 @@ minetest.register_node("aasimine:teleporter", local player_name = player:get_player_name() - if aasimine.teleporter.positions[player_name] == nil then - aasimine.teleporter.positions[player_name] = {} + if teleporter.positions[player_name] == nil then + teleporter.positions[player_name] = {} end - local pos1 = aasimine.teleporter.positions[player_name].first - local pos2 = aasimine.teleporter.positions[player_name].second + local pos1 = teleporter.positions[player_name].first + local pos2 = teleporter.positions[player_name].second local pos0 = nil if pos1 ~= nil and @@ -232,7 +231,7 @@ minetest.register_node("aasimine:teleporter", }) minetest.register_craft({ - output = 'aasimine:teleporter 2', + output = 'teleporter:teleporter 2', recipe = { { 'default:mese_crystal', 'default:steel_ingot', 'default:mese_crystal' }, { 'default:steel_ingot', 'default:diamondblock', 'default:steel_ingot' }, -- cgit v1.2.3