update for 2.1

changelog.txt

@@ -1,4 +1,20 @@
 ---------------------------------------------------------------------------------------------------
+Version: 3.1.0
+Date: ???
+  Changes:
+    - Updated to Factorio 2.1
+    - Removed equipment fuel manager in favor of the engine's built-in auto_refuel
+    - Changed beacon overload blacklist to be locally loaded instead of always saved in storage to allow mods that are removed to have their effects removed
+    - Added annotations to tailings pond script
+    - Added inserter inventory targeting options
+    - Removed unnecessary prototype values to clear up the log
+    - Updated vector_to_place_result so items shouldn't drop on the floor. Resolves https://github.com/pyanodon/pybugreports/issues/1486
+    - Fixed that many buildings did not have certain pipe covers rendered
+    - Added factory planner integration for barreling-like recipes
+    - Reduced most fluidbox sizes from 1000 to 100
+    - Fixed that beacon interference would only disable one entity instead of all effected ones
+    - Added the following entities to be hidden when visibility of tall entities is toggled: chemical plant, classifier, fts reactor, combustion turbine, high pressure furnace, lab
+---------------------------------------------------------------------------------------------------
 Version: 3.0.45
 Date: ???
   Changes:

control.lua

@@ -9,6 +9,8 @@ require "scripts.tailings-pond"
 require "scripts.beacons"
 require "scripts.milestones"
 require "scripts.generator-equipment-autofill"
