Update to 0.10.7

Author: ZwerOxotnik

changelog.txt

@@ -1,4 +1,12 @@
 ---------------------------------------------------------------------------------------------------
+Version: 0.10.7
+Date: 19. 08. 2021
+  Changes:
+    - Refactored slightly
+    - Improved stability slightly
+  Bugfixes:
+    - Fixed "bno"
+---------------------------------------------------------------------------------------------------
 Version: 0.10.6
 Date: 19. 08. 2021
   Changes:

compiler.lua

@@ -11,8 +11,8 @@ local gsub = string.gsub
 -- Split a string in to tokens using whitespace as a seperator.
 local function split( str )
     local result = {}
-    for sub in string.gmatch( str, "%S+" ) do
-        table.insert( result, sub )
+    for _sub in string.gmatch( str, "%S+" ) do
+        table.insert( result, _sub )
     end
     return result
 end
@@ -518,7 +518,7 @@ local function eval( ast, control, memory, modules, program_counter, clock )
             local _in = _[1]
             assert_in_mem_or_val(_in)
             local result = bit32.bnot(memcount_or_val(_in))
-            setmem_count(const_num(_out.val), result)
+            setmem_count(const_num(_in.val), result)
         end,
         slp = function(_) -- SLP M/I -- Sleep
             assert_in(_)

control.lua

@@ -22,14 +22,18 @@ function set_player_data(player_index, data)
 end
 
 -- Handle MicroController OPEN event.
-script.on_event("microcontroller-open", function(event)
-    local player = game.players[event.player_index]
+script.on_event("open-gui", function(event)
+	local player_index = event.player_index
+    local player = game.get_player(player_index)
+	if not (player and player.valid) then return end
     local entity = player.selected
-    if entity and entity.name == "microcontroller" then
+	if not (entity and entity.valid) then return end
+
+    if entity.name == "microcontroller" then
         entity.operable = false
-        local player_data = get_player_data(event.player_index)
+        local player_data = get_player_data(player_index)
         player_data.open_microcontroller = entity
-        set_player_data(event.player_index, player_data)
+        set_player_data(player_index, player_data)
         microcontrollerGui(player, entity)
     end
 end)
@@ -111,17 +115,21 @@ end)
 
 -- Handle MicroController GUI Close event.
 script.on_event("microcontroller-close", function(event)
-    local player = game.players[event.player_index]
-    local player_data = get_player_data(event.player_index)
+	local player_index = event.player_index
+    local player = game.get_player(player_index)
+	if not (player and player.valid) then return end
+
+    local player_data = get_player_data(player_index)
     if player_data.open_microcontroller_gui then
         microcontroller.update_program_text(player_data.open_microcontroller, player_data.open_microcontroller_gui.outer.scroll_pane.inner['program-input'].text)
         player_data.open_microcontroller_gui.destroy()
         player_data.open_microcontroller_gui = nil
     end
-    if player.gui.center['mc-docs'] then
-        player.gui.center['mc-docs'].destroy()
+	local docs = player.gui.center['mc-docs']
+    if docs then
+        docs.destroy()
     end
-    set_player_data(event.player_index, player_data)
+    set_player_data(player_index, player_data)
 end)
 
 -- Handle GUI text changed event.
@@ -160,12 +168,13 @@ local function update_topics_gui(gui)
             gui.add{type = "label", caption = {"", {"microcontroller.example"}, {"colon"}}}
             local textbox = gui.add{type = "text-box", text = topic.example}
             textbox.read_only = true
-            textbox.style.maximal_width = 0
-            textbox.style.minimal_height = 60
-            textbox.style.maximal_height = 140
-            textbox.style.horizontally_stretchable = true
-            textbox.style.vertically_stretchable = true
-            textbox.style.height = 130
+			local style = textbox.style
+            style.maximal_width = 0
+            style.minimal_height = 60
+            style.maximal_height = 140
+            style.horizontally_stretchable = true
+            style.vertically_stretchable = true
+            style.height = 130
         end
     end
 end
