Microoptimizations after code review

This commit is contained in:
Daniel committed 2021-07-12 22:05:54 +02:00
1 parent a939e11641
commit f9ef2ebbe1
9 files changed
+27 -30

No files matched your search

@@ -4,7 +4,7 @@ local load_crafting_queue = require("modules/inventory_sync/load_crafting_queue"
local inventories = require("modules/inventory_sync/define_player_inventories")
function download_inventory(playerName, data, number, total)
local player = game.players[playerName]
local player = game.get_player(playerName)
if player == nil then return end
if number then
if global.download_cache[playerName] == nil then
@@ -16,7 +16,7 @@ function download_inventory(playerName, data, number, total)
if number ~= total then
-- Show progress in console
-- game.players[playerName].print("Downloaded "..(number + 1).."/"..total.." parts")
-- player.print("Downloaded "..(number + 1).."/"..total.." parts")
-- Show progress in GUI
progress_dialog(player, number+1, total)
@@ -31,7 +31,6 @@ function download_inventory(playerName, data, number, total)
-- Load downloaded inventory
local serialized_player = game.json_to_table(global.download_cache[playerName])
global.download_cache[playerName] = nil -- remove data to lower mapsize
local player = game.players[playerName]
-- Load inventories
for _, inv in pairs(inventories) do
local inventory = player.get_inventory(inv)
@@ -87,7 +86,7 @@ function download_inventory(playerName, data, number, total)
player.disable_flashlight()
end
local startTick = global["inv_sync_download_start_tick "..game.players[playerName].name]
local startTick = global["inv_sync_download_start_tick "..player.name]
local log_line = "Imported inventory for "..playerName.." in "..game.tick - startTick.." ticks"
player.print(log_line)
log("[inventory_sync] "..log_line)
@@ -19,7 +19,7 @@ inventory_sync.add_commands = add_commands
inventory_sync.events = {}
-- Cleanup
inventory_sync.events[defines.events.on_player_removed] = function(event)
local player = game.players[event.player_index]
local player = game.get_player(event.player_index)
-- Remove inventory download performance counter
global["inv_sync_download_start_tick "..player.name] = nil
@@ -41,7 +41,7 @@ inventory_sync.events[defines.events.on_pre_player_left_game] = function(event)
end
function inventory_sync.initiateInventoryDownload(playerIndex)
local player = game.players[playerIndex]
local player = game.get_player(playerIndex)
player.print("Initiating inventory download...")
global["inv_sync_download_start_tick "..player.name] = game.tick
if global.download_cache == nil then
@@ -12,9 +12,6 @@ function load_crafting_queue(crafting_queue, player)
-- Load crafting queue
for _, queueItem in pairs(crafting_queue.crafting_queue) do
local recipe = game.recipe_prototypes[queueItem.recipe]
-- game.print("Crafting "..queueItem.recipe)
-- Start crafting (consume items)
player.begin_crafting {
count = queueItem.count,
@@ -2,7 +2,7 @@ local load_crafting_queue = require("modules/inventory_sync/load_crafting_queue"
function restore_crafts(event)
if event.player_index then
local player = game.players[event.player_index]
local player = game.get_player(event.player_index)
local crafting_queue = global["saved_crafting_queue_"..player.name]
if crafting_queue == nil then
@@ -1,6 +1,6 @@
function save_crafts(event)
if event.player_index then
local player = game.players[event.player_index]
local player = game.get_player(event.player_index)
local crafting_queue = {}
-- Avoid overwriting old save
@@ -4,7 +4,7 @@ local inventories = require("modules/inventory_sync/define_player_inventories")
local save_crafts = require("modules/inventory_sync/save_crafts")
function upload_inventory(playerIndex)
local player = game.players[playerIndex]
local player = game.get_player(playerIndex)
local serialized_player = {
name = player.name,