summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2016-09-24 15:26:56 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2016-09-24 15:26:56 +0200
commita8df43278f47a30bf3bb220972242b10621a17e5 (patch)
tree4e9ce09a1cc9df20d15aad0e675dcbda0b95f369
parent914181310c04f9bac961c079b5960240206bd625 (diff)
Reorganize files (make it a modpack).
-rw-r--r--init.lua7
-rw-r--r--modpack.txt0
-rw-r--r--teleporter/init.lua7
-rw-r--r--teleporter/teleporter.lua (renamed from teleporter.lua)70
-rw-r--r--teleporter/textures/teleporter.png (renamed from textures/teleporter.png)bin424 -> 424 bytes
-rw-r--r--teleporter/textures/teleporter.xcf (renamed from textures/teleporter.xcf)bin4678 -> 4678 bytes
6 files changed, 42 insertions, 42 deletions
diff --git a/init.lua b/init.lua
deleted file mode 100644
index 7a218e4..0000000
--- a/init.lua
+++ /dev/null
@@ -1,7 +0,0 @@
-teleporter = {}
-
-teleporter.modpath = minetest.get_modpath("teleporter")
-
-dofile(teleporter.modpath .. '/teleporter.lua')
-
-teleporter:load()
diff --git a/modpack.txt b/modpack.txt
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/modpack.txt
diff --git a/teleporter/init.lua b/teleporter/init.lua
new file mode 100644
index 0000000..4b7dbff
--- /dev/null
+++ b/teleporter/init.lua
@@ -0,0 +1,7 @@
+aasimine = {}
+
+aasimine.modpath = minetest.get_modpath("aasimine")
+
+dofile(aasimine.modpath .. '/teleporter.lua')
+
+teleporter:load()
diff --git a/teleporter.lua b/teleporter/teleporter.lua
index b95e3af..d032348 100644
--- a/teleporter.lua
+++ b/teleporter/teleporter.lua
@@ -2,11 +2,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 teleporter:load()
+function aasimine.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 +24,7 @@ function teleporter:load()
file:close()
end
-function teleporter:save()
+function aasimine.teleporter:save()
local datastr = minetest.serialize(self.positions)
if not datastr then
minetest.log("error", "[teleporter] Failed to serialize teleporter positions!")
@@ -38,7 +38,7 @@ function teleporter:save()
file:close()
end
-minetest.register_node("teleporter:teleporter",
+minetest.register_node("aasimine:teleporter",
{
description = "Teleporter",
buildable_to = false,
@@ -102,12 +102,12 @@ minetest.register_node("teleporter:teleporter",
function(itemstack, placer, pointed_thing)
local player_name = placer:get_player_name()
- if teleporter.positions[player_name] == nil then
- teleporter.positions[player_name] = {}
+ if aasimine.teleporter.positions[player_name] == nil then
+ aasimine.teleporter.positions[player_name] = {}
end
- local pos1 = teleporter.positions[player_name].first
- local pos2 = teleporter.positions[player_name].second
+ local pos1 = aasimine.teleporter.positions[player_name].first
+ local pos2 = aasimine.teleporter.positions[player_name].second
if pos1 == nil or pos2 == nil then
minetest.item_place(itemstack, placer, pointed_thing)
else
@@ -118,22 +118,22 @@ minetest.register_node("teleporter:teleporter",
function(pos, placer, itemstack, pointed_thing)
local player_name = placer:get_player_name()
- if teleporter.positions[player_name] == nil then
- teleporter.positions[player_name] = {}
+ if aasimine.teleporter.positions[player_name] == nil then
+ aasimine.teleporter.positions[player_name] = {}
end
local meta = minetest.get_meta(pos)
meta:set_string("infotext", "Teleporter owned by " .. player_name)
- if teleporter.positions[player_name].first == nil then
- teleporter.positions[player_name].first = pos
- teleporter:save()
+ if aasimine.teleporter.positions[player_name].first == nil then
+ aasimine.teleporter.positions[player_name].first = pos
+ aasimine.teleporter:save()
return
end
- if teleporter.positions[player_name].second == nil then
- teleporter.positions[player_name].second = pos
- teleporter:save()
+ if aasimine.teleporter.positions[player_name].second == nil then
+ aasimine.teleporter.positions[player_name].second = pos
+ aasimine.teleporter:save()
return
end
@@ -143,26 +143,26 @@ minetest.register_node("teleporter:teleporter",
function(pos, oldnode, oldmetadata, digger)
local player_name = digger:get_player_name()
- if teleporter.positions[player_name] == nil then
- teleporter.positions[player_name] = {}
+ if aasimine.teleporter.positions[player_name] == nil then
+ aasimine.teleporter.positions[player_name] = {}
end
- local pos1 = teleporter.positions[player_name].first
- local pos2 = teleporter.positions[player_name].second
+ local pos1 = aasimine.teleporter.positions[player_name].first
+ local pos2 = aasimine.teleporter.positions[player_name].second
if pos1 ~= nil and
pos1.x == pos.x and pos1.y == pos.y and pos1.z == pos.z then
- teleporter.positions[player_name].first = nil
+ aasimine.teleporter.positions[player_name].first = nil
print('deleting first')
- teleporter:save()
+ aasimine.teleporter:save()
return
end
if pos2 ~= nil and
pos2.x == pos.x and pos2.y == pos.y and pos2.z == pos.z then
- teleporter.positions[player_name].second = nil
+ aasimine.teleporter.positions[player_name].second = nil
print('deleting second')
- teleporter:save()
+ aasimine.teleporter:save()
return
end
@@ -174,12 +174,12 @@ minetest.register_node("teleporter:teleporter",
function(pos, player)
local player_name = player:get_player_name()
- if teleporter.positions[player_name] == nil then
- teleporter.positions[player_name] = {}
+ if aasimine.teleporter.positions[player_name] == nil then
+ aasimine.teleporter.positions[player_name] = {}
end
- local pos1 = teleporter.positions[player_name].first
- local pos2 = teleporter.positions[player_name].second
+ local pos1 = aasimine.teleporter.positions[player_name].first
+ local pos2 = aasimine.teleporter.positions[player_name].second
local pos0 = nil
if pos1 ~= nil and
@@ -202,12 +202,12 @@ minetest.register_node("teleporter:teleporter",
local player_name = player:get_player_name()
- if teleporter.positions[player_name] == nil then
- teleporter.positions[player_name] = {}
+ if aasimine.teleporter.positions[player_name] == nil then
+ aasimine.teleporter.positions[player_name] = {}
end
- local pos1 = teleporter.positions[player_name].first
- local pos2 = teleporter.positions[player_name].second
+ local pos1 = aasimine.teleporter.positions[player_name].first
+ local pos2 = aasimine.teleporter.positions[player_name].second
local pos0 = nil
if pos1 ~= nil and
@@ -232,7 +232,7 @@ minetest.register_node("teleporter:teleporter",
})
minetest.register_craft({
- output = 'teleporter:teleporter 2',
+ output = 'aasimine:teleporter 2',
recipe = {
{ 'default:mese_crystal', 'default:steel_ingot', 'default:mese_crystal' },
{ 'default:steel_ingot', 'default:diamondblock', 'default:steel_ingot' },
diff --git a/textures/teleporter.png b/teleporter/textures/teleporter.png
index 5839765..5839765 100644
--- a/textures/teleporter.png
+++ b/teleporter/textures/teleporter.png
Binary files differ
diff --git a/textures/teleporter.xcf b/teleporter/textures/teleporter.xcf
index 13f18fb..13f18fb 100644
--- a/textures/teleporter.xcf
+++ b/teleporter/textures/teleporter.xcf
Binary files differ