Skip to content

Port Yuoki Engines 1.3.0 to Factorio 2.1 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jatmn merged 2 commits into from
Oct 8, 2026
Merged

Port Yuoki Engines 1.3.0 to Factorio 2.1 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9013c84
Port Engines 1.3.0 startup to Factorio 2.1
jatmn Oct 5, 2026
dd13f42
Migrate generator animations to Factorio 2.1 pictures
jatmn Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
---------------------------------------------------------------------------------------------------
Version: 1.3.0
Date: 5. 10. 2026
Compatibility:
- Port startup to Factorio 2.1, requiring Yuoki 1.3.0.
- Update assembler pictures, module inventories, fuel and recipe categories, and factory crafting categories.
- Preserve 1000-degree steam support for the existing Rheinsberg and turbine recipes.
- Migrate the 50 MW generator and 70 MW turbine animations to the Factorio 2.1 picture format.
---------------------------------------------------------------------------------------------------
Version: 1.2.9
Date: 9. 11. 2025
Space Age:
Expand Down
3 changes: 3 additions & 0 deletions data.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
require("util")

-- Preserve the existing high-temperature steam production and turbine recipes.
data.raw.fluid.steam.max_temperature = math.max(data.raw.fluid.steam.max_temperature, 1000)

-- autogenerated code-files
require("prototypes.z_groups")
require("prototypes.z_items")
Expand Down
12 changes: 6 additions & 6 deletions info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@

