moved workaround in code

moved to only trigger if blueprint contains displays with sprites, fixes "attempt to index local" crash as well

README.md

@@ -1,8 +1,8 @@
 # Industrial Display Plates
-<img src="https://raw.githubusercontent.com/Wyrrrd/IndustrialDisplayPlates/master/thumbnail.png" width="128" height="128">
+<img src="https://raw.githubusercontent.com/Wyrrrd/IndustrialDisplayPlates/master/thumbnail.png" width="144" height="144">
 
 ### Features
-Big, medium and small signs to display item and fluid icons. Can be used to blueprint map markers.
+Big, medium and small signs to display item, fluid and signal icons. Can be used to blueprint map markers.
 
 ### Locale
 If you want to contribute by translating this mod, you can view the existing translations [here](https://github.com/Wyrrrd/IndustrialDisplayPlates/tree/master/locale). I'd be happy to add your language and credits to the next release.

changelog.txt

@@ -1,8 +1,26 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.1.4
+Date: 2021-09-07
+  Bugfixes:
+    - fixed crash and unwanted behaviour introduced with last release
+---------------------------------------------------------------------------------------------------
+Version: 1.1.3
+Date: 2021-09-06
+  Bugfixes:
+    - Implemented controlled error message for blueprint update bug in factorio to avoid crash
+---------------------------------------------------------------------------------------------------
+Version: 1.1.2
+Date: 2021-08-21
+  Changes:
+    - Made virtual signals available (snouz)
+    - Softer map ping sound
+  Locale:
+    - Adjusted French translation
+---------------------------------------------------------------------------------------------------
 Version: 1.1.1
 Date: 2021-08-08
   Locale:
-    - Added french translation (thanks to Friendch)
+    - Added French translation (thanks to Friendch)
 ---------------------------------------------------------------------------------------------------
 Version: 1.1.0
 Date: 2020-12-02

control.lua

@@ -37,16 +37,18 @@ end
 
 local function add_map_marker(entity, icon_type, icon_name)
 	if icon_type and icon_name then
-		entity.force.add_chart_tag(entity.surface, { icon = { type = icon_type, name = icon_name}, position = entity.position })
+		local map_type = (icon_type == "virtual-signal") and "virtual" or icon_type
+		entity.force.add_chart_tag(entity.surface, { icon = { type = map_type, name = icon_name}, position = entity.position })
 		entity.surface.play_sound{path = "map-marker-ping", position = entity.position, volume_modifier = 1}
 	end
 end
 
 local function change_map_markers(entity, icon_type, icon_name)
+	local map_type = (icon_type == "virtual-signal") and "virtual" or icon_type
 	local markers = get_map_markers(entity)
 	if markers then
 		for _,marker in pairs(markers) do
-			marker.icon = { type = icon_type, name = icon_name}
+			marker.icon = { type = map_type, name = icon_name}
 		end
 	end
 end
@@ -74,7 +76,7 @@ local function get_render_sprite_info(entity)
 	local id = find_entity_render(entity)
 	if id then
 		local strings = splitstring(rendering.get_sprite(id), "/")
-		if #strings == 2 then return strings[1], strings[2] end
+		return strings[1], strings[2], strings[1] == 'virtual-signal' and 'virtual' or strings[1]
 	end
 	return nil, nil
 end
@@ -377,7 +379,14 @@ local function create_display_gui(player, selected)
 	for prototype_type,prototypes in pairs(DID.elem_prototypes) do
 		for _,prototype in pairs(game[prototypes]) do
 			if not DID.displays[prototype.name] and not ((prototype_type == "item" and prototype.has_flag("hidden")) or (prototype_type == "fluid" and prototype.hidden)) then
-				local group = (prototype.group.name == "fluids") and "intermediate-products" or prototype.group.name 
+				local group = ""
+				if prototype_type == "virtual-signal" then
+					group = prototype.subgroup.group.name
+				elseif prototype_type == "fluids" then
+					group = "intermediate-products"
+				else
+					group = prototype.group.name
+				end
 				if not DID.group_blacklist[group] then
 					if button_table[group] == nil then button_table[group] = {}	end
 					if button_table[group][prototype.subgroup.name] == nil then	button_table[group][prototype.subgroup.name] = {} end
@@ -543,10 +552,18 @@ script.on_event(defines.events.on_player_setup_blueprint, function (event)
 	local blueprint = nil
 	if player and player.blueprint_to_setup and player.blueprint_to_setup.valid_for_read then blueprint = player.blueprint_to_setup
 	elseif player and player.cursor_stack.valid_for_read and player.cursor_stack.name == "blueprint" then blueprint = player.cursor_stack end
+	
 	if blueprint then
 		for index,entity in pairs(event.mapping.get()) do
 			local stype,sname = get_render_sprite_info(entity)
 			if stype and sname then
+
+				-- Workaround for blueprint update bug
+				if blueprint.get_blueprint_entity_count() == 0 then
+					player.print({"display-plates.blueprint-wont-have-icons"})
+					return
+				end
+
 				blueprint.set_blueprint_entity_tag(index, "display-plate-sprite-type", stype)
 				blueprint.set_blueprint_entity_tag(index, "display-plate-sprite-name", sname)
 				blueprint.set_blueprint_entity_tag(index, "display-plate-sprite-map-marker", get_has_map_marker(entity))

globals.lua

@@ -54,9 +54,11 @@ return {
 	elem_prototypes = {
 		item = "item_prototypes",
 		fluid = "fluid_prototypes",
+		["virtual-signal"] = "virtual_signal_prototypes",
 	},
 	group_blacklist = {
 		["creative-mod_creative-tools"] = true,
+		["other"] = true,
 	},
 	icon_size = 64,
 	icon_mipmaps = 4,

info.json

@@ -1,6 +1,6 @@
 {
 	"name": "IndustrialDisplayPlates",
-	"version": "1.1.1",
+	"version": "1.1.4",
 	"title": "Industrial Display Plates",
 	"author": "Wyrrrd",
 	"homepage": "https://github.com/Wyrrrd/IndustrialDisplayPlates",
@@ -8,6 +8,6 @@
 		"base >= 1.1.0",
 		"(?)IndustrialRevolution"
 	],
-	"description": "Big, medium and small signs which display item and fluid icons. Can be used to blueprint map markers.",
+	"description": "Big, medium and small signs which display item, fluid and signal icons. Can be used to blueprint map markers.",
 	"factorio_version": "1.1"
 }

locale/de/strings.cfg

@@ -1,3 +1,6 @@
+[display-plates]
+blueprint-wont-have-icons=Dieser aktualisierte Blaupause wird keine Symbole oder Kartenmarkierungen der Anzeigeplatten enthalten. Um diese hinzuzufügen, erstelle eine neue Blaupause.
+
 [entity-name]
 copper-display=Kupferanzeigeplatte (groß)
 iron-display=Eisenanzeigeplatte (groß)

locale/en/strings.cfg

@@ -1,3 +1,6 @@
+[display-plates]
+blueprint-wont-have-icons=This updated blueprint will not contain any icons or map markers of the display plates. To include them, create a new blueprint.
+
 [entity-name]
 copper-display=Copper display plate (large)
 iron-display=Iron display plate (large)

locale/fr/strings.cfg

@@ -1,3 +1,6 @@
+[display-plates]
+blueprint-wont-have-icons=Ce plan mis à jour ne contiendra pas les icônes ni les marqueurs de carte des panneaux d'affichage. Pour les inclure, créez-en un nouveau.
+
 [entity-name]
 copper-display=Panneau d'affichage en Cuivre (Grand)
 iron-display=Panneau d'affichage en Fer (Grand)
@@ -14,4 +17,4 @@ display-map-marker=Marqueur de carte
 display-plate=Panneau d'affichage
 
 [entity-description]
-display=Une icône qui peut être reliée à un marqueur sur la carte. Les paramètres seront préservés par les Plans de Construction.
+display=Une icône qui peut être reliée à un marqueur sur la carte. Les paramètres sont préservés dans les plans.