update for 2.1

.github/workflows/upload-dispatch.yml

@@ -0,0 +1,12 @@
+name: Mod Portal Upload
+
+on: workflow_dispatch
+
+permissions:
+  contents: write
+
+jobs:
+  portal-upload:
+    name: "Upload to mod portal"
+    uses: pyanodon/pyanodontests/.github/workflows/portal-upload.yml@v1
+    secrets: inherit

changelog.txt

@@ -1,4 +1,18 @@
 ---------------------------------------------------------------------------------------------------
+Version: 3.1.0
+Date: ???
+  Breaking Changes:
+    - Removed charging ports from construction zone extenders. Resolves https://github.com/pyanodon/pybugreports/issues/791
+  Changes:
+    - Updated to Factorio 2.1
+    - Removed sinkhole flipping adjustment script since mirroring has been improved on the engine side
+    - Removed unnecessary prototype values to clear up the log
+    - Fixed that many buildings did not have certain pipe covers rendered
+    - Reduced most fluidbox sizes from 1000 to 100
+    - Added a mod setting to show item/fluid voiding in production statistics, default on
+    - Added the following entities to be hidden when visibility of tall entities is toggled: 10k, 40k, 50k, and 80k tanks, accumulator mk02, barreling machine
+    - Allowed the advanced locomotive, cargo wagon, and fluid wagon to be used with the upgrade planner to upgrade trains
+---------------------------------------------------------------------------------------------------
 Version: 3.0.21
 Date: ????
   Changes:

control.lua

@@ -1,6 +1,5 @@
 require "__pypostprocessing__.lib"
 
 require "scripts.tank-rotation"
-require "scripts.sinkhole"
 
 py.finalize_events()

data-final-fixes.lua

@@ -17,33 +17,20 @@ if settings.startup["py-braided-pipes"].value then
 
         for _, entity in pairs(data.raw[entity_prototype] or {}) do
             local fluid_boxes = {}