{
"name": "yi_engines",
"version": "1.2.9",
"date": "2025-11-9",
"version": "1.3.0",
"date": "2026-10-05",
"author": "YuokiTani",
"contact": "https://discord.gg/fM6NjWabAA",
"homepage": "https://github.com/jatmn/Yuoki-Engines-Factorio-2.0",
"factorio_version": "2.0",
"factorio_version": "2.1",
"dependencies": [
"base >= 2.0.42",
"Yuoki >= 1.2.17",
"? space-age",
"base >= 2.1.20",
"Yuoki >= 1.3.0",
"? space-age >= 2.1.20",
"! Yuoki_F2"
],
"title": "Yuoki Industries - Engines (Addon)",
Expand Down
65 changes: 12 additions & 53 deletions prototypes/e_assemblys.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
local assembler_pictures = require("__base__/prototypes/entity/assembler-pictures")

local j_factories = settings.startup["j_factories_behaviour"].value
local ye_fassembly1_module_slots = 3
local ye_fassembly2_module_slots = 3
Expand Down Expand Up @@ -32,51 +34,8 @@ local ye_fassembly2_crafting_categories = { "crafting", "advanced-crafting", "cr
local ye_fassembly_sp_crafting_categories = { "crafting", "advanced-crafting", "crafting-with-fluid" }

if mods["space-age"] then
ye_fassembly1_crafting_categories = {
"basic-crafting",
"crafting",
"advanced-crafting",
"crafting-with-fluid",
"electronics",
"electronics-with-fluid",
"pressing",
"metallurgy-or-assembling",
"organic-or-hand-crafting",
"organic-or-assembling",
"electronics-or-assembling",
"cryogenics-or-assembling",
"crafting-with-fluid-or-metallurgy",
}
ye_fassembly2_crafting_categories = {
"basic-crafting",
"crafting",
"advanced-crafting",
"crafting-with-fluid",
"electronics",
"electronics-with-fluid",
"pressing",
"metallurgy-or-assembling",
"organic-or-hand-crafting",
"organic-or-assembling",
"electronics-or-assembling",
"cryogenics-or-assembling",
"crafting-with-fluid-or-metallurgy",
}
ye_fassembly_sp_crafting_categories = {
"basic-crafting",
"crafting",
"advanced-crafting",
"crafting-with-fluid",
"electronics",
"electronics-with-fluid",
"pressing",
"metallurgy-or-assembling",
"organic-or-hand-crafting",
"organic-or-assembling",
"electronics-or-assembling",
"cryogenics-or-assembling",
"crafting-with-fluid-or-metallurgy",
}
-- Space Age recipes now list standard and specialist categories separately.
ye_fassembly1_crafting_categories = { "crafting", "advanced-crafting", "crafting-with-fluid" }
end

-- Lets make sure C1 Factory is next replace after Assembling Machine 3
Expand All @@ -101,7 +60,7 @@ data:extend({
fluid_boxes = {
{
production_type = "input",
pipe_picture = assembler2pipepictures(),
pipe_picture = util.table.deepcopy(assembler_pictures.assembler2pipepictures),
pipe_covers = pipecoverspictures(),
volume = 1000,
pipe_connections = {
Expand All @@ -111,7 +70,7 @@ data:extend({
},
{
production_type = "output",
pipe_picture = assembler2pipepictures(),
pipe_picture = util.table.deepcopy(assembler_pictures.assembler2pipepictures),
pipe_covers = pipecoverspictures(),
volume = 1000,
pipe_connections = {
Expand Down Expand Up @@ -149,7 +108,7 @@ data:extend({
ingredient_count = 6,
module_slots = ye_fassembly1_module_slots,
icons_positioning = {
{ inventory_index = defines.inventory.assembling_machine_modules, max_icons_per_row = 5, scale = 0.5 },
{ inventory_index = defines.inventory.crafter_modules, max_icons_per_row = 5, scale = 0.5 },
},
allowed_effects = { "consumption", "speed", "productivity", "pollution" },

Expand Down Expand Up @@ -177,7 +136,7 @@ data:extend({
{
volume = 200,
production_type = "input",
pipe_picture = assembler2pipepictures(),
pipe_picture = util.table.deepcopy(assembler_pictures.assembler2pipepictures),
pipe_covers = pipecoverspictures(),
base_area = 5,
base_level = -1,
Expand All @@ -187,7 +146,7 @@ data:extend({
},
{
volume = 200,
pipe_picture = assembler2pipepictures(),
pipe_picture = util.table.deepcopy(assembler_pictures.assembler2pipepictures),
pipe_covers = pipecoverspictures(),
production_type = "output",
base_area = 5,
Expand Down Expand Up @@ -226,7 +185,7 @@ data:extend({
ingredient_count = 6,
module_slots = ye_fassembly2_module_slots,
icons_positioning = {
{ inventory_index = defines.inventory.assembling_machine_modules, max_icons_per_row = 5, scale = 0.5 },
{ inventory_index = defines.inventory.crafter_modules, max_icons_per_row = 5, scale = 0.5 },
},
allowed_effects = { "consumption", "speed", "productivity", "pollution" },

Expand All @@ -252,7 +211,7 @@ data:extend({

{
volume = 200,
pipe_picture = assembler2pipepictures(),
pipe_picture = util.table.deepcopy(assembler_pictures.assembler2pipepictures),
pipe_covers = pipecoverspictures(),
production_type = "input",
base_area = 5,
Expand Down Expand Up @@ -290,7 +249,7 @@ data:extend({
ingredient_count = 6,
module_slots = ye_fassembly_sp_module_slots,
icons_positioning = {
{ inventory_index = defines.inventory.assembling_machine_modules, max_icons_per_row = 5, scale = 0.5 },
{ inventory_index = defines.inventory.crafter_modules, max_icons_per_row = 5, scale = 0.5 },
},

allowed_effects = { "consumption", "speed", "productivity", "pollution" },
Expand Down
80 changes: 47 additions & 33 deletions prototypes/e_mf-trans.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,22 +283,29 @@ data:extend({
type = "electric",
usage_priority = "secondary-output",
},
horizontal_animation = {
filename = "__yi_engines__/graphics/entity/energy2/hngen_v.png",
width = 288,
height = 288,
frame_count = 1,
line_length = 1,
shift = { 1.00, -0.75 },
},
vertical_animation = {
filename = "__yi_engines__/graphics/entity/energy2/hgen_o_sheet.png",
width = 288,
height = 288,
frame_count = 36,
line_length = 6,
animation_speed = 1.0,
shift = { 1.00, -0.75 },
two_direction_only = true,
pictures = {
north = {
animation = {
filename = "__yi_engines__/graphics/entity/energy2/hgen_o_sheet.png",
width = 288,
height = 288,
frame_count = 36,
line_length = 6,
animation_speed = 1.0,
shift = { 1.00, -0.75 },
},
},
east = {
animation = {
filename = "__yi_engines__/graphics/entity/energy2/hngen_v.png",
width = 288,
height = 288,
frame_count = 1,
line_length = 1,
shift = { 1.00, -0.75 },
},
},
},
},

Expand Down Expand Up @@ -336,23 +343,30 @@ data:extend({
type = "electric",
usage_priority = "secondary-output",
},
horizontal_animation = {
filename = "__yi_engines__/graphics/entity/turbine_70_sheet.png",
width = 288,
height = 288,
frame_count = 6,
line_length = 6,
animation_speed = 0.5,
shift = { 1.00, 0 },
},
vertical_animation = {
filename = "__yi_engines__/graphics/entity/turbine_70_sheet.png",
width = 288,
height = 288,
frame_count = 6,
line_length = 6,
animation_speed = 0.5,
shift = { 1.00, 0 },
two_direction_only = true,
pictures = {
north = {
animation = {
filename = "__yi_engines__/graphics/entity/turbine_70_sheet.png",
width = 288,
height = 288,
frame_count = 6,
line_length = 6,
animation_speed = 0.5,
shift = { 1.00, 0 },
},
},
east = {
animation = {
filename = "__yi_engines__/graphics/entity/turbine_70_sheet.png",
width = 288,
height = 288,
frame_count = 6,
line_length = 6,
animation_speed = 0.5,
shift = { 1.00, 0 },
},
},
},
},
})
6 changes: 3 additions & 3 deletions prototypes/e_rheinsberg.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ data:extend({
{
type = "recipe",
name = "ye_rheins_HT",
category = "yrcat_rheinsberg", -- rheinsberg
categories = { "yrcat_rheinsberg" }, -- rheinsberg
enabled = true,
energy_required = 1.00,
ingredients = {
Expand All @@ -109,7 +109,7 @@ data:extend({
{
type = "recipe",
name = "ye_rheins_MT",
category = "yrcat_rheinsberg", -- rheinsberg
categories = { "yrcat_rheinsberg" }, -- rheinsberg
enabled = true,
energy_required = 1.00,
ingredients = {
Expand All @@ -128,7 +128,7 @@ data:extend({
{
type = "recipe",
name = "ye_rheins_LT",
category = "yrcat_rheinsberg", -- rheinsberg
categories = { "yrcat_rheinsberg" }, -- rheinsberg
enabled = true,
energy_required = 1.00,
ingredients = {
Expand Down
6 changes: 3 additions & 3 deletions prototypes/integration/space-age/e_transport_tube.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ if mods["space-age"] then
{ type = "item", name = "ye_tranport_tube_orange", amount = 2.0 },
{ type = "item", name = "tungsten-plate", amount = 3.0 },
}
data.raw["recipe"]["ye_tranport_tube_green"].category = "metallurgy"
data.raw["recipe"]["ye_tranport_tube_green"].categories = { "metallurgy" }

data.raw["recipe"]["ye_tranport_tube_green_underground"].ingredients = {
{ type = "item", name = "ye_tranport_tube_orange_underground", amount = 2.0 },
{ type = "item", name = "y-iron-case", amount = 4.0 },
{ type = "item", name = "tungsten-plate", amount = 4.0 },
}
data.raw["recipe"]["ye_tranport_tube_green_underground"].category = "metallurgy"
data.raw["recipe"]["ye_tranport_tube_green_underground"].categories = { "metallurgy" }

data.raw["recipe"]["ye_tranport_tube_green_splitter"].category = "metallurgy"
data.raw["recipe"]["ye_tranport_tube_green_splitter"].categories = { "metallurgy" }

data.raw["recipe"]["ye_tranport_tube_green_splitter"].ingredients = {
{ type = "item", name = "ye_tranport_tube_orange_splitter", amount = 1.0 },
Expand Down
Loading