+require "scripts.programmable-inserter"
+require "scripts.factory-planner"
 
 py.on_event(py.events.on_init(), function()
     for _, interface in pairs {"silo_script", "better-victory-screen"} do

data-final-fixes.lua

@@ -1,6 +1,6 @@
 if not mods.pyalternativeenergy then
     for _, recipe in pairs(data.raw.recipe) do
-        if not recipe.localised_name and recipe.category == "combustion" and not recipe.name:find("%-biomass$") then
+        if not recipe.localised_name and recipe:has_category("combustion") and not recipe.name:find("%-biomass$") then
             local temp
             for _, result in pairs(recipe.results) do
                 if result.name == "combustion-mixture1" then
@@ -70,7 +70,14 @@ end
 data.raw["utility-constants"].default.minimum_recipe_overload_multiplier = 1
 
 for _, recipe in pairs(data.raw.recipe) do
-    if recipe.category == "tar" and not recipe.crafting_machine_tint then
+    if recipe:has_category("tar") and not recipe.crafting_machine_tint then
         error("Recipe " .. recipe.name .. " is missing crafting_machine_tint. Please fill out this field.")
     end
 end
+
+-- make all generator equipment auto refuel
+if settings.startup["py-generator-equipment-manager"].value then
+    for _, equipment in pairs(data.raw["generator-equipment"]) do
+        if equipment.burner then equipment.burner.auto_refuel = true end
+    end
+end

data-updates.lua

@@ -202,7 +202,7 @@ RECIPE("beacon")
     :add_ingredient {type = "item", name = "processing-unit", amount = 5}:remove_ingredient {"electronic-circuit"}:remove_ingredient {"advanced-circuit"}
     :add_ingredient {type = "item", name = "metastable-quasicrystal", amount = 1}
     :add_ingredient {type = "fluid", name = "r4", amount = 100}
-if mods.pyalternativeenergy then data.raw.recipe.beacon.category = "crafting-with-fluid" end
+if mods.pyalternativeenergy then RECIPE("beacon"):replace_category("crafting", "crafting-with-fluid") end
 
 RECIPE("beacon-mk01")
     :add_ingredient {type = "item", name = "self-assembly-monolayer", amount = 1}

data.lua

@@ -183,20 +183,3 @@ data.raw.fluid["refsyngas"].fuel_value = "0.5MJ"
 data.raw.fluid["methanol"].fuel_value = "1MJ"
 data.raw.fluid["tar"].fuel_value = "0.2MJ"
 --data.raw.fluid['combustion-mixture1'].fuel_value = '0.1MJ'
-
-if mods.pyindustry then
-    data:extend {{
-        type = "shortcut",
-        name = "py-toggle-equipment-fuel-manager",
-        action = "lua",
-        technology_to_unlock = "personal-roboport-equipment",
-        unavailable_until_unlocked = true,
-        toggleable = true,
-        style = "default",
-        icon = "__pycoalprocessinggraphics__/graphics/gui/toggle-equipment-fuel-manager.png",
-        small_icon = "__pycoalprocessinggraphics__/graphics/gui/toggle-equipment-fuel-manager.png",
-        icon_size = 36,
-        small_icon_size = 36,
-        order = data.raw.shortcut["toggle-equipment-movement-bonus"].order
-    }}
-end

info.json

@@ -1,16 +1,16 @@
 {
     "name": "pycoalprocessing",
-    "version": "3.0.44",
-    "factorio_version": "2.0",
+    "version": "3.1.0",
+    "factorio_version": "2.1",
     "title": "Pyanodons Coal Processing",
-    "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, przemo1232",
+    "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, przemo1232, protocol_1903",
     "contact": "https://discord.gg/SBHM3h5Utj",
     "homepage": "https://mods.factorio.com/mods/pyanodon/pycoalprocessing",
     "description": "Extends and overhauls Factorio's burner phase. Use realistic oil and coal processes to create advanced products. Functions as the core and library for the rest of the pY mods.",
     "dependencies": [
-        "base >= 2.0.58",
-        "~ pycoalprocessinggraphics >= 3.0.6",
-        "~ pypostprocessing >= 3.0.42",
+        "base >= 2.1",
+        "~ pycoalprocessinggraphics >= 3.1.0",
+        "~ pypostprocessing >= 3.1.0",
         "(?) DiscoScience",
         "(?) better-victory-screen",
         "(?) elevated-rails",

locale/de/locale.cfg

@@ -1,9 +1,3 @@
-[shortcut-name]
-py-toggle-equipment-fuel-manager=Ausrüstungs-Kraftstoffmanager umschalten
-
-[shortcut-description]
-py-toggle-equipment-fuel-manager=Steuert, ob Generatoren innerhalb persönlicher Ausrüstungsgitter automatisch mit Treibstoff versorgt werden und leere Treibstofffächer geleert werden.
-
 [ore-name]
 borax=Borax-Kristalle
 niob=Nioberz

locale/de/tips.cfg

@@ -14,7 +14,7 @@ mechanical-inserter=[item=burner-inserter] Greifarme
 tailings-pond=[item=tailings-pond] Erzschlackebecken
 combustion-mixture=[fluid=combustion-mixture1] Brennbares Gemisch
 beacon=[item=beacon] AM:FM-Effektverteiler
-decay=[item=biocrud] Verfall
+item_decay=[item=biocrud] Verfall
 
 rawores=Roherze
 big-mines=[item=ore-lead] Große Minen

locale/en/locale.cfg

@@ -1,9 +1,3 @@
-[shortcut-name]
-py-toggle-equipment-fuel-manager=Toggle equipment fuel manager
-
-[shortcut-description]
-py-toggle-equipment-fuel-manager=Controls whether generators inside of personal equipment grids are automatically fueled and the empty fuel slots emptied.
-
 [ore-name]
 borax=Raw borax
 niobium=Niobium ore
@@ -805,12 +799,14 @@ rpm_entity=Requester paste multiplier for enitities
 rpm_items=Requester paste multiplier for items
 overload=Crafting machine overfill multiplier
 future-beacons=Future beacons
+py-generator-equipment-manager=Generator equipment manager
 
 [mod-setting-description]
 rpm_entity=adjust the number of items requested when copy/pasting a recipe for enitities
 rpm_items=adjust the number of items requested when copy/pasting a recipe for items
 overload=adjusts the number of items inserted into a crafting machine over the required number to fill a recipe. default value use the following formula (1.166 / (energy_required / the assembler's crafting_speed), rounded up, and clamped to be between2 and 100).
 future-beacons=Beacons have been rebalanced for the upcoming py mod (Py Stellar Expedition).\nHowever with this setting you can have the rebalanced beacons now.\nChanges:\nBeacons (not diet beacons) have 0.2*am*fm transmission efficiency instead of 0.5*am*fm.\n5 beacons can affect an entity instead of 25.
+py-generator-equipment-manager=Automatically fills generator equipment with fuel and extracts burnt results into your inventory
 
 [gui-game-finished]
 victory=Victory! Congratulations, you have beaten Pyanodon's mods.

locale/en/tips.cfg

@@ -14,14 +14,15 @@ mechanical-inserter=[item=burner-inserter] Inserters
 tailings-pond=[item=tailings-pond] Tailings pond
 combustion-mixture=[fluid=combustion-mixture1] Combustion mixture
 beacon=[item=beacon] AM:FM Beacons
-decay=[item=biocrud] Decay
+item_decay=[item=biocrud] Item Decay
+recipe_decay=[img=utility/recipe_arrow] Recipe Decay Propogation
 
 rawores=Raw ores
 big-mines=[item=ore-lead] Big mines
 
 [pywiki-descriptions]
 ash=Most inorganic fuels such as [item=coal] now produce [item=ash] when burnt, much like how [item=uranium-fuel-cell] produces [item=depleted-uranium-fuel-cell] on consumption.\n\nAsh management is a central part of the early game, as it will eventually jam machines if not removed from the output slot. [item=burner-inserter] can have a filter set to automatically remove ash. [entity=solid-separator] can help to repurpose some of the ash into ores.
-mechanical-inserter=The burner inserter is now an [item=burner-inserter]. Unlike in the base game, it does not need to be fueled.\n\nRequired fuel:\n [entity=burner-inserter]: Free\n [entity=inserter]: 16.9 kW\n [entity=long-handed-inserter]: 20.11 kW\n [entity=fast-inserter]: 46.7 kW\n [entity=bulk-inserter]: 169 kW\n [entity=py-stack-inserter]: 1.6 MW\n\nInserter speeds: (chest-to-chest)\n [entity=burner-inserter]: 0.78 arm cycles/s\n [entity=inserter]: 1.2 arm cycles/s\n [entity=long-handed-inserter]: 1.2 arm cycles/s\n [entity=fast-inserter]: 2.31 arm cycles/s\n [entity=bulk-inserter]: 2.31 arm cycles/s\n [entity=py-stack-inserter]: 1.8 arm cycles/s\n\nFilter slot counts:\n [entity=burner-inserter]: 1\n [entity=inserter]: 2\n [entity=long-handed-inserter]: 3\n [entity=fast-inserter]: 4\n [entity=bulk-inserter]: 5\n [entity=py-stack-inserter]: 5\n\nSpecial:\n [entity=long-handed-inserter]: Reaches two tiles instead of one.\n [entity=bulk-inserter]: Benefits from [technology=inserter-capacity-bonus-1].\n [entity=py-stack-inserter]: Benefits from [technology=inserter-capacity-bonus-1]. Stacks items on the belt up to eight tall.
+mechanical-inserter=The burner inserter is now an [item=burner-inserter]. Unlike in the base game, it does not need to be fueled.\n\Power use:\n [entity=burner-inserter]: Free\n [entity=inserter]: 16.9 kW\n [entity=long-handed-inserter]: 20.11 kW\n [entity=fast-inserter]: 46.7 kW\n [entity=bulk-inserter]: 169 kW\n [entity=py-stack-inserter]: 1.6 MW\n\nInserter speeds: (chest-to-chest)\n [entity=burner-inserter]: 0.78 arm cycles/s\n [entity=inserter]: 1.2 arm cycles/s\n [entity=long-handed-inserter]: 1.2 arm cycles/s\n [entity=fast-inserter]: 2.31 arm cycles/s\n [entity=bulk-inserter]: 2.31 arm cycles/s\n [entity=py-stack-inserter]: 1.8 arm cycles/s\n\nFilter slot counts:\n [entity=burner-inserter]: 1\n [entity=inserter]: 2\n [entity=long-handed-inserter]: 3\n [entity=fast-inserter]: 4\n [entity=bulk-inserter]: 5\n [entity=py-stack-inserter]: 5\n\nInserter Settings:\nInserters can be configured to only interact with specific slots of entities. With the exception of module slots, this only allows you to specifically pull things from and push things to slots that would normally be accessibly by inserter.\nThe button on the right of the inserter GUI opens up the target menu. Invalid targets will show up in red. Targets will always appear invalid when the inserter is a ghost.\nInput, output, fuel, and modules are self-explanatory. Cargo is used for rocket silo cargo or car trunks. Burnt result is the slots for ash/jerry cans/other items that are the direct result of fuel burning. Trash is the output slots for spoiled items. Dump is the slots that assembling machines use to dump items when their recipe is changed via the circuit network.\n\nSpecial:\n [entity=long-handed-inserter]: Reaches two tiles instead of one.\n [entity=bulk-inserter]: Benefits from [technology=inserter-capacity-bonus-1].\n [entity=py-stack-inserter]: Benefits from [technology=inserter-capacity-bonus-1]. Stacks items on the belt up to eight tall.
 tailings-pond=The [entity=tailings-pond] is a huge open-air fluid storage solution that can hold up to 1,000,000 fluid units. It has different mechanisms depending on whether you put a gas or a liquid into it.\n\nGasses such as [fluid=coal-gas] are vented into the atmosphere. This destroys the gas and creates tons of pollution. 100 units of any gas will create 15 units of pollution.\n\nCertain gasses do not create pollution:\n [fluid=oxygen]\n [fluid=hydrogen]\n [fluid=nitrogen]\n [fluid=purest-nitrogen-gas]\n [fluid=pressured-air]\n [fluid=hot-air]\n [fluid=vacuum]\n\nLiquids such as [fluid=tar] are stored in the pond until the tailings pond is 100% full. Once the pond reaches this threshold the pond overflows, destroying the fluid and creating rings of highly flammable pollution tiles in the effected area.\n\nAny fluid with "water" in the name will instead seep into the groundwater and not create pollution tiles. [fluid=muddy-sludge] will also not create pollution tiles. The conversion factor is 500 units of fluid per every pollution tile. The pollution tiles can be used to fill lakes.\n\nYou can remove fluids from the pond by connecting [entity=pump] directly to one of the outputs. [item=red-wire] and [item=green-wire] can be used to read the contents of the pond.
 beacon=The [entity=beacon-AM1-FM1] and [entity=diet-beacon-AM1-FM1] use radio signals to trasmit module effects into nearby assembling machines. Each beacon has both an AM and an FM frequency that determines the effect radius, transmission efficiency, and power usage.\nThe AM and FM frequency sliders range from 1-5.\n\n[entity=diet-beacon-AM1-FM1]\nEffect radius:\n    - AM1: 32\n    - AM2: 24\n    - AM3: 16\n    - AM4: 8\n    - AM5: 2\nTransmission efficiency: 0.1 * AM * FM\nPower consumption: AM * (FM ^ 3) / 2 MW\n\n[entity=beacon-AM1-FM1]\nEffect radius:\n    - AM1: 64\n    - AM2: 48\n    - AM3: 32\n    - AM4: 16\n    - AM5: 2\nTransmission efficiency: 0.2 * AM * FM\nPower consumption: AM * (FM ^ 3) MW\n\nThe default 1AM 1FM beacon is wide area low power.\nIf a machine recives conflicting signals on either the AM or FM frequencies then the wavelengths will interfere and overload the machine.\nBeacons do not accept productivity modules such as [item=productivity-module-3].
 combustion-mixture=You can burn [fluid=combustion-mixture1] in [entity=gasturbinemk01] for electricity. Higher temperatures of the fluid mean that the turbine works at a higher efficiency, thus generating more power. [entity=gasturbinemk01] has a limit to the temperature it can accept: if you give it a higher temperature input than this limit, it will be capped to that temperature, so you will be wasting the input. Higher level turbines have higher limits.
@@ -62,3 +63,23 @@ burnt-result=Burnt result
 color=Color
 decay-time=Decay time
 decay-result=Decay results
+decay-ingredients=Freshness weights
+decay-products=Product freshness 
+
+[tooltip]
+show-inserter-settings=Show inserter target and source settings
+inserter-settings-title=Targets
+unavailable-insert-target=[color=red]__1__[/color]
+inserter-drop-target-tooltip=Inventory to drop items into
+inserter-pickup-target-tooltip=Inventory to pickup items from
+
+[inventory-target]
+default=Default
+input=Input
+output=Output
+fuel=Fuel
+burnt_result=Burnt result
+modules=Modules
+trash=Trash
+cargo=Cargo
+dump=Dump

locale/es-ES/locale.cfg

@@ -1,9 +1,3 @@
-[shortcut-name]
-py-toggle-equipment-fuel-manager=Alternar el gestor de combustible de equipamiento
-
-[shortcut-description]
-py-toggle-equipment-fuel-manager=Controla si los generadores dentro de las cuadriculas de equipamiento se restablecen y vacían automáticamente.
-
 [ore-name]
 borax=Bórax en bruto
 niobium=Mena de niobio

locale/es-ES/tips.cfg

@@ -14,7 +14,7 @@ mechanical-inserter=[item=burner-inserter] Insertadores
 tailings-pond=[item=tailings-pond] Laguna de relaves
 combustion-mixture=[fluid=combustion-mixture1] Mezcla de combustión
 beacon=[item=beacon] Faros AM:FM
-decay=[item=biocrud] Degradación
+item_decay=[item=biocrud] Degradación
 
 rawores=Menas en bruto
 big-mines=[item=ore-lead] Minas grandes

locale/nl/locale.cfg

@@ -1,9 +1,3 @@
-[shortcut-name]
-py-toggle-equipment-fuel-manager=Schakel brandstofbeheerder aan/uit
-
-[shortcut-description]
-py-toggle-equipment-fuel-manager=Regelt of de generatoren in persoonlijke uitrustig rasters automatisch worden bijgetankt en of lege brandstofvakjes worden geleegd.
-
 [ore-name]
 borax=Ruwe borax
 niobium=Niobiumerts

locale/nl/tips.cfg

@@ -10,7 +10,7 @@ mechanical-inserter=[item=burner-inserter] Robotarmen
 tailings-pond=[item=tailings-pond] Residubekken
 combustion-mixture=[fluid=combustion-mixture1] Verbrandingsmengsel
 beacon=[item=beacon] AM:FM Bakens
-decay=[item=biocrud] Rot
+item_decay=[item=biocrud] Rot
 
 rawores=Ruwe ertsen
 big-mines=[item=ore-lead] Grote mijnen

locale/pl/locale.cfg

@@ -1,9 +1,3 @@
-[shortcut-name]
-py-toggle-equipment-fuel-manager=Włącz menedżera paliwa ekwipunku
-
-[shortcut-description]
-py-toggle-equipment-fuel-manager=Kontroluje, czy generatory w osobistym ekwipunku są automatycznie zasilane paliwem, a puste sloty paliwa opróżniane.
-
 [ore-name]
 borax=Surowy boraks
 niobium=Ruda niobu

locale/pl/tips.cfg

@@ -14,7 +14,7 @@ mechanical-inserter=[item=burner-inserter] Podajniki
 tailings-pond=[item=tailings-pond] Staw odpadowy
 combustion-mixture=[fluid=combustion-mixture1] Mieszanka spalająca
 beacon=[item=beacon] Nadajniki AM:FM
-decay=[item=biocrud] Rozkład
+item_decay=[item=biocrud] Rozkład
 
 rawores=Surowe rudy
 big-mines=[item=ore-lead] Duże kopalnie

locale/ru/locale.cfg

@@ -1,9 +1,3 @@
-[shortcut-name]
-py-toggle-equipment-fuel-manager=Переключить менеджер топлива оборудования
-
-[shortcut-description]
-py-toggle-equipment-fuel-manager=Контролирует автоматическую заправку генераторов внутри сеток персонального оборудования и опорожнение ячеек отработанного топлива.
-
 [ore-name]
 borax=Необработанный боракс
 niobium=Ниобиевая руда

locale/ru/tips.cfg

@@ -14,7 +14,7 @@ mechanical-inserter=[item=burner-inserter] Манипуляторы
 tailings-pond=[item=tailings-pond] Хранилище отходов
 combustion-mixture=[fluid=combustion-mixture1] Горючая смесь
 beacon=[item=beacon] AM:FM Маяки
-decay=[item=biocrud] Разложение
+item_decay=[item=biocrud] Разложение
 rawores=Сырые руды
 big-mines=[item=ore-lead] Большие шахты
 

locale/uk/tips.cfg

@@ -10,7 +10,7 @@ mechanical-inserter=[item=burner-inserter] Маніпулятори
 tailings-pond=[item=tailings-pond] Сховище відходів
 combustion-mixture=[fluid=combustion-mixture1] Горюча суміш
 beacon=[item=beacon] AM:FM Маяки
-decay=[item=biocrud] Розпад
+item_decay=[item=biocrud] Розпад
 
 rawores=Сирі руди
 big-mines=[item=ore-lead] Великі бури

prototypes/achievements.lua

@@ -71,8 +71,7 @@ data:extend
         order = "0ac",
         objective_condition = "game-finished",
         icon = "__pycoalprocessinggraphics__/graphics/achievement/smoke-me-a-kipper-i-will-be-back-for-breakfast.png",
-        icon_size = 128,
-        limited_to_one_game = false
+        icon_size = 128
     },
 }
 if mods.pypetroleumhandling then