Ghost tags support; mod-gui.lua-button

changelog.txt

@@ -1,4 +1,10 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.0.5
+Date: 2022-07-07
+  Changes:
+    - Uses mod-gui button
+    - Supports blueprint tags
+---------------------------------------------------------------------------------------------------
 Version: 1.0.3
 Date: 2021-01-08
   Changes:

control.lua

@@ -39,16 +39,19 @@ script.on_init(function()
 end)
 
 script.on_configuration_changed(function(event)
-    if event.mod_changes 
-        and event.mod_changes["TheBlueprintLab_bud"] then
-        --and event.mod_changes["TheBlueprintLab_bud"].old_version == "0.0.1" then
+    if event.mod_changes and event.mod_changes["TheBlueprintLab_bud"] then
         ClearVersion001()
         InitAllPlayers()
-    for _, player in pairs(game.players) do
-        InitIsUnlocked(player.index)
-        CreateGui(player.index)
+        for _, player in pairs(game.players) do
+            InitIsUnlocked(player.index)
+            CreateGui(player.index)
+        end
+    end
+    if event.mod_changes and event.mod_changes["BlueprintLab_Blu3wolf"] then
+        for _, player in pairs(game.players) do
+            CreateGui(player.index)
+        end
     end
-end
 end)
 
 script.on_load(function()

data.lua

@@ -48,5 +48,10 @@ data:extend({
 		enabled = false,
 		ingredients = {},
 		result = "express-loader"
+	}, {
+		type = "font",
+		name = "bluprintlab_cross",
+		from = "default-bold",
+		size = 32
 	},
 })

info.json

@@ -1,9 +1,9 @@
 {
   "name": "BlueprintLab_Blu3wolf",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "factorio_version": "1.1",
   "title": "The Blueprint Designer Lab",
-  "author": "Bud, Likos, Schoos, daniel90c, minno, Blu3wolf",
+  "author": "Bud, Likos, Schoos, daniel90c, minno, Blu3wolf, viidi",
   "description": "Enter your lab to design your blueprints. Minor quickfix suggested by 4M_Peri",
   "homepage": "https://github.com/Blu3wolf/Blueprint-Lab",
   "dependencies": ["base >= 1.1.8", "? miniloader >= 1.11.0"]

scripts/common.lua

@@ -64,6 +64,7 @@ EmptyBlueprintString = "0eNqrrgUAAXUA+Q=="
 
 function ReviveEntity(entity, player_index)
     if entity.type == "entity-ghost" then
+        local tags = entity.tags
         _, revived, request = entity.revive({true})
         if not revived then return end
 
@@ -73,9 +74,9 @@ function ReviveEntity(entity, player_index)
             end
             request.destroy()
         end
-		
-        script.raise_event(defines.events.script_raised_built, 
-			{player_index = player_index, entity = revived})
+
+        script.raise_event(defines.events.script_raised_revive,
+			{player_index = player_index, entity = revived, tags = tags})
     elseif entity.type == "tile-ghost" then
         entity.revive()
     end

scripts/gui.lua

@@ -1,37 +1,58 @@
 require "logic"
 require "init-lab"
+local mod_gui = require("mod-gui")
+
+function get_le_flow(player)
+    local button_flow = mod_gui.get_button_flow(player)
+    local flow = button_flow.le_flow
+    if not flow then
+        flow = button_flow.add {
+            type = "flow",
+            name = "le_flow",
+            direction = "horizontal"
+        }
+    end
+    return flow
+end
 
 function CreateGui(player_index)
     local player = game.players[player_index]
     local playerData = global[player_index]
-    if player.gui.left["BPL_Flow"] == nil then
-        player.gui.left.add {type = "flow", name = "BPL_Flow"}
+    if player.gui.left["BPL_Flow"] then
+        player.gui.left["BPL_Flow"].destroy()
+    end
+    playerData.flow = get_le_flow(player)
+    if not playerData.flow.BPL_LabButton then
+        playerData.button = playerData.flow.add {
+            type = "sprite-button",
+            name = "BPL_LabButton",
+            sprite = "item/lab",
+            tooltip = {"bpl.LabButtonTooltip"},
+            style = mod_gui.button_style}
+    end
+    if not playerData.flow.BPL_ClearButton then
+        playerData.clearButton = playerData.flow.add {
+            type = "sprite-button",
+            name = "BPL_ClearButton",
+            caption = "×",
+            sprite = "item/lab",
+            tooltip = {"bpl.ClearButtonTooltip"},
+            style = mod_gui.button_style}
+        playerData.clearButton.style.font_color = {.5,0,0}
+        playerData.clearButton.style.hovered_font_color = playerData.clearButton.style.font_color
+        playerData.clearButton.style.font = "bluprintlab_cross"
     end
-    playerData.flow = player.gui.left["BPL_Flow"]
-    playerData.flow.clear()
-    playerData.button = playerData.flow.add {
-        type = "button", name = "BPL_LabButton",
-        caption = {"bpl.LabButton"},
-        tooltip = {"bpl.LabButtonTooltip"},
-        style = 'confirm_button'}
-    playerData.clearButton = playerData.flow.add {
-        type = "button", name = "BPL_ClearButton",
-        caption = {"bpl.ClearButton"},
-        tooltip = {"bpl.ClearButtonTooltip"},
-        style = 'red_back_button'}
     UpdateGui(player_index)
 end
 
 function UpdateGui(player_index)
     local playerData = global[player_index]
 
     if playerData.inTheLab then
-        playerData.button.caption = {"bpl.LabButtonReturn"}
         playerData.button.visible = true
         playerData.clearButton.visible = true
     else
         if playerData.isUnlocked then
-            playerData.button.caption = {"bpl.LabButton"}
             playerData.button.visible = true
             playerData.clearButton.visible = false
         else