migrate global to storage

cybersyn/scripts/gui/actions.lua

@@ -171,17 +171,17 @@ function actions.change_surface(Gui, _, e)
 end
 
 function actions.clear_history(Gui)
-  global.flags.deleted_history = true
+  storage.flags.deleted_history = true
   Gui:schedule_update()
 end
 
 function actions.delete_alert(Gui, msg)
-  global.active_data.alerts_to_delete[msg.alert_id] = true
+  storage.active_data.alerts_to_delete[msg.alert_id] = true
   Gui:schedule_update()
 end
 
 function actions.delete_all_alerts(Gui)
-  global.flags.deleted_all_alerts = true
+  storage.flags.deleted_all_alerts = true
   Gui:schedule_update()
 end
 

cybersyn/scripts/gui/alerts.lua

@@ -72,7 +72,7 @@ function alerts_tab.update(self)
   local search_surface = state.surface
 
   local ltn_alerts = state.ltn_data.alerts
-  local alerts_to_delete = global.active_data.alerts_to_delete
+  local alerts_to_delete = storage.active_data.alerts_to_delete
 
   local scroll_pane = refs.scroll_pane
   local children = scroll_pane.children
@@ -95,7 +95,7 @@ function alerts_tab.update(self)
     step = 1
   end
 
-  if not global.flags.deleted_all_alerts then
+  if not storage.flags.deleted_all_alerts then
     for sorted_index = start, finish, step do
       local alert_id = sorted_alerts[sorted_index]
       local alerts_entry = ltn_alerts[alert_id]

cybersyn/scripts/gui/history.lua

@@ -95,7 +95,7 @@ function history_tab.update(self)
     step = 1
   end
 
-  if not global.flags.deleted_history then
+  if not storage.flags.deleted_history then
     for sorted_index = start, finish, step do
       local history_id = sorted_history[sorted_index]
       local history_entry = ltn_history[history_id]

cybersyn/scripts/gui/inventory.lua

@@ -257,7 +257,7 @@ inventory_tab.handle = {}
 function inventory_tab.wrapper(e, handler)
 	local player = game.get_player(e.player_index)
 	if not player then return end
-	local player_data = global.manager.players[e.player_index]
+	local player_data = storage.manager.players[e.player_index]
 	handler(player, player_data, player_data.refs, e)
 end
 

cybersyn/scripts/gui/main.lua

@@ -81,9 +81,9 @@ local function create_player(player_index)
 		refs = manager.create(player),
 		selected_tab = "stations_tab",
 	}
-	global.manager.players[player_index] = player_data
+	storage.manager.players[player_index] = player_data
 
-	--manager.update(global, player, player_data)
+	--manager.update(storage, player, player_data)
 	--top_left_button_update(player, player_data)
 end
 
@@ -92,7 +92,7 @@ function manager_gui.on_player_created(e)
 end
 
 function manager_gui.on_player_removed(e)
-	global.manager.players[e.player_index] = nil
+	storage.manager.players[e.player_index] = nil
 end
 
 --script.on_event(defines.events.on_player_joined_game, function(e)
@@ -107,14 +107,14 @@ function manager_gui.on_runtime_mod_setting_changed(e)
 		local player = game.get_player(e.player_index)
 		if not player then return end
 
-		local player_data = global.manager.players[e.player_index]
+		local player_data = storage.manager.players[e.player_index]
 		player_data.disable_top_left_button = player.mod_settings["cybersyn-disable-top-left-button"].value
 		top_left_button_update(player, player_data)
 	end
 end
 
 commands.add_command("cybersyn_rebuild_manager_windows", nil, function(command)
-	local manager_data = global.manager
+	local manager_data = storage.manager
 	if manager_data then
 
 		---@param v PlayerData
@@ -161,39 +161,39 @@ end
 
 
 function manager_gui.on_migration()
-	if not global.manager then
+	if not storage.manager then
 		manager_gui.on_init()
 	end
 	
 	for i, p in pairs(game.players) do
-		if global.manager.players[i] == nil then
+		if storage.manager.players[i] == nil then
 			create_player(i)
 		end
 	end
 	
-	for i, v in pairs(global.manager.players) do
+	for i, v in pairs(storage.manager.players) do
 		manager_gui.reset_player(i, v)
 	end
 
-	init_items(global.manager)
+	init_items(storage.manager)
 end
 
 function manager_gui.on_init()
-	global.manager = {
+	storage.manager = {
 		players = {},
 	}
-	init_items(global.manager)
+	init_items(storage.manager)
 end
 --gui.handle_events()
 
 ---@param global cybersyn.global
-function manager_gui.tick(global)
-	local manager_data = global.manager
+function manager_gui.tick(storage)
+	local manager_data = storage.manager
 	if manager_data then
 		for i, v in pairs(manager_data.players) do
 			if v.is_manager_open then
 				local query_limit = settings.get_player_settings(i)["cybersyn-manager-result-limit"].value
-				manager.update(global, v, query_limit)
+				manager.update(storage, v, query_limit)
 			end
 		end
 	end

cybersyn/scripts/gui/manager.lua

@@ -172,7 +172,7 @@ manager.handle = {}
 function manager.wrapper(e, handler)
 	local player = game.get_player(e.player_index)
 	if not player then return end
-	local player_data = global.manager.players[e.player_index]
+	local player_data = storage.manager.players[e.player_index]
 	handler(player, player_data, player_data.refs, e)
 end
 

cybersyn/scripts/gui/stations.lua

@@ -272,7 +272,7 @@ stations_tab.handle = {}
 function stations_tab.wrapper(e, handler)
 	local player = game.get_player(e.player_index)
 	if not player then return end
-	local player_data = global.manager.players[e.player_index]
+	local player_data = storage.manager.players[e.player_index]
 	handler(player, player_data, player_data.refs, e)
 end
 
@@ -282,7 +282,7 @@ end
 function stations_tab.handle.open_station_gui(player, player_data, refs, e)
 	local station_id = e.element.tags.station_id
 	--- @type Station
-	local station = global.stations[station_id]
+	local station = storage.stations[station_id]
 	local station_entity = station.entity_stop
 	local station_comb1 = station.entity_comb1
 	local station_comb2 = station.entity_comb2

cybersyn/scripts/gui/trains.lua

@@ -275,7 +275,7 @@ trains_tab.handle = {}
 function trains_tab.wrapper(e, handler)
 	local player = game.get_player(e.player_index)
 	if not player then return end
-	local player_data = global.manager.players[e.player_index]
+	local player_data = storage.manager.players[e.player_index]
 	handler(player, player_data, player_data.refs, e)
 end
 
@@ -284,7 +284,7 @@ end
 function trains_tab.handle.open_train_gui(player, player_data, refs, e)
 	local train_id = e.element.tags.train_id
 	--- @type Train
-	local train = global.trains[train_id]
+	local train = storage.trains[train_id]
 	local train_entity = train.entity
 
 	if not train_entity or not train_entity.valid then