mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2025-12-27 03:25:23 +09:00
Migration for new helpers library
This commit is contained in:
@@ -154,6 +154,9 @@ local Datastore = {}
|
||||
local Data = {}
|
||||
local copy = table.deep_copy
|
||||
local trace = debug.traceback
|
||||
local table_to_json = helpers.table_to_json
|
||||
local json_to_table = helpers.json_to_table
|
||||
local write_file = helpers.write_file
|
||||
|
||||
--- Save datastores in the global table
|
||||
Storage.register(Data, function(tbl)
|
||||
@@ -242,11 +245,11 @@ function DatastoreManager.ingest(action, datastore_name, key, value_json)
|
||||
if action == "remove" then
|
||||
datastore:raw_set(key)
|
||||
elseif action == "message" then
|
||||
local success, value = pcall(game.json_to_table, value_json)
|
||||
local success, value = pcall(json_to_table, value_json)
|
||||
if not success or value == nil then value = tonumber(value_json) or value_json end
|
||||
datastore:raise_event("on_message", key, value)
|
||||
elseif action == "propagate" or action == "request" then
|
||||
local success, value = pcall(game.json_to_table, value_json)
|
||||
local success, value = pcall(json_to_table, value_json)
|
||||
if not success or value == nil then value = tonumber(value_json) or value_json end
|
||||
local old_value = datastore:raw_get(key)
|
||||
value = datastore:raise_event("on_load", key, value, old_value)
|
||||
@@ -389,9 +392,9 @@ self:write_action('save', 'TestKey', 'Foo')
|
||||
function Datastore:write_action(action, key, value)
|
||||
local data = { action, self.name, key }
|
||||
if value ~= nil then
|
||||
data[4] = type(value) == "table" and game.table_to_json(value) or value
|
||||
data[4] = type(value) == "table" and table_to_json(value) or value
|
||||
end
|
||||
game.write_file("ext/datastore.out", table.concat(data, " ") .. "\n", true, 0)
|
||||
write_file("ext/datastore.out", table.concat(data, " ") .. "\n", true, 0)
|
||||
end
|
||||
|
||||
----- Datastore Local
|
||||
|
||||
@@ -47,6 +47,9 @@ local Datastore = require("modules.exp_legacy.expcore.datastore") --- @dep expco
|
||||
local Commands = require("modules.exp_legacy.expcore.commands") --- @dep expcore.commands
|
||||
require("modules.exp_legacy.config.expcore.command_general_parse") --- @dep config.expcore.command_general_parse
|
||||
|
||||
local table_to_json = helpers.table_to_json
|
||||
local write_file = helpers.write_file
|
||||
|
||||
--- Common player data that acts as the root store for player data
|
||||
local PlayerData = Datastore.connect("PlayerData", true) -- saveToDisk
|
||||
PlayerData:set_serializer(Datastore.name_serializer) -- use player name
|
||||
@@ -83,7 +86,7 @@ Commands.new_command("preference", "Shows you what your current data saving pref
|
||||
Commands.new_command("save-data", "Writes all your player data to a file on your computer")
|
||||
:register(function(player)
|
||||
player.print{ "expcore-data.get-data" }
|
||||
game.write_file("expgaming_player_data.json", game.table_to_json(PlayerData:get(player, {})), false, player.index)
|
||||
write_file("expgaming_player_data.json", table_to_json(PlayerData:get(player, {})), false, player.index)
|
||||
end)
|
||||
|
||||
--- Async function called after 5 seconds with no player data loaded
|
||||
|
||||
@@ -7,11 +7,13 @@ local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
|
||||
local format_number = require("util").format_number --- @dep util
|
||||
local config = require("modules.exp_legacy.config.deconlog") --- @dep config.deconlog
|
||||
|
||||
local write_file = helpers.write_file
|
||||
|
||||
local filepath = "log/decon.log"
|
||||
local seconds_time_format = ExpUtil.format_time_factory{ format = "short", hours = true, minutes = true, seconds = true }
|
||||
|
||||
local function add_log(data)
|
||||
game.write_file(filepath, data .. "\n", true, 0) -- write data
|
||||
write_file(filepath, data .. "\n", true, 0) -- write data
|
||||
end
|
||||
|
||||
local function get_secs()
|
||||
@@ -36,7 +38,7 @@ local function print_to_players(admin, message)
|
||||
end
|
||||
|
||||
Event.on_init(function()
|
||||
game.write_file(filepath, "\n", false, 0) -- write data
|
||||
write_file(filepath, "\n", false, 0) -- write data
|
||||
end)
|
||||
|
||||
if config.decon_area then
|
||||
|
||||
@@ -3,17 +3,19 @@
|
||||
|
||||
local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
|
||||
|
||||
local write_file = helpers.write_file
|
||||
|
||||
-- Clear the file on startup to minimize its size
|
||||
Event.on_init(function()
|
||||
game.write_file("fagc-actions.txt", "", false, 0)
|
||||
write_file("fagc-actions.txt", "", false, 0)
|
||||
end)
|
||||
|
||||
Event.add(defines.events.on_player_banned, function(e)
|
||||
local text = "ban;" .. e.player_name .. ";" .. (e.by_player or "") .. ";" .. (e.reason or "") .. "\n"
|
||||
game.write_file("fagc-actions.txt", text, true, 0)
|
||||
write_file("fagc-actions.txt", text, true, 0)
|
||||
end)
|
||||
|
||||
Event.add(defines.events.on_player_unbanned, function(e)
|
||||
local text = "unban;" .. e.player_name .. ";" .. (e.by_player or "") .. ";" .. (e.reason or "") .. "\n"
|
||||
game.write_file("fagc-actions.txt", text, true, 0)
|
||||
write_file("fagc-actions.txt", text, true, 0)
|
||||
end)
|
||||
|
||||
@@ -6,9 +6,11 @@ local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
|
||||
local config = require("modules.exp_legacy.config.logging") --- @dep config.logging
|
||||
local config_res = require("modules.exp_legacy.config.research") --- @dep config.research
|
||||
|
||||
local write_file = helpers.write_file
|
||||
|
||||
local function add_log(data)
|
||||
game.write_file(config.file_name, data, true, 0)
|
||||
game.write_file(config.file_name, "\n", true, 0)
|
||||
write_file(config.file_name, data, true, 0)
|
||||
write_file(config.file_name, "\n", true, 0)
|
||||
end
|
||||
|
||||
Event.add(defines.events.on_rocket_launched, function(event)
|
||||
|
||||
@@ -4,6 +4,8 @@ local statics = require("modules.exp_legacy.modules.graftorio.statics")
|
||||
local general = require("modules.exp_legacy.modules.graftorio.general")
|
||||
local forcestats = nil
|
||||
|
||||
local table_to_json = helpers.table_to_json
|
||||
|
||||
if config.modules.forcestats then
|
||||
forcestats = require("modules.exp_legacy.modules.graftorio.forcestats")
|
||||
end
|
||||
@@ -22,6 +24,6 @@ Commands.new_command("collectdata", "Collect data for RCON usage")
|
||||
forcestats.collect_production()
|
||||
forcestats.collect_loginet()
|
||||
end
|
||||
rcon.print(game.table_to_json(general.data.output))
|
||||
rcon.print(table_to_json(general.data.output))
|
||||
return Commands.success()
|
||||
end)
|
||||
|
||||
@@ -8,6 +8,9 @@ local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
|
||||
local Roles = require("modules.exp_legacy.expcore.roles") --- @dep expcore.roles
|
||||
local config = require("modules.exp_legacy.config.research") --- @dep config.research
|
||||
|
||||
local table_to_json = helpers.table_to_json
|
||||
local write_file = helpers.write_file
|
||||
|
||||
local research = {}
|
||||
Storage.register(research, function(tbl)
|
||||
research = tbl
|
||||
@@ -57,7 +60,7 @@ local function research_add_log()
|
||||
result_data[res["disp"][i]["raw_name"]] = research.time[i]
|
||||
end
|
||||
|
||||
game.write_file(config.file_name, game.table_to_json(result_data) .. "\n", true, 0)
|
||||
write_file(config.file_name, table_to_json(result_data) .. "\n", true, 0)
|
||||
end
|
||||
|
||||
local function research_res_n(res_)
|
||||
|
||||
Reference in New Issue
Block a user