From 281695d01172491835b80b65d7df06e37b76e1f2 Mon Sep 17 00:00:00 2001
From: KiwiHawk <59639+KiwiHawk@users.noreply.github.com>
Date: Wed, 4 Sep 2024 18:44:55 +1200
Subject: [PATCH] Remove underused items/fluids #334

---
 SeaBlock/changelog.txt         |  1 +
 SeaBlock/data-updates/fuel.lua |  1 -
 SeaBlock/data-updates/misc.lua | 22 ++++++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/SeaBlock/changelog.txt b/SeaBlock/changelog.txt
index aef4853..2dc1cf0 100644
--- a/SeaBlock/changelog.txt
+++ b/SeaBlock/changelog.txt
@@ -18,6 +18,7 @@ Date: ??.??.??
       - Changed catalyst recipes to use the appropriate catalyst for their tech tier
     - Remove underused items/fluids #334
       - Hid crushed stone. Use stone instead. Ratios will all stay the same
+      - Hid liquid fuel. Enriched fuel is now made directly from fuel oil plus residual gas
   Bugfixes:
     - Fixed tech steam-power missing a locale in some mod configurations #332
 ---------------------------------------------------------------------------------------------------
diff --git a/SeaBlock/data-updates/fuel.lua b/SeaBlock/data-updates/fuel.lua
index 9a3c43b..11f7ff9 100644
--- a/SeaBlock/data-updates/fuel.lua
+++ b/SeaBlock/data-updates/fuel.lua
@@ -15,7 +15,6 @@ end
 
 -- petroleum gas/methane has same solid fuel value as naphtha.
 data.raw.fluid["liquid-fuel-oil"].fuel_value = "1MJ"
-data.raw.fluid["liquid-fuel"].fuel_value = "1MJ"
 data.raw.fluid["liquid-naphtha"].fuel_value = "0.5MJ"
 data.raw.fluid["gas-methane"].fuel_value = "0.5MJ"
 data.raw.fluid["crude-oil"].fuel_value = "0.5MJ"
diff --git a/SeaBlock/data-updates/misc.lua b/SeaBlock/data-updates/misc.lua
index 7b85033..fd0718b 100644
--- a/SeaBlock/data-updates/misc.lua
+++ b/SeaBlock/data-updates/misc.lua
@@ -463,6 +463,28 @@ if data.raw.inserter["steam-inserter"] then
   bobmods.lib.recipe.replace_ingredient_in_all("steam-inserter", "burner-inserter")
 end
 
+-- Hide Liquid Fuel
+if data.raw.recipe["enriched-fuel-from-liquid-fuel"] then
+  bobmods.lib.recipe.set_ingredients("enriched-fuel-from-liquid-fuel",
+    {
+      { type = "fluid", name = "liquid-fuel-oil", amount = 80 },
+      { type = "fluid", name = "gas-residual", amount = 20 },
+    }
+  )
+  data.raw.recipe["enriched-fuel-from-liquid-fuel"].icons = angelsmods.functions.create_solid_recipe_icon(
+    { "liquid-fuel-oil", "gas-residual" },
+    "enriched-fuel"
+  )
+end
+bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "empty-liquid-fuel-barrel")
+bobmods.lib.tech.remove_recipe_unlock("fluid-canister-processing", "fill-liquid-fuel-barrel")
+bobmods.lib.tech.remove_recipe_unlock("flammables", "liquid-fuel")
+bobmods.lib.recipe.hide("empty-liquid-fuel-barrel")
+bobmods.lib.recipe.hide("fill-liquid-fuel-barrel")
+bobmods.lib.recipe.hide("liquid-fuel")
+seablock.lib.hide("fluid", "liquid-fuel")
+seablock.lib.hide("item", "liquid-fuel-barrel")
+
 -- Swap out concrete for bricks
 
 if data.raw.recipe["burner-reactor-2"] then