Fixed more 2.0 breaking changes, implemented search for many new enti…

…ties (not sure if all)

- also marked couple of TODOs for later

control.lua

@@ -91,7 +91,7 @@ local function generate_item_to_entity_table()
   end
 
   -- Hardcode some Pyanodons associations
-  if game.active_mods["pypetroleumhandling"] then
+  if script.active_mods["pypetroleumhandling"] then
     --  or {} in case something removed those items or playing an older version of Py
     table.insert(item_to_entities["raw-gas"] or {}, "bitumen-seep")
     table.insert(item_to_entities["tar"] or {}, "bitumen-seep")

scripts/gui.lua

@@ -66,15 +66,15 @@ function Gui.build_surface_results(surface_name, surface_data)
         extra_info = {"", "\n[font=default-semibold][color=255, 230, 192]", {"search-gui.signal-count-tooltip"}, ":[/color][/font] ", util.format_number(math.floor(group.signal_count), true)}
       end
       local sprite = "item/" .. entity_name
-      if not game.is_valid_sprite_path(sprite) then
+      if not helpers.is_valid_sprite_path(sprite) then
         sprite = "fluid/" .. entity_name
-        if not game.is_valid_sprite_path(sprite) then
+        if not helpers.is_valid_sprite_path(sprite) then
           sprite = "entity/" .. entity_name
-          if not game.is_valid_sprite_path(sprite) then
+          if not helpers.is_valid_sprite_path(sprite) then
             sprite = "recipe/" .. entity_name
-            if not game.is_valid_sprite_path(sprite) then
+            if not helpers.is_valid_sprite_path(sprite) then
               sprite = "virtual-signal/" .. entity_name
-              if not game.is_valid_sprite_path(sprite) then
+              if not helpers.is_valid_sprite_path(sprite) then
                 sprite = "utility/questionmark"
               end
             end
@@ -218,6 +218,8 @@ function Gui.build_results(data, frame, check_result_found, include_surface_name
     if not surface_contains_results then
       goto continue
     end
+
+    -- TODO sort somewhere before showing storage, modules, requesters, ...
     gui.build(frame, {
       Gui.build_surface_name(include_surface_name, surface_name),
       Gui.build_surface_count(surface_data.surface_info, include_surface_name),

scripts/result-location.lua

@@ -127,7 +127,7 @@ function ResultLocation.open(player, data)
     position = position,
     surface = surface_name,
   }
-  player.zoom = zoom_level
+  player.zoom = zoom_level -- TODO zoom out when showing map tags
 
   local player_data = storage.players[player.index]
   local refs = player_data.refs