aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-27 03:25:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

Migrate all commands to new lib

Browse Source
This commit is contained in:
Cooldude2606
2024-11-08 12:59:46 +00:00
parent c9bf85835f
commit 4b6872c14c
103 changed files with 2415 additions and 3694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
exp_legacy/module/modules/gui/debug/main_view.lua
View File

@@ -17,7 +17,7 @@ local main_frame_name = Gui.uid_name()
local close_name = Gui.uid_name()
local tab_name = Gui.uid_name()
function Public.open_dubug(player)
function Public.open_debug(player)
for i = 1, #pages do
local page = pages[i]
local callback = page.on_open_debug

3
exp_legacy/module/modules/gui/debug/redmew_global_view.lua
View File

@@ -24,7 +24,8 @@ function Public.show(container)
local left_panel_style = left_panel.style
left_panel_style.width = 300
for token_id in pairs(Storage.registered) do
--- @diagnostic disable-next-line invisible
for token_id in pairs(Storage._registered) do
local header = left_panel.add{ type = "flow" }.add{ type = "label", name = header_name, caption = token_id }
Gui.set_data(header, token_id)
end

9
exp_legacy/module/modules/gui/module.lua
View File

@@ -60,9 +60,10 @@ local elem_filter = {
}
local function clear_module(player, area, machine)
-- Intentionally left as player.surface to allow use in remote view
for _, entity in pairs(player.surface.find_entities_filtered{ area = area, name = machine, force = player.force }) do
for _, r in pairs(player.surface.find_entities_filtered{ position = entity.position, name = "item-request-proxy", force = player.force }) do
local force = player.force
local surface = player.surface -- Allow remote view
for _, entity in pairs(surface.find_entities_filtered{ area = area, name = machine, force = force }) do
for _, r in pairs(surface.find_entities_filtered{ position = entity.position, name = "item-request-proxy", force = force }) do
if r then
r.destroy{ raise_destroy = true }
end
@@ -75,7 +76,7 @@ local function clear_module(player, area, machine)
if m_current_module_content then
for k, m in pairs(m_current_module_content) do
player.surface.spill_item_stack(entity.bounding_box.left_top, { name = k, count = m }, true, player.force, false)
surface.spill_item_stack(entity.bounding_box.left_top, { name = k, count = m }, true, force, false)
end
end

3
exp_legacy/module/modules/gui/production.lua
View File

@@ -129,8 +129,7 @@ end)
Event.on_nth_tick(60, function()
for _, player in pairs(game.connected_players) do
local frame = Gui.get_left_element(player, production_container)
-- Intentionally left as player.surface to allow use in remote view
local stat = player.force.get_item_production_statistics(player.surface)
local stat = player.force.get_item_production_statistics(player.surface) -- Allow remote view
local precision_value = precision[frame.container["production_st"].disp.table["production_0_e"].selected_index]
local table = frame.container["production_st"].disp.table

16
exp_legacy/module/modules/gui/research.lua
View File

@@ -107,12 +107,12 @@ local function research_notification(event)
end
else
if not (event.by_script) then
game.print{ "expcom-res.inf", research_time_format(game.tick), event.research.name, event.research.level - 1 }
game.print{ "research.inf", research_time_format(game.tick), event.research.name, event.research.level - 1 }
end
end
else
if not (event.by_script) then
game.print{ "expcom-res.msg", research_time_format(game.tick), event.research.name }
game.print{ "research.msg", research_time_format(game.tick), event.research.name }
end
if config.bonus_inventory.enabled then
@@ -139,7 +139,7 @@ local function research_gui_update()
local res_i = res_n + i - 3
if res["disp"][res_i] then
res_disp[i]["name"] = { "expcom-res.res-name", res["disp"][res_i]["raw_name"], prototypes.technology[res["disp"][res_i]["raw_name"]].localised_name }
res_disp[i]["name"] = { "research.res-name", res["disp"][res_i]["raw_name"], prototypes.technology[res["disp"][res_i]["raw_name"]].localised_name }
if research.time[res_i] == 0 then
res_disp[i]["target"] = res["disp"][res_i].target_disp
@@ -237,10 +237,10 @@ local research_data_set =
local res_disp = research_gui_update()
research_data_group(disp, 0)
disp["research_0_name"].caption = { "expcom-res.name" }
disp["research_0_target"].caption = { "expcom-res.target" }
disp["research_0_attempt"].caption = { "expcom-res.attempt" }
disp["research_0_difference"].caption = { "expcom-res.difference" }
disp["research_0_name"].caption = { "research.name" }
disp["research_0_target"].caption = { "research.target" }
disp["research_0_attempt"].caption = { "research.attempt" }
disp["research_0_difference"].caption = { "research.difference" }
for i = 1, 8, 1 do
research_data_group(disp, i)
@@ -269,7 +269,7 @@ local research_container =
:static_name(Gui.unique_static_name)
:add_to_left_flow()
Gui.left_toolbar_button("item/space-science-pack", { "expcom-res.main-tooltip" }, research_container, function(player)
Gui.left_toolbar_button("item/space-science-pack", { "research.main-tooltip" }, research_container, function(player)
return Roles.player_allowed(player, "gui/research")
end)

10
exp_legacy/module/modules/gui/server-ups.lua
View File

@@ -6,8 +6,8 @@
local Gui = require("modules.exp_legacy.expcore.gui") --- @dep expcore.gui
local Event = require("modules/exp_legacy/utils/event") --- @dep utils.event
local Commands = require("modules.exp_legacy.expcore.commands") --- @dep expcore.commands
local External = require("modules.exp_legacy.expcore.external") --- @dep expcore.external
local Commands = require("modules/exp_commands")
--- Stores the visible state of server ups
local PlayerData = require("modules.exp_legacy.expcore.player_data") --- @dep expcore.player_data
@@ -34,19 +34,19 @@ local server_ups =
UsesServerUps:on_load(function(player_name, visible)
local player = game.players[player_name]
local label = player.gui.screen[server_ups.name]
--- @diagnostic disable-next-line undefined-field
if not External.valid() or not global.ext.var.server_ups then visible = false end
label.visible = visible
end)
--- Toggles if the server ups is visbile
-- @command server-ups
Commands.new_command("server-ups", "Toggle the server UPS display")
:add_alias("sups", "ups")
Commands.new("server-ups", { "server-ups.description" })
:add_aliases{ "sups", "ups" }
:register(function(player)
local label = player.gui.screen[server_ups.name]
if not External.valid() then
label.visible = false
return Commands.error{ "expcom-server-ups.no-ext" }
return Commands.status.error{ "server-ups.no-ext" }
end
label.visible = not label.visible
UsesServerUps:set(player, label.visible)