From 657f626a121d138166fceed204d35ebc2bc8ae0d Mon Sep 17 00:00:00 2001
From: Pyritie <pyritie@gmail.com>
Date: Fri, 28 Nov 2025 10:35:29 +0000
Subject: [PATCH] add raw and light oil to blaze burners, add them both +
 cooking oils to gt boilers

---
 CHANGELOG.md                                  |  3 +-
 .../blaze_burner_fuel/light_oil.json          |  6 +++
 .../blaze_burner_fuel/raw_oil.json            |  6 +++
 kubejs/server_scripts/gregtech/recipes.js     | 39 +++++++++++++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 kubejs/data/create_liquid_fuel/blaze_burner_fuel/light_oil.json
 create mode 100644 kubejs/data/create_liquid_fuel/blaze_burner_fuel/raw_oil.json

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73cb3950a..5d808d962 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,7 +17,8 @@ Added TFC Gurman, which adds even more food and drink
 - Cleanrooms now allow 9 door "blocks", so you can use a 3x3 Ad Astra door (#2074) @ko-lja
 - Added recycling for astikor carts (#2227) @Pyritie
 - Moved Soph Backpack pickup to ULV, adv pickup to MV and magnet to MV @CrashAndSideburns
-- Oilsands dust can now be centrifuged in the mechanical centrifuge, and oil can now be used to fuel small boilers as well @Pyritie
+- Oilsands dust can now be centrifuged in the mechanical centrifuge @Pyritie
+- All oils (both the petrochem kind and the cooking kind) can now be used to fuel small boilers as well @Pyritie
 ### Bug fixes
 - Fixed brown gravy recipe @Redeix
 - Fixed instant mac recipe requiring less cardboard than it gives back @Redeix
diff --git a/kubejs/data/create_liquid_fuel/blaze_burner_fuel/light_oil.json b/kubejs/data/create_liquid_fuel/blaze_burner_fuel/light_oil.json
new file mode 100644
index 000000000..6956a6e5f
--- /dev/null
+++ b/kubejs/data/create_liquid_fuel/blaze_burner_fuel/light_oil.json
@@ -0,0 +1,6 @@
+{
+  "fluid": "gtceu:light_oil",
+  "burnTime": 50,
+  "superHeat": false,
+  "amountConsumedPerTick" : 32
+}
diff --git a/kubejs/data/create_liquid_fuel/blaze_burner_fuel/raw_oil.json b/kubejs/data/create_liquid_fuel/blaze_burner_fuel/raw_oil.json
new file mode 100644
index 000000000..8ba4d1621
--- /dev/null
+++ b/kubejs/data/create_liquid_fuel/blaze_burner_fuel/raw_oil.json
@@ -0,0 +1,6 @@
+{
+  "fluid": "gtceu:raw_oil",
+  "burnTime": 50,
+  "superHeat": false,
+  "amountConsumedPerTick" : 32
+}
diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js
index 768053040..14f38307d 100644
--- a/kubejs/server_scripts/gregtech/recipes.js
+++ b/kubejs/server_scripts/gregtech/recipes.js
@@ -1841,9 +1841,48 @@ const registerGTCEURecipes = (event) => {
 	// Allow oil in small boilers
 
 	event.remove({ id: "gtceu:large_boiler/gtceu_oil" })
+	event.remove({ id: "gtceu:large_boiler/gtceu_oil_heavy" })
+	event.remove({ id: "gtceu:large_boiler/gtceu_fish_oil" })
 	// This generates both a small boiler and large boiler recipe. Remove it above to avoid a duplicate
 	event.recipes.gtceu.steam_boiler('tfg:oil')
 		.inputFluids(Fluid.of('gtceu:oil', 200))
 		.duration(200)
 		.dimension('minecraft:overworld')
+
+	event.recipes.gtceu.steam_boiler('tfg:heavy_oil')
+		.inputFluids(Fluid.of('gtceu:oil_heavy', 32))
+		.duration(200)
+		.dimension('minecraft:overworld')
+
+	event.recipes.gtceu.steam_boiler('tfg:fish_oil')
+		.inputFluids(Fluid.of('gtceu:fish_oil', 160))
+		.duration(200)
+		.dimension('minecraft:overworld')
+
+	// These aren't in base GT, but they have the same stats as oil
+	event.recipes.gtceu.steam_boiler('tfg:raw_oil')
+		.inputFluids(Fluid.of('gtceu:oil_medium', 200))
+		.duration(200)
+		.dimension('minecraft:overworld')
+
+	event.recipes.gtceu.steam_boiler('tfg:light_oil')
+		.inputFluids(Fluid.of('gtceu:oil_light', 200))
+		.duration(200)
+		.dimension('minecraft:overworld')
+
+	// Same stats as fish oil
+	event.recipes.gtceu.steam_boiler('tfg:olive_oil')
+		.inputFluids(Fluid.of('tfc:olive_oil', 160))
+		.duration(200)
+		.dimension('minecraft:overworld')
+
+	event.recipes.gtceu.steam_boiler('tfg:seed_oil')
+		.inputFluids(Fluid.of('gtceu:seed_oil', 160))
+		.duration(200)
+		.dimension('minecraft:overworld')
+
+	event.recipes.gtceu.steam_boiler('tfg:soybean_oil')
+		.inputFluids(Fluid.of('firmalife:soybean_oil', 160))
+		.duration(200)
+		.dimension('minecraft:overworld')
 }