-
             for _, fluid_box in pairs(entity.fluid_boxes or {}) do
                 fluid_boxes[#fluid_boxes + 1] = fluid_box
             end
 
-            if entity.fluid_box then
-                fluid_boxes[#fluid_boxes + 1] = entity.fluid_box
-            end
-
-            if entity.input_fluid_box then
-                fluid_boxes[#fluid_boxes + 1] = entity.input_fluid_box
-            end
-
-            if entity.output_fluid_box then
-                fluid_boxes[#fluid_boxes + 1] = entity.output_fluid_box
-            end
-
-            if entity.fuel_fluid_box then
-                fluid_boxes[#fluid_boxes + 1] = entity.fuel_fluid_box
-            end
-
-            if entity.oxidizer_fluid_box then
-                fluid_boxes[#fluid_boxes + 1] = entity.oxidizer_fluid_box
-            end
+            -- add generically, if they're nil this does nothing
+            fluid_boxes[#fluid_boxes + 1] = entity.fluid_box
+            fluid_boxes[#fluid_boxes + 1] = entity.input_fluid_box
+            fluid_boxes[#fluid_boxes + 1] = entity.output_fluid_box
+            fluid_boxes[#fluid_boxes + 1] = entity.fuel_fluid_box
+            fluid_boxes[#fluid_boxes + 1] = entity.oxidizer_fluid_box
 
             if entity.energy_source and entity.energy_source.type == "fluid" then
                 fluid_boxes[#fluid_boxes + 1] = entity.energy_source.fluid_box
+                fluid_boxes[#fluid_boxes + 1] = entity.energy_source.output_fluid_box
             end
 
             for _, fluid_box in pairs(fluid_boxes) do

data-updates.lua

@@ -1,78 +1,78 @@
-if settings.startup["py-tank-adjust"].value then
-    if mods["pypetroleumhandling"] then
-        data.raw["storage-tank"]["py-tank-9000"].fluid_box.volume = 180000
-        data.raw["storage-tank"]["py-tank-9000"].localised_name = {"entity-name.py-tank-9000-adjust"}
-        data.raw["storage-tank"]["py-tank-10000"].fluid_box.volume = 250000
-        data.raw["storage-tank"]["py-tank-10000"].localised_name = {"entity-name.py-tank-10000-adjust"}
-    end
-end
-
---Tiles
-require "prototypes/tiles/py-asphalt"
-require "prototypes/tiles/py-limestone"
-require "prototypes/tiles/py-coal-tile"
-require "prototypes/tiles/py-iron"
-require "prototypes/tiles/py-steel"
-require "prototypes/tiles/py-aluminium"
-
-if mods.pyalternativeenergy then
-    require "prototypes/tiles/py-quartz"
-    require "prototypes/tiles/multicolored-concrete"
-end
-
-require "prototypes/updates/base-updates"
-
-if mods["pycoalprocessing"] then
-    require "prototypes/updates/pycoalprocessing-updates"
-    require "prototypes/tiles/py-iron-oxide"
-    require "prototypes/tiles/py-nexelit"
-end
-
-if mods["pyfusionenergy"] then
-    require "prototypes/updates/pyfusionenergy-updates"
-end
-
-if mods["pyrawores"] then
-    require "prototypes/updates/pyrawores-updates"
-end
-
-if mods["pyalternativeenergy"] then
-    require "prototypes/updates/pyalternativeenergy-updates"
-end
-
-if mods.pyrawores then
-    RECIPE("accumulator-mk02"):replace_ingredient("copper-cable", "tinned-cable"):replace_ingredient("iron-plate", "stainless-steel")
-end
-
-for f, _ in pairs(data.raw.fluid) do
-    for i, recipe_name in pairs {
-        "empty-" .. f .. "-canister",
-        "empty-" .. f .. "-barrel",
-        "fill-" .. f .. "-canister",
-        f .. "-barrel"
-    } do
-        local recipe = data.raw.recipe[recipe_name] and RECIPE(recipe_name)
-        if recipe ~= nil then
-            recipe:set_fields {hide_from_player_crafting = true, hide_from_stats = true}
-            -- This is backwards, I blame king
-            if recipe_name:match("^empty") then
-                recipe.category = "py-barreling"
-            else
-                recipe.category = "py-unbarreling"
-            end
-        end
-    end
-end
-
-if mods["valves"] then
-    data.raw.valve["valves-top_up"].next_upgrade = "py-underflow-valve"
-    data.raw.valve["valves-top_up"].collision_box = data.raw.valve["py-underflow-valve"].collision_box
-    data.raw.valve["valves-overflow"].next_upgrade = "py-overflow-valve"
-    data.raw.valve["valves-overflow"].collision_box = data.raw.valve["py-overflow-valve"].collision_box
-end
-
-if register_cache_file ~= nil then
-    register_cache_file({"pyindustry"}, "__pyindustry__/cached-configs/pyindustry.lua")
-    register_cache_file({"pycoalprocessing", "pyindustry"}, "__pyindustry__/cached-configs/pycoalprocessing+pyindustry.lua")
-    register_cache_file({"pycoalprocessing", "pyfusionenergy", "pyindustry"}, "__pyindustry__/cached-configs/pycoalprocessing+pyfusionenergy+pyindustry.lua")
-end
+if settings.startup["py-tank-adjust"].value then
+    if mods["pypetroleumhandling"] then
+        data.raw["storage-tank"]["py-tank-9000"].fluid_box.volume = 180000
+        data.raw["storage-tank"]["py-tank-9000"].localised_name = {"entity-name.py-tank-9000-adjust"}
+        data.raw["storage-tank"]["py-tank-10000"].fluid_box.volume = 250000
+        data.raw["storage-tank"]["py-tank-10000"].localised_name = {"entity-name.py-tank-10000-adjust"}
+    end
+end
+
+--Tiles
+require "prototypes/tiles/py-asphalt"
+require "prototypes/tiles/py-limestone"
+require "prototypes/tiles/py-coal-tile"
+require "prototypes/tiles/py-iron"
+require "prototypes/tiles/py-steel"
+require "prototypes/tiles/py-aluminium"
+
+if mods.pyalternativeenergy then
+    require "prototypes/tiles/py-quartz"
+    require "prototypes/tiles/multicolored-concrete"
+end
+
+require "prototypes/updates/base-updates"
+
+if mods["pycoalprocessing"] then
+    require "prototypes/updates/pycoalprocessing-updates"
+    require "prototypes/tiles/py-iron-oxide"
+    require "prototypes/tiles/py-nexelit"
+end
+
+if mods["pyfusionenergy"] then
+    require "prototypes/updates/pyfusionenergy-updates"
+end
+
+if mods["pyrawores"] then
+    require "prototypes/updates/pyrawores-updates"
+end
+
+if mods["pyalternativeenergy"] then
+    require "prototypes/updates/pyalternativeenergy-updates"
+end
+
+if mods.pyrawores then
+    RECIPE("accumulator-mk02"):replace_ingredient("copper-cable", "tinned-cable"):replace_ingredient("iron-plate", "stainless-steel")
+end
+
+for f, _ in pairs(data.raw.fluid) do
+    for i, recipe_name in pairs {
+        "empty-" .. f .. "-canister",
+        "empty-" .. f .. "-barrel",
+        "fill-" .. f .. "-canister",
+        f .. "-barrel"
+    } do
+        local recipe = data.raw.recipe[recipe_name] and RECIPE(recipe_name)
+        if recipe ~= nil then
+            recipe:set_fields {hide_from_player_crafting = true, hide_from_stats = true}
+            -- This is backwards, I blame king
+            if recipe_name:match("^empty") then
+                recipe.categories = {"py-barreling"}
+            else
+                recipe.categories = {"py-unbarreling"}
+            end
+        end
+    end
+end
+
+if mods["valves"] then
+    data.raw.valve["valves-top_up"].next_upgrade = "py-underflow-valve"
+    data.raw.valve["valves-top_up"].collision_box = data.raw.valve["py-underflow-valve"].collision_box
+    data.raw.valve["valves-overflow"].next_upgrade = "py-overflow-valve"
+    data.raw.valve["valves-overflow"].collision_box = data.raw.valve["py-overflow-valve"].collision_box
+end
+
+if register_cache_file ~= nil then
+    register_cache_file({"pyindustry"}, "__pyindustry__/cached-configs/pyindustry.lua")
+    register_cache_file({"pycoalprocessing", "pyindustry"}, "__pyindustry__/cached-configs/pycoalprocessing+pyindustry.lua")
+    register_cache_file({"pycoalprocessing", "pyfusionenergy", "pyindustry"}, "__pyindustry__/cached-configs/pycoalprocessing+pyfusionenergy+pyindustry.lua")
+end

info.json

@@ -1,30 +1,30 @@
-{
-    "name": "pyindustry",
-    "version": "3.0.21",
-    "factorio_version": "2.0",
-    "title": "Pyanodons Industry",
-    "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, przemo1232",
-    "contact": "https://discord.gg/SBHM3h5Utj",
-    "homepage": "https://github.com/pyanodon/pyindustry",
-    "description": "Control the means of production with new logistic and storage structures. Works either as a standalone mod or alongside the rest of the pY modpack.",
-    "dependencies": [
-        "base >= 2.0.48",
-        "~ pypostprocessing >= 3.0.35",
-        "~ pyindustrygraphics >= 3.0.0",
-        "? pycoalprocessing >= 1.0.6",
-        "? pyfusionenergy >= 1.0.3",
-        "! wret-beacon-rebalance-mod",
-        "! BigBags",
-        "! ResearchFog",
-        "! omnimatter_energy"
-    ],
-    "package": {
-        "ignore": [],
-        "scripts": {}
-    },
-    "quality_required": false,
-    "space_travel_required": false,
-    "spoiling_required": false,
-    "freezing_required": false,
-    "segmented_units_required": false
-}
+{
+    "name": "pyindustry",
+    "version": "3.1.0",
+    "factorio_version": "2.1",
+    "title": "Pyanodons Industry",
+    "author": "Pyanodon, Nexela, Kingarthur, notnotmelon, Mootykins, ShadowGlass, Archezekiel, Quintuple, przemo1232, protocol_1903",
+    "contact": "https://discord.gg/SBHM3h5Utj",
+    "homepage": "https://github.com/pyanodon/pyindustry",
+    "description": "Control the means of production with new logistic and storage structures. Works either as a standalone mod or alongside the rest of the pY modpack.",
+    "dependencies": [
+        "base >= 2.1.0",
+        "~ pypostprocessing >= 3.1.0",
+        "~ pyindustrygraphics >= 3.1.0",
+        "? pycoalprocessing >= 3.1.0",
+        "? pyfusionenergy >= 3.1.0",
+        "! wret-beacon-rebalance-mod",
+        "! BigBags",
+        "! ResearchFog",
+        "! omnimatter_energy"
+    ],
+    "package": {
+        "ignore": [],
+        "scripts": {}
+    },
+    "quality_required": false,
+    "space_travel_required": false,
+    "spoiling_required": false,
+    "freezing_required": false,
+    "segmented_units_required": false
+}

locale/en/locale.cfg

@@ -214,10 +214,12 @@ poorman-wood-fence=Poor man's wooden fence
 [mod-setting-name]
 py-tank-adjust=Adjust Pymods' storage tanks capacity
 py-braided-pipes=Enable braided pipes
+py-show-voiding-in-stats=Show voiding in production statistics
 
 [mod-setting-description]
 py-tank-adjust=Makes tank capacity consistent with their physical size
 py-braided-pipes=This setting makes vanilla pipes, niobium pipes, and multipurpose pipes not connect with each other. It also makes their underground versions not connect with each other, allowing for underground pipe braiding.
+py-show-voiding-in-stats=Shows item/fluid voiding in production statistics. Note this is not retroactive, turning it on after the fact will not reflect voided materials and turning it off will not hide materials voided.
 
 [recipe-name]
 py-void=Void __1__