@@ -174,7 +183,7 @@ end
 
 -- Handle selection in GUI.
 script.on_event(defines.events.on_gui_selection_state_changed, function(event)
-    local player = game.players[event.player_index]
+    local player = game.get_player(event.player_index)
     if not (player and player.valid) then return end
     local element = event.element
     if not (element and element.valid and element.name) then return end
@@ -186,10 +195,10 @@ end)
 
 -- Handle GUI button presses.
 script.on_event(defines.events.on_gui_click, function(event)
-    local player = game.players[event.player_index]
+    local player = game.get_player(event.player_index)
     if not (player and player.valid) then return end
-    local player_data = get_player_data(event.player_index)
     local element = event.element
+    local player_data = get_player_data(event.player_index)
     if element and element.valid and element.name then
         -- RUN button pressed:
         if element.name == "run-program" then
@@ -282,7 +291,7 @@ script.on_event(microcontroller.event_halt, function(event)
     end
 end)
 
-function signalToSpritePath(signal)
+local function signalToSpritePath(signal)
     if signal.type == "virtual" then
         return "virtual-signal/" .. signal.name
     else

data.lua

@@ -2,6 +2,15 @@ require('stdlib/table')
 require('constants')
 require('prototypes/style')
 
+if data.raw["custom-input"]["open-gui"] == nil then
+    data.raw["custom-input"]["open-gui"] = {
+        type = "custom-input",
+        name = "open-gui",
+        key_sequence = "",
+        linked_game_control = "open-gui"
+    }
+end
+
 data:extend{
     table.merge(table.deepcopy(data.raw['arithmetic-combinator']['arithmetic-combinator']), {
         name = "microcontroller",
@@ -34,54 +43,49 @@ data:extend{
         subgroup = "circuit-network",
         order = 'zz'
     },
-	{
-		type = "technology",
-		name = "microcontroller",
-		icon_size = 128,
-		icon = "__m-microcontroller__/graphics/microchip_large.png",
-		effects = {
-			{
-				type = "unlock-recipe",
-				recipe = "microcontroller",
-			},
-			{
-				type = "unlock-recipe",
-				recipe = "microcontroller-ram",
-			},
-		},
-		prerequisites = { "circuit-network", "advanced-electronics" },
-		unit = {
-			count = 250,
-			ingredients = {
-				{"automation-science-pack", 1},
-				{"logistic-science-pack", 1},
-			},
-			time = 30,
+    {
+        type = "technology",
+        name = "microcontroller",
+        icon_size = 128,
+        icon = "__m-microcontroller__/graphics/microchip_large.png",
+        effects = {
+            {
+                type = "unlock-recipe",
+                recipe = "microcontroller",
+            },
+            {
+                type = "unlock-recipe",
+                recipe = "microcontroller-ram",
+            },
+        },
+        prerequisites = { "circuit-network", "advanced-electronics" },
+        unit = {
+            count = 250,
+            ingredients = {
+                {"automation-science-pack", 1},
+                {"logistic-science-pack", 1},
+            },
+            time = 30,
         },
         localised_description = {"microcontroller.doc.overview_description"},
-		order = "c-g-b",
-	},
+        order = "c-g-b",
+    },
     {
         type = "recipe",
         name = "microcontroller",
-		enabled = false,
+        enabled = false,
         ingredients = {{"arithmetic-combinator", 3}, {"decider-combinator", 3}},
         energy_required = 1,
         results = {{"microcontroller", 1}}
     },
     {
         type = "recipe",
         name = "microcontroller-ram",
-		enabled = false,
+        enabled = false,
         ingredients = {{"arithmetic-combinator", 3}, {"advanced-circuit", 2}},
         energy_required = 1,
         results = {{"microcontroller-ram", 1}}
     },
-    {
-        type = "custom-input",
-        name = "microcontroller-open",
-        key_sequence = "mouse-button-1",
-    },
     {
         type = "custom-input",
         name = "microcontroller-close",
@@ -217,7 +221,7 @@ for i = 1, MC_LINES do
             width = 42,
             height = h,
             x = 84,
-            y = y   
+            y = y
         }
     }
-end
+end

info.json

@@ -1,6 +1,6 @@
 {
   "name": "m-microcontroller",
-  "version": "0.10.6",
+  "version": "0.10.7",
   "factorio_version": "1.1",
   "title": "MicroController",
   "author": "Luke Perkin",

prototypes/style.lua

@@ -11,8 +11,8 @@ default_gui["mc_notice_textbox"] = {
     padding = 0,
     active_background = {
         filename = "__m-microcontroller__/graphics/black.png",
-          width = 1,
-          height = 1
+        width = 1,
+        height = 1
     },
     default_background = {
       filename = "__m-microcontroller__/graphics/grey.png",
@@ -32,7 +32,7 @@ default_gui["mc_program_input"] = {
     minimal_width = 280,
     natural_width = 0,
     maximal_width = 0,
-	word_wrap = false,
+    word_wrap = false,
     padding = 0,
     horizontally_stretchable = "on",
     vertically_stretchable = "on",