Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing name collisions #2

Merged
merged 1 commit into from
Dec 17, 2022
Merged

Fixing name collisions #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
---------------------------------------------------------------------------------------------------
Version: 5.2.6
Date: 2022-03-16
Changes:
- Added a prefix to certain GUI Elements to avoid event collisions with other mods/scenarios.
---------------------------------------------------------------------------------------------------
Version: 5.2.4
Date: 2021-01-06
Changes:
Expand Down
2 changes: 1 addition & 1 deletion info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ModuleInserterER",
"version": "5.2.5",
"version": "5.2.6",
"factorio_version": "1.1",
"title": "Module Inserter (Non-conflict version)",
"author": "Neocult (Original author: Choumiko)",
Expand Down
16 changes: 11 additions & 5 deletions scripts/gui.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ local mod_gui = require("__core__.lualib.mod-gui")
local table = require("__flib__.table")
local gui = require("__flib__.gui-beta")

local module_button_prefix = "MIChooseModuleButton_"
local config_button_prefix = "MIConfigButton_"

local function export_config(config_data, name)
local to_bp_entities = function(data)
local entities = {}
Expand Down Expand Up @@ -125,7 +128,7 @@ mi_gui.templates = {
}
end,
module_button = function(index, module, assembler)
return {type = "choose-elem-button", style = "slot_button", name = index,
return {type = "choose-elem-button", style = "slot_button", name = module_button_prefix .. index,
actions = {on_elem_changed = {gui = "main", action = "choose_module"}},
elem_type = "item", elem_filters = {{filter = "type", type = "module"}},
item = module,
Expand All @@ -138,7 +141,7 @@ mi_gui.templates = {
local assembler = config.from
local slots = assembler and global.nameToSlots[assembler] or 2
local modules = config.to or {}
local row = {type = "flow", direction = "horizontal", name = index, style_mods = {horizontal_spacing = 0}, children = {
local row = {type = "flow", direction = "horizontal", name = config_button_prefix .. index, style_mods = {horizontal_spacing = 0}, children = {
mi_gui.templates.assembler_button(assembler),
{type = "table", column_count = 10, name = "modules", children = {},
style_mods = {
Expand Down Expand Up @@ -613,7 +616,8 @@ mi_gui.handlers = {
local config_tmp = pdata.config_tmp
local config_rows = pdata.gui.main.config_rows
if not (config_rows and config_rows.valid) then return end
local index = tonumber(e.element.parent.name)
local s, _ = e.element.parent.name:gsub("%D","")
local index = tonumber(s)
local element = e.element
local elem_value = element.elem_value

Expand Down Expand Up @@ -644,8 +648,10 @@ mi_gui.handlers = {
local config_tmp = e.pdata.config_tmp
local config_rows = e.pdata.gui.main.config_rows
if not (config_rows and config_rows.valid) then return end
local index = tonumber(e.element.parent.parent.name)
local slot = tonumber(e.element.name)
local s1, _ = e.element.parent.parent.name:gsub("%D","")
local index = tonumber(s1)
local s2, _ = e.element.name:gsub("%D","")
local slot = tonumber(s2)


local config = config_tmp[index]
Expand Down