From 3a6a2e616cd8cef18f81367817349ec8cb4317d8 Mon Sep 17 00:00:00 2001
From: upsilon <upsilon@langg.net>
Date: Mon, 17 Apr 2017 11:17:09 +0200
Subject: [PATCH] Use mod storage instead of LBMs to revover wireless and
 teleporter tables

---
 moremesecons_teleporter/init.lua | 28 ++++++++++++++-----------
 moremesecons_wireless/init.lua   | 36 +++++++++++++++++---------------
 2 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/moremesecons_teleporter/init.lua b/moremesecons_teleporter/init.lua
index 7278167..659630c 100644
--- a/moremesecons_teleporter/init.lua
+++ b/moremesecons_teleporter/init.lua
@@ -1,15 +1,26 @@
-local teleporters = {}
-local teleporters_rids = {}
+local teleporters
+local teleporters_rids
+
+local storage = minetest.get_mod_storage()
+teleporters = minetest.deserialize(storage:get_string("teleporters")) or {}
+teleporters_rids = minetest.deserialize(storage:get_string("teleporters_rids")) or {}
+jammers = minetest.deserialize(storage:get_string("jammers")) or {}
+
+local function update_mod_storage()
+	storage:set_string("teleporters", minetest.serialize(teleporters))
+	storage:set_string("teleporters_rids", minetest.serialize(teleporters_rids))
+end
 
 
-local register = function(pos)
+local function register(pos)
 	if not vector.get_data_from_pos(teleporters_rids, pos.z,pos.y,pos.x) then
 		table.insert(teleporters, pos)
 		vector.set_data_to_pos(teleporters_rids, pos.z,pos.y,pos.x, #teleporters)
+		update_mod_storage()
 	end
 end
 
-local teleport_nearest = function(pos)
+local function teleport_nearest(pos)
 	local MAX_TELEPORTATION_DISTANCE = tonumber(minetest.setting_get("moremesecons_teleporter.max_t2t_distance")) or 50
 	if MAX_TELEPORTATION_DISTANCE <= 0 then
 		MAX_TELEPORTATION_DISTANCE = 1
@@ -94,14 +105,7 @@ minetest.register_node("moremesecons_teleporter:teleporter", {
 		if RID then
 			table.remove(teleporters, RID)
 			vector.remove_data_from_pos(teleporters_rids, pos.z,pos.y,pos.x)
+			update_mod_storage()
 		end
 	end,
 })
-
-
-minetest.register_lbm({
-	name = "moremesecons_teleporter:add_teleporter",
-	nodenames = {"moremesecons_teleporter:teleporter"},
-	run_at_every_load = true,
-	action = register
-})
diff --git a/moremesecons_wireless/init.lua b/moremesecons_wireless/init.lua
index effcf97..6b0d84e 100644
--- a/moremesecons_wireless/init.lua
+++ b/moremesecons_wireless/init.lua
@@ -1,5 +1,17 @@
-local wireless = {}
-local wireless_rids = {}
+local wireless
+local wireless_rids
+local jammers
+
+local storage = minetest.get_mod_storage()
+wireless = minetest.deserialize(storage:get_string("wireless")) or {}
+wireless_rids = minetest.deserialize(storage:get_string("wireless_rids")) or {}
+jammers = minetest.deserialize(storage:get_string("jammers")) or {}
+
+local function update_mod_storage()
+	storage:set_string("wireless", minetest.serialize(wireless))
+	storage:set_string("wireless_rids", minetest.serialize(wireless_rids))
+	storage:set_string("jammers", minetest.serialize(jammers))
+end
 
 -- localize these functions with small names because they work fairly fast
 local get = vector.get_data_from_pos
@@ -14,6 +26,7 @@ local function register_RID(pos)
 	local RID = #wireless+1
 	wireless[RID] = pos
 	set(wireless_rids, pos.z,pos.y,pos.x, RID)
+	update_mod_storage()
 end
 
 local is_jammed
@@ -88,7 +101,8 @@ minetest.register_node("moremesecons_wireless:wireless", {
 		local RID = get(wireless_rids, pos.z,pos.y,pos.x)
 		if RID then
 			table.remove(wireless, RID)
-			vector.remove_data_from_pos(wireless_rids, pos.z,pos.y,pos.x)
+			remove(wireless_rids, pos.z,pos.y,pos.x)
+			update_mod_storage()
 		end
 		mesecon.receptor_off(pos)
 	end,
@@ -106,10 +120,12 @@ local function add_jammer(pos)
 		return
 	end
 	set(jammers, pos.z,pos.y,pos.x, true)
+	update_mod_storage()
 end
 
 local function remove_jammer(pos)
 	remove(jammers, pos.z,pos.y,pos.x)
+	update_mod_storage()
 end
 
 -- looks big, but should work fast
@@ -216,17 +232,3 @@ minetest.register_craft({
 		{"group:mesecon_conductor_craftable", "", "group:mesecon_conductor_craftable"},
 	}
 })
-
-minetest.register_lbm({
-	name = "moremesecons_wireless:add_jammer",
-	nodenames = {"moremesecons_wireless:jammer_on"},
-	run_at_every_load = true,
-	action = add_jammer
-})
-
-minetest.register_lbm({
-	name = "moremesecons_wireless:add_wireless",
-	nodenames = {"moremesecons_wireless:wireless"},
-	run_at_every_load = true,
-	action = register_RID
-})