Lsp

control.lua

@@ -1,3 +1,10 @@
+---@namespace PyCoalProcessing
+---@type PyCoalProcessingStorage
+storage = storage --[[@as PyCoalProcessingStorage]]
+
+---@class (partial) PyCoalProcessingStorage
+---@field finished boolean
+
 require "__pypostprocessing__.lib"
 
 require "scripts.wiki.wiki"
@@ -85,12 +92,13 @@ end)
 py.on_event(defines.events.on_player_created, function(event)
     Wiki.events.on_player_created(event)
 
-    local player = game.get_player(event.player_index)
+    local player = game.get_player(event.player_index)--[[@as LuaPlayer]]
     if not player.valid then return end
     local nauvis = game.surfaces["nauvis"]
     if not nauvis then return end
 
     local autoplace = nauvis.map_gen_settings.autoplace_controls
+    ---@cast autoplace -?
 
     if not script.active_mods["PyBlock"] and autoplace.stone and autoplace.stone.richness <= 1 then
         player.print {"messages.warning-no-preset", {"map-gen-preset-name.py-recommended"}}
@@ -135,6 +143,7 @@ end
 
 py.on_event(defines.events.on_tick, function(event)
     local func_list = remote.call("on_nth_tick", "query", "pycp", event.tick)
+    --[[@cast func_list string[] ]]
     for _, func in pairs(func_list) do
         py.mod_nth_tick_funcs[func]()
     end

data-final-fixes.lua

@@ -1,8 +1,8 @@
 if not mods.pyalternativeenergy then
     for _, recipe in pairs(data.raw.recipe) do
-        if not recipe.localised_name and recipe:has_category("combustion") and not recipe.name:find("%-biomass$") then
+        if not recipe.localised_name and RECIPE(recipe):has_category("combustion") and not recipe.name:find("%-biomass$") then
             local temp
-            for _, result in pairs(recipe.results) do
+            for _, result in pairs(recipe.results--[[@cast -?]]) do
                 if result.name == "combustion-mixture1" then
                     temp = result.temperature
                 end
@@ -53,7 +53,7 @@ if rpm_entity ~= 30 or rpm_items ~= 30 or overload ~= 0 then
             goto continue
         end
         for _, result in pairs(recipe.results) do -- This looks long, however we skip a lot of the logic with caching
-            local result_name = result[1] or result.name
+            local result_name = result.name
             if result_name and valid_entities[result_name] then
                 --log("Set multiplier for " .. recipe.name .. " (" .. result_name .. ")")
                 recipe.requester_paste_multiplier = tonumber(rpm_entity)

data-updates.lua

@@ -7,14 +7,14 @@ require "prototypes/updates/entity-updates"
 require "prototypes/technologies/stacking-belts"
 require "prototypes/item-sounds"
 
-ITEM("automation-science-pack", "tool"):set("icon", "__pycoalprocessinggraphics__/graphics/icons/science-pack-1.png")
-ITEM("automation-science-pack", "tool"):set("icon_size", 64)
+ITEM("automation-science-pack"):set("icon", "__pycoalprocessinggraphics__/graphics/icons/science-pack-1.png")
+ITEM("automation-science-pack"):set("icon_size", 64)
 
-ITEM("logistic-science-pack", "tool"):set("icon", "__pycoalprocessinggraphics__/graphics/icons/science-pack-2.png")
-ITEM("logistic-science-pack", "tool"):set("icon_size", 64)
+ITEM("logistic-science-pack"):set("icon", "__pycoalprocessinggraphics__/graphics/icons/science-pack-2.png")
+ITEM("logistic-science-pack"):set("icon_size", 64)
 
-ITEM("chemical-science-pack", "tool"):set("icon", "__pycoalprocessinggraphics__/graphics/icons/science-pack-3.png")
-ITEM("chemical-science-pack", "tool"):set("icon_size", 64)
+ITEM("chemical-science-pack"):set("icon", "__pycoalprocessinggraphics__/graphics/icons/science-pack-3.png")
+ITEM("chemical-science-pack"):set("icon_size", 64)
 
 ITEM("lab"):set("icon", "__pycoalprocessinggraphics__/graphics/icons/lab-mk01.png")
 ITEM("lab"):set("icon_size", 64)
@@ -197,9 +197,9 @@ RECIPE("beacon")
     :add_ingredient {type = "item", name = "intelligent-unit", amount = 1}
     :add_ingredient {type = "item", name = "parametric-oscilator", amount = 1}
     :add_ingredient {type = "item", name = "biopolymer", amount = 10}
-    :add_ingredient {type = "item", name = "super-alloy", amount = 10}:remove_ingredient {"steel-plate"}
+    :add_ingredient {type = "item", name = "super-alloy", amount = 10}
     :add_ingredient {type = "item", name = "tower-mk04", amount = 1}
-    :add_ingredient {type = "item", name = "processing-unit", amount = 5}:remove_ingredient {"electronic-circuit"}:remove_ingredient {"advanced-circuit"}
+    :add_ingredient {type = "item", name = "processing-unit", amount = 5}
     :add_ingredient {type = "item", name = "metastable-quasicrystal", amount = 1}
     :add_ingredient {type = "fluid", name = "r4", amount = 100}
 if mods.pyalternativeenergy then RECIPE("beacon"):replace_category("crafting", "crafting-with-fluid") end
@@ -208,13 +208,14 @@ RECIPE("beacon-mk01")
     :add_ingredient {type = "item", name = "self-assembly-monolayer", amount = 1}
     :add_ingredient {type = "item", name = "mechanical-parts-02", amount = 1}
     :add_ingredient {type = "item", name = "eva", amount = 10}
-    :add_ingredient {type = "item", name = "stainless-steel", amount = 10}:remove_ingredient {"steel-plate"}
+    :add_ingredient {type = "item", name = "stainless-steel", amount = 10}
     :add_ingredient {type = "item", name = "tower-mk02", amount = 1}
 
 if register_cache_file ~= nil then
     register_cache_file({"pycoalprocessing"}, "__pycoalprocessing__/cached-configs/pycoalprocessing.lua")
 end
 
 if mods["dependency-graph-lib"] then
+    ---@diagnostic disable-next-line: inject-field
     data.raw.item["copper-plate"].autotech_startup = true
 end

migrations/3.0.0.lua

@@ -1,3 +1,4 @@
+---@diagnostic disable
 storage.on_tick = {}
 -- fix rotation of fawogae plantations after fixing the graphics
 for _, surface in pairs(game.surfaces) do

migrations/3.1.6.lua

@@ -1,3 +1,4 @@
+---@diagnostic disable
 -- one-time clear of invalid inserter data to prevent warning for the bug we just fixed
 for id, metadata in pairs(storage.programmable_inserters) do
   if not metadata.inserter.valid then

migrations/beacon-interference.lua

@@ -1,3 +1,4 @@
+---@diagnostic disable
 storage.beacon_interference_alerts = storage.beacon_interference_alerts or {}
 storage.alerts = storage.alerts or {}
 storage.alert_count = storage.alert_count or 0

migrations/explode.lua

@@ -1,3 +1,4 @@
+---@diagnostic disable
 local killed_ninjas = 0
 local remaining_ninjas = 0
 for _, surface in pairs(game.surfaces) do

migrations/pyCoalprocessing_2.0.4.lua

@@ -1,3 +1,4 @@
+---@diagnostic disable
 game.reload_script()
 
 for _, player in pairs(game.players) do

prototypes/buildings/beacon.lua

@@ -126,7 +126,7 @@ for i, setting in pairs(beacon_settings) do
     beacon.name = beacon_names[i]
     beacon.distribution_effectivity = settings.startup["future-beacons"].value and (0.2 * am * fm) or (0.5 * am * fm)
     beacon.energy_usage = 1000 * am * (fm ^ 3) .. "kW"
-    beacon.supply_area_distance = 64 - 16 * (am - 1)
+    beacon.supply_area_distance = 64 - 16 * (am - 1)--[[@as int]]
     if beacon.supply_area_distance < 2 then beacon.supply_area_distance = 2 end
     beacon.placeable_by = {item = "beacon", count = 1}
     beacon.localised_name = {"entity-name.new-beacon", tostring(am), tostring(fm)}
@@ -152,8 +152,8 @@ data.raw.item.beacon.icon_size = 64
 data.raw.item.beacon.stack_size = 20
 data.raw.beacon.beacon.subgroup = data.raw.item.beacon.subgroup
 
-data.raw.module["speed-module"].beacon_tint.primary = {0, 0.65, 1}
-data.raw.module["speed-module-2"].beacon_tint.primary = {0, 0.65, 1}
-data.raw.module["speed-module-3"].beacon_tint.primary = {0, 0.65, 1}
+data.raw.module["speed-module"].beacon_tint--[[@cast -?]].primary = {0, 0.65, 1}
+data.raw.module["speed-module-2"].beacon_tint--[[@cast -?]].primary = {0, 0.65, 1}
+data.raw.module["speed-module-3"].beacon_tint--[[@cast -?]].primary = {0, 0.65, 1}
 
 TECHNOLOGY("effect-transmission"):add_prereq("diet-beacon")

prototypes/buildings/diet-beacon.lua

@@ -144,6 +144,6 @@ for am = 5, 1, -1 do
     end
 end
 
-data.raw.module["speed-module"].beacon_tint.primary = {0, 0.65, 1}
-data.raw.module["speed-module-2"].beacon_tint.primary = {0, 0.65, 1}
-data.raw.module["speed-module-3"].beacon_tint.primary = {0, 0.65, 1}
+data.raw.module["speed-module"].beacon_tint--[[@cast -?]].primary = {0, 0.65, 1}
+data.raw.module["speed-module-2"].beacon_tint--[[@cast -?]].primary = {0, 0.65, 1}
+data.raw.module["speed-module-3"].beacon_tint--[[@cast -?]].primary = {0, 0.65, 1}

prototypes/buildings/glassworks.lua

@@ -112,7 +112,7 @@ for i = 1, 4 do
         }
     }
 
-    table.insert(graphics_set.working_visualisations, 1, {
+    table.insert(graphics_set.working_visualisations--[[@cast -?]], 1, {
         fadeout = true,
         animation = {
             filename = "__pycoalprocessinggraphics__/graphics/entity/glassworks/a1.png",

prototypes/buildings/lab.lua

@@ -14,6 +14,7 @@ ENTITY {
     --damaged_trigger_effect = hit_effects.entity(),
     tall = true,
     circuit_connector = circuit_connector_definitions.create_single(
+        ---@diagnostic disable-next-line: param-type-mismatch
         universal_connector_template,
         { variation = 26, main_offset = util.by_pixel( 53.625, -178.25), shadow_offset = util.by_pixel( 53.625, -178.25), show_shadow = true }
     ),
@@ -136,10 +137,12 @@ if mods["DiscoScience"] then
     -- Remove the 3 glow layers
     -- We can remove only the first layer and not use the second layer in the overlay below for a less obvious effect
     for I = 1, 3 do
-        table.remove(data.raw.lab.lab.on_animation.layers, 2)
+        table.remove(data.raw.lab.lab.on_animation--[[@cast -?]].layers--[[@cast -?]], 2)
     end
+    ---@diagnostic disable-next-line: need-check-nil
     -- Overwrite on/off to the variant without blue lights embedded
     data.raw.lab.lab.on_animation.layers[1].filename = "__pycoalprocessinggraphics__/graphics/entity/lab-mk01/raw-bw.png"
+    ---@diagnostic disable-next-line: need-check-nil
     data.raw.lab.lab.off_animation.layers[1].filename = "__pycoalprocessinggraphics__/graphics/entity/lab-mk01/raw-bw.png"
     -- Overwrite the animation with ours
     data.raw.animation["discoscience/lab-storm"] = {

prototypes/gui-style.lua

@@ -81,8 +81,9 @@ style.py_schedule_move_button_alt = {
 }
 
 local graphics_set = table.deepcopy(data.raw["gui-style"].default.train_schedule_temporary_station_delete_button.default_graphical_set) --[[@as data.ElementImageSet]]
-graphics_set.base.corner_size = 8
+graphics_set.base--[[@cast -?]].corner_size = 8
 -- Removes black lines at right and bottom of shadow
+---@cast graphics_set.shadow data.ElementImageSetLayer
 graphics_set.shadow.position = {467, 90}
 graphics_set.shadow.corner_size = 4
 graphics_set.shadow.draw_type = "outer"

prototypes/menu-simulations.lua

@@ -3,6 +3,7 @@ if not mods["pyindustry"] then
 end
 
 local menu_simulations = data.raw["utility-constants"]["default"].main_menu_simulations
+---@cast menu_simulations -?
 
 -- do not work
 menu_simulations.nauvis_burner_city = nil

prototypes/ores/borax.lua

@@ -1,5 +1,6 @@
 local resource_autoplace = require "resource-autoplace"
 
+---@diagnostic disable-next-line: need-check-nil
 data.raw.planet.nauvis.map_gen_settings.autoplace_controls["borax"] = {}
 data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["borax"] = {}
 

prototypes/ores/niobium.lua

@@ -1,5 +1,6 @@
 local resource_autoplace = require "resource-autoplace"
 
+---@diagnostic disable-next-line: need-check-nil
 data.raw.planet.nauvis.map_gen_settings.autoplace_controls["niobium"] = {}
 data.raw.planet.nauvis.map_gen_settings.autoplace_settings.entity.settings["niobium"] = {}
 

prototypes/recipes/coal-processing-recipes.lua

@@ -930,7 +930,7 @@ RECIPE {
         {type = "item", name = "coal", amount = 1}
     },
     energy_required = 0.5
-}:add_unlock("coal-processing-3")
+}--[[@as data.RecipePrototype]]:add_unlock("coal-processing-3")
 
 RECIPE {
     type = "recipe",

prototypes/recipes/fuel-canister-recipes.lua

@@ -24,10 +24,10 @@ RECIPE {
 
 for f, fluid in pairs(data.raw.fluid) do
     if fluid.fuel_value and not skipped_fluids[fluid.name] and fluid.auto_barrel ~= false then
-        local fluid_icon = table.deepcopy(fluid.icons) or {{icon = fluid.icon}}
+        local fluid_icon = table.deepcopy(fluid.icons) or {{icon = fluid.icon}}--[[@as data.IconData[] ]]
         -- Apply to each layer
         for _, icon in pairs(fluid_icon) do
-            icon.icon_size = icon.icon_size or fluid_icon.icon_size or fluid.icon_size or 64
+            icon.icon_size = icon.icon_size or fluid.icon_size or 64
             icon.scale = 16 / icon.icon_size -- 32 = 0.5, 64 = 0.25
         end
 
@@ -39,7 +39,7 @@ for f, fluid in pairs(data.raw.fluid) do
         local icons = {{icon = "__pycoalprocessinggraphics__/graphics/icons/jerry-can.png", icon_size = 64}}
 
         for _, icon in pairs(fluid_icon) do
-            icon.shift = icon.shift or {}
+            icon.shift = icon.shift or {}--[[@as data.Vector]]
             local x, y = icon.shift[1] or icon.shift.x or 0, icon.shift[2] or icon.shift.y or 0
             icon.shift = {x, y + 2}
             table.insert(icons, icon)
@@ -65,9 +65,9 @@ for f, fluid in pairs(data.raw.fluid) do
 
         local fuel_amount = 50
         if string.match(fluid.fuel_value, "[kK]J") then
-            fuel_amount = math.ceil(10 / (string.match(fluid.fuel_value, "[%d%.]+") / 1000))
+            fuel_amount = math.ceil(10 / (string.match(fluid.fuel_value, "[%d%.]+")--[[@as int]] / 1000))
         elseif string.match(fluid.fuel_value, "[mM]J") then
-            fuel_amount = math.ceil(10 / (string.match(fluid.fuel_value, "[%d%.]+")))
+            fuel_amount = math.ceil(10 / string.match(fluid.fuel_value, "[%d%.]+")--[[@as int]])
         end
 
         RECIPE {

prototypes/recipes/tailings-recipes.lua

@@ -25,11 +25,11 @@ local tailings_copper_iron =
 
 local tailings_borax_niobium = tailings_copper_iron:copy("tailings-borax-niobium"):add_unlock("fluid-separation")
 tailings_borax_niobium.localised_name = {"recipe-name.tailings-ore-extraction", {"item-name.raw-borax"}, {"item-name.niobium-ore"}, {"fluid-name.tar"}}
-tailings_borax_niobium.icons[#tailings_borax_niobium.icons + 1] = {icon = "__pycoalprocessinggraphics__/graphics/icons/ores/borax-niobium.png", icon_size = 32}
-tailings_borax_niobium.results[#tailings_borax_niobium.results + 1] = {type = "item", name = "raw-borax", amount = 1, independent_probability = 0.4}
-tailings_borax_niobium.results[#tailings_borax_niobium.results + 1] = {type = "item", name = "niobium-ore", amount = 1, independent_probability = 0.4}
+tailings_borax_niobium.icons--[[@cast -?]][#tailings_borax_niobium.icons + 1] = {icon = "__pycoalprocessinggraphics__/graphics/icons/ores/borax-niobium.png", icon_size = 32}
+tailings_borax_niobium.results--[[@cast -?]][#tailings_borax_niobium.results + 1] = {type = "item", name = "raw-borax", amount = 1, independent_probability = 0.4}
+tailings_borax_niobium.results--[[@cast -?]][#tailings_borax_niobium.results + 1] = {type = "item", name = "niobium-ore", amount = 1, independent_probability = 0.4}
 
 --Finally add the results to our original table (this would be so much easier when Recipe:Results is finished)
-tailings_copper_iron.icons[#tailings_copper_iron.icons + 1] = {icon = "__pycoalprocessinggraphics__/graphics/icons/ores/copper-iron.png", icon_size = 32}
-tailings_copper_iron.results[#tailings_copper_iron.results + 1] = {type = "item", name = "copper-ore", amount = 1, independent_probability = 0.4}
-tailings_copper_iron.results[#tailings_copper_iron.results + 1] = {type = "item", name = "iron-ore", amount = 1, independent_probability = 0.4}
+tailings_copper_iron.icons--[[@cast -?]][#tailings_copper_iron.icons + 1] = {icon = "__pycoalprocessinggraphics__/graphics/icons/ores/copper-iron.png", icon_size = 32}
+tailings_copper_iron.results--[[@cast -?]][#tailings_copper_iron.results + 1] = {type = "item", name = "copper-ore", amount = 1, independent_probability = 0.4}
+tailings_copper_iron.results--[[@cast -?]][#tailings_copper_iron.results + 1] = {type = "item", name = "iron-ore", amount = 1, independent_probability = 0.4}

prototypes/updates/base-updates.lua

@@ -53,38 +53,38 @@ TECHNOLOGY("rocket-silo"):add_pack("military-science-pack")
 TECHNOLOGY("research-speed-6"):add_pack("military-science-pack")
 TECHNOLOGY("logistic-system"):add_pack("military-science-pack"):add_pack("production-science-pack")
 TECHNOLOGY("worker-robots-speed-5"):add_pack("military-science-pack")
-TECHNOLOGY("worker-robots-speed-6"):add_pack("military-science-pack").unit.count_formula = "1.5^(L-6)*1000"
+TECHNOLOGY("worker-robots-speed-6"):add_pack("military-science-pack").unit--[[@as data.TechnologyUnit]].count_formula = "1.5^(L-6)*1000"
 TECHNOLOGY("worker-robots-storage-3"):add_pack("military-science-pack")
 TECHNOLOGY("personal-roboport-mk2-equipment"):add_pack("military-science-pack"):add_pack("production-science-pack")
 TECHNOLOGY("mining-productivity-3"):add_pack("military-science-pack")
 
-data.raw.technology["artillery-shell-range-1"].unit.count_formula = nil
+data.raw.technology["artillery-shell-range-1"].unit--[[@cast -?]].count_formula = nil
 
-data.raw.technology.artillery.unit.ingredients = {
+data.raw.technology.artillery.unit--[[@cast -?]].ingredients = {
     {"automation-science-pack", 1},
     {"logistic-science-pack",   1},
     {"chemical-science-pack",   1},
     {"military-science-pack",   1}
 }
 data.raw.technology.artillery.prerequisites = {"military"}
 
-data.raw.technology["artillery-shell-speed-1"].unit.ingredients = {
+data.raw.technology["artillery-shell-speed-1"].unit--[[@cast -?]].ingredients = {
     {"automation-science-pack", 1},
     {"logistic-science-pack",   1},
     {"chemical-science-pack",   1},
     {"military-science-pack",   1}
 }
 data.raw.technology["artillery-shell-speed-1"].prerequisites = {"artillery"}
 
-data.raw.technology.tank.unit.ingredients = {
+data.raw.technology.tank.unit--[[@cast -?]].ingredients = {
     {"automation-science-pack", 1},
     {"logistic-science-pack",   1},
     {"chemical-science-pack",   1},
     {"military-science-pack",   1}
 }
 data.raw.technology.tank.prerequisites = {}
 
-data.raw.technology["uranium-ammo"].unit.ingredients = {
+data.raw.technology["uranium-ammo"].unit--[[@cast -?]].ingredients = {
     {"automation-science-pack", 1},
     {"logistic-science-pack",   1},
     {"military-science-pack",   1},
@@ -281,12 +281,12 @@ TECHNOLOGY("automated-rail-transportation"):remove_pack("logistic-science-pack")
 
 data.raw.pump.pump.pumping_speed = data.raw.pump.pump.pumping_speed * 10
 
-table.insert(data.raw["technology"]["steam-power"].effects, table.remove(data.raw.technology["circuit-network"].effects, 1))
+table.insert(data.raw["technology"]["steam-power"].effects--[[@cast -?]], table.remove(data.raw.technology["circuit-network"].effects--[[@cast -?]], 1))
 
 RECIPE("engine-unit"):replace_category("advanced-crafting", "crafting")
 
 RECIPE("selector-combinator"):remove_ingredient("advanced-circuit"):add_ingredient {type = "item", name = "electronic-circuit", amount = 5}
-TECHNOLOGY("advanced-combinators").unit.ingredients = mods.pyalienlife and {
+TECHNOLOGY("advanced-combinators").unit--[[@as data.TechnologyUnit]].ingredients = mods.pyalienlife and {
     {"automation-science-pack", 1},
     {"py-science-pack-1",       1},
 } or {
@@ -309,8 +309,8 @@ local starting_techs = {
 }
 
 for _, t in pairs(starting_techs) do
-    t = data.raw.technology[t]
-    if t then t.prerequisites = {"automation-science-pack"} end
+    tech = data.raw.technology[t]
+    if tech then tech.prerequisites = {"automation-science-pack"} end
     ::continue::
 end
 
@@ -372,8 +372,6 @@ big_fluid_icons_for_pipes("niobium-pipe-to-ground")
 big_fluid_icons_for_pipes("ht-pipes")
 big_fluid_icons_for_pipes("ht-pipes-to-ground")
 
-data.raw["utility-constants"]["default"].max_fluid_flow = math.max(data.raw["utility-constants"]["default"].max_fluid_flow or 0, 500)
-
 data.raw["technology"]["efficiency-module"].prerequisites = {mods.pyalternativeenergy and "machine-components-mk02" or "productivity-module"}
 data.raw["technology"]["bulk-inserter"].prerequisites = {mods.pyhightech and "basic-electronics" or "chemical-science-pack"}
 if data.raw["technology"]["bulk-inserter-2"] then data.raw["technology"]["bulk-inserter-2"].prerequisites = {"bulk-inserter"} end

prototypes/updates/pyindustry-updates.lua

@@ -25,6 +25,6 @@ RECIPE {
     }
 }:add_unlock("py-asphalt-mk03"):add_ingredient {type = "fluid", name = "flue-gas", amount = 200}:add_ingredient {type = "item", name = "small-parts-01", amount = 10}
 
-data.raw["container"]["py-logo-15tiles"].minable.result = "py-logo-15tiles"
+data.raw["container"]["py-logo-15tiles"].minable--[[@cast -?]].result = "py-logo-15tiles"
 RECIPE("niobium-pipe"):remove_unlock("py-storage-tanks"):add_unlock("niobium")
 RECIPE("niobium-pipe-to-ground"):remove_unlock("py-storage-tanks"):add_unlock("niobium")