mirror of
https://github.com/ComfyFactory/ComfyFactorio.git
synced 2025-03-11 14:49:24 +02:00
Minor nil checks
This commit is contained in:
parent
3ee2795ebc
commit
696de12321
@ -35,7 +35,7 @@ local try_get_is_banned_token =
|
|||||||
Event.add(
|
Event.add(
|
||||||
defines.events.on_player_joined_game,
|
defines.events.on_player_joined_game,
|
||||||
function(event)
|
function(event)
|
||||||
local player = Game.get_player_by_index(event.player_index)
|
local player = game.get_player(event.player_index)
|
||||||
if not player or not player.valid then
|
if not player or not player.valid then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
@ -12,6 +12,10 @@ local Public = {}
|
|||||||
local fetch =
|
local fetch =
|
||||||
Token.register(
|
Token.register(
|
||||||
function(data)
|
function(data)
|
||||||
|
if not data then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local key = data.key
|
local key = data.key
|
||||||
local value = data.value
|
local value = data.value
|
||||||
local player = game.players[key]
|
local player = game.players[key]
|
||||||
|
@ -95,6 +95,9 @@ Gui.on_click(
|
|||||||
|
|
||||||
local left_panel = element.parent.parent
|
local left_panel = element.parent.parent
|
||||||
local left_panel_data = Gui.get_data(left_panel)
|
local left_panel_data = Gui.get_data(left_panel)
|
||||||
|
if not left_panel_data then
|
||||||
|
return
|
||||||
|
end
|
||||||
local right_panel = left_panel_data.right_panel
|
local right_panel = left_panel_data.right_panel
|
||||||
local selected_header = left_panel_data.selected_header
|
local selected_header = left_panel_data.selected_header
|
||||||
|
|
||||||
|
@ -133,6 +133,9 @@ Gui.on_text_changed(
|
|||||||
function(event)
|
function(event)
|
||||||
local element = event.element
|
local element = event.element
|
||||||
local gui_table = Gui.get_data(element)
|
local gui_table = Gui.get_data(element)
|
||||||
|
if not gui_table then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local filter = element.text:gsub(' ', '_')
|
local filter = element.text:gsub(' ', '_')
|
||||||
|
|
||||||
@ -149,6 +152,10 @@ Gui.on_click(
|
|||||||
function(event)
|
function(event)
|
||||||
local element = event.element
|
local element = event.element
|
||||||
local data = Gui.get_data(element)
|
local data = Gui.get_data(element)
|
||||||
|
if not data then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local filter_textfield = data.filter_textfield
|
local filter_textfield = data.filter_textfield
|
||||||
local gui_table = data.gui_table
|
local gui_table = data.gui_table
|
||||||
|
|
||||||
|
@ -158,11 +158,17 @@ Gui.on_click(
|
|||||||
function(event)
|
function(event)
|
||||||
local element = event.element
|
local element = event.element
|
||||||
local header_data = Gui.get_data(element)
|
local header_data = Gui.get_data(element)
|
||||||
|
if not header_data then
|
||||||
|
return
|
||||||
|
end
|
||||||
local values = header_data.values
|
local values = header_data.values
|
||||||
local player_index = header_data.player_index
|
local player_index = header_data.player_index
|
||||||
|
|
||||||
local player_panel = element.parent.parent
|
local player_panel = element.parent.parent
|
||||||
local data = Gui.get_data(player_panel)
|
local data = Gui.get_data(player_panel)
|
||||||
|
if not data then
|
||||||
|
return
|
||||||
|
end
|
||||||
local element_panel = data.element_panel
|
local element_panel = data.element_panel
|
||||||
local selected_player_header = data.selected_player_header
|
local selected_player_header = data.selected_player_header
|
||||||
local input_text_box = data.input_text_box
|
local input_text_box = data.input_text_box
|
||||||
@ -191,11 +197,17 @@ Gui.on_click(
|
|||||||
function(event)
|
function(event)
|
||||||
local element = event.element
|
local element = event.element
|
||||||
local header_data = Gui.get_data(element)
|
local header_data = Gui.get_data(element)
|
||||||
|
if not header_data then
|
||||||
|
return
|
||||||
|
end
|
||||||
local stored_data = header_data.stored_data
|
local stored_data = header_data.stored_data
|
||||||
local element_index = header_data.element_index
|
local element_index = header_data.element_index
|
||||||
|
|
||||||
local player_panel = element.parent.parent
|
local player_panel = element.parent.parent
|
||||||
local data = Gui.get_data(player_panel)
|
local data = Gui.get_data(player_panel)
|
||||||
|
if not data then
|
||||||
|
return
|
||||||
|
end
|
||||||
local data_panel = data.data_panel
|
local data_panel = data.data_panel
|
||||||
local selected_element_header = data.selected_element_header
|
local selected_element_header = data.selected_element_header
|
||||||
local input_text_box = data.input_text_box
|
local input_text_box = data.input_text_box
|
||||||
@ -246,6 +258,9 @@ Gui.on_click(
|
|||||||
function(event)
|
function(event)
|
||||||
local element = event.element
|
local element = event.element
|
||||||
local data = Gui.get_data(element)
|
local data = Gui.get_data(element)
|
||||||
|
if not data then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local input_text_box = data.input_text_box
|
local input_text_box = data.input_text_box
|
||||||
local player_panel = data.player_panel
|
local player_panel = data.player_panel
|
||||||
@ -263,6 +278,9 @@ Gui.on_click(
|
|||||||
Gui.clear(element_panel)
|
Gui.clear(element_panel)
|
||||||
if selected_player_header then
|
if selected_player_header then
|
||||||
local player_header_data = Gui.get_data(selected_player_header)
|
local player_header_data = Gui.get_data(selected_player_header)
|
||||||
|
if not player_header_data then
|
||||||
|
return
|
||||||
|
end
|
||||||
local values = player_header_data.values
|
local values = player_header_data.values
|
||||||
|
|
||||||
local selected_element_header = draw_element_headers(element_panel, values, selected_element_index)
|
local selected_element_header = draw_element_headers(element_panel, values, selected_element_index)
|
||||||
|
@ -34,7 +34,7 @@ function Public.open_debug(player)
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
frame = screen.add {type = 'frame', name = main_frame_name, caption = 'Debuggertron 3003', direction = 'vertical'}
|
frame = screen.add {type = 'frame', name = main_frame_name, caption = 'Debuggertron 3004', direction = 'vertical'}
|
||||||
frame.auto_center = true
|
frame.auto_center = true
|
||||||
local frame_style = frame.style
|
local frame_style = frame.style
|
||||||
frame_style.height = 600
|
frame_style.height = 600
|
||||||
@ -73,6 +73,9 @@ Gui.on_click(
|
|||||||
function(event)
|
function(event)
|
||||||
local element = event.element
|
local element = event.element
|
||||||
local data = Gui.get_data(element)
|
local data = Gui.get_data(element)
|
||||||
|
if not data then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local index = data.index
|
local index = data.index
|
||||||
local frame_data = data.frame_data
|
local frame_data = data.frame_data
|
||||||
|
@ -87,6 +87,9 @@ Gui.on_click(
|
|||||||
|
|
||||||
local left_panel = element.parent.parent
|
local left_panel = element.parent.parent
|
||||||
local data = Gui.get_data(left_panel)
|
local data = Gui.get_data(left_panel)
|
||||||
|
if not data then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
local selected_file_label = data.selected_file_label
|
local selected_file_label = data.selected_file_label
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ Gui.on_click(
|
|||||||
element.style.font_color = Color.orange
|
element.style.font_color = Color.orange
|
||||||
data.selected_header = element
|
data.selected_header = element
|
||||||
|
|
||||||
input_text_box.text = concat {'global.tokens[', token_id, ']'}
|
input_text_box.text = concat {'global.tokens.', token_id}
|
||||||
input_text_box.style.font_color = Color.black
|
input_text_box.style.font_color = Color.black
|
||||||
|
|
||||||
local id = Token.get_global(token_id)
|
local id = Token.get_global(token_id)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user