Holistic Rebalance to the Large and Small Boiler (#4075)

Co-authored-by: screret <68943070+screret@users.noreply.github.com>

Author: Ghostipedia

src/main/java/com/gregtechceu/gtceu/common/data/GTRecipeTypes.java

@@ -66,8 +66,8 @@ public class GTRecipeTypes {
             .setMaxIOSize(1, 0, 1, 1)
             .setProgressBar(GuiTextures.PROGRESS_BAR_BOILER_FUEL.get(true), DOWN_TO_UP)
             .onRecipeBuild((builder, provider) -> {
-                // remove the * 12 if SteamBoilerMachine:240 is uncommented
-                var duration = (builder.duration / 12 / 80); // copied for large boiler
+                // all LBB recipes' duration is 1/4 the small boiler recipe's duration
+                int duration = builder.duration / 4;
                 if (duration > 0) {
                     GTRecipeTypes.LARGE_BOILER_RECIPES.copyFrom(builder).duration(duration).save(provider);
                 }

src/main/java/com/gregtechceu/gtceu/data/recipe/misc/FuelRecipes.java

@@ -6,12 +6,14 @@
 
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.data.recipes.FinishedRecipe;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.entity.FurnaceBlockEntity;
 import net.minecraft.world.level.material.Fluids;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidUtil;
 
 import java.util.HashSet;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
 
@@ -21,73 +23,88 @@
 
 public class FuelRecipes {
 
+    public static void addBoilerFuel(Consumer<FinishedRecipe> provider, Set<Item> added,
+                                     Item item, int burnTime) {
+        if (added.contains(item) || burnTime <= 0) {
+            return;
+        }
+        added.add(item);
+
+        Optional<FluidStack> containedFluid = FluidUtil.getFluidContained(item.getDefaultInstance());
+        if (containedFluid.isEmpty()) {
+            ResourceLocation id = BuiltInRegistries.ITEM.getKey(item);
+            STEAM_BOILER_RECIPES.recipeBuilder(GTCEu.id(id.getNamespace() + "_" + id.getPath()))
+                    .inputItems(item)
+                    .duration(burnTime)
+                    .save(provider);
+        } else {
+            FluidStack fluid = new FluidStack(containedFluid.get(), 250);
+            ResourceLocation id = BuiltInRegistries.FLUID.getKey(fluid.getFluid());
+
+            // the lava recipe's duration is 4/9 of the bucket's burn time
+            // the creosote recipe's duration is 7/32 of the bucket's burn time
+            // as such, the mean ratio is 191/576, or approximately 1/3.
+            STEAM_BOILER_RECIPES.recipeBuilder(id.getNamespace() + "_" + id.getPath())
+                    .inputFluids(fluid)
+                    .duration(burnTime / 3)
+                    .save(provider);
+        }
+    }
+
     public static void init(Consumer<FinishedRecipe> provider) {
         // TODO this all needs to be cleaned up, but this will make it somewhat work for now
         // do these first because for some reason vanilla fuels are not set up yet at this phase?
         Set<Item> addedItems = new HashSet<>();
-        for (var fuelEntry : FurnaceBlockEntity.getFuel().entrySet()) {
-            addedItems.add(fuelEntry.getKey());
-            var resLoc = BuiltInRegistries.ITEM.getKey(fuelEntry.getKey());
-            STEAM_BOILER_RECIPES.recipeBuilder(GTCEu.id(resLoc.getNamespace() + "_" + resLoc.getPath()))
-                    .inputItems(fuelEntry.getKey())
-                    .duration(fuelEntry.getValue() * 12) // remove the * 12 if SteamBoilerMachine:240 is uncommented
-                    .save(provider);
-        }
         for (Item item : BuiltInRegistries.ITEM) {
-            var burnTime = GTUtil.getItemBurnTime(item);
-            if (burnTime > 0 && !addedItems.contains(item)) {
-                var resLoc = BuiltInRegistries.ITEM.getKey(item);
-                STEAM_BOILER_RECIPES.recipeBuilder(GTCEu.id(resLoc.getNamespace() + "_" + resLoc.getPath()))
-                        .inputItems(item)
-                        .duration(burnTime * 12)
-                        .save(provider);
-            }
+            int burnTime = GTUtil.getItemBurnTime(item);
+            addBoilerFuel(provider, addedItems, item, burnTime);
         }
 
-        STEAM_BOILER_RECIPES.recipeBuilder("lava")
+        // override the default fluid recipes for lava and creosote
+        STEAM_BOILER_RECIPES.recipeBuilder("minecraft_lava")
                 .inputFluids(new FluidStack(Fluids.LAVA, 100))
-                .duration(100 * 12)
+                .duration(900) // 60s -> 45s Might still be too good with drip stone farming.
                 .save(provider);
 
-        STEAM_BOILER_RECIPES.recipeBuilder("creosote")
+        STEAM_BOILER_RECIPES.recipeBuilder("gtceu_creosote")
                 .inputFluids(Creosote.getFluid(250))
-                .duration(250 * 12)
+                .duration(350) // 150s -> 17.5s
                 .save(provider);
 
-        // semi-fluid fuels, like creosote
-        LARGE_BOILER_RECIPES.recipeBuilder("creosote")
-                .inputFluids(Creosote.getFluid(160))
-                .duration(10)
+        // semi-fluid fuels, like creosote - these are awful and need to be scrutinized heavily...
+        LARGE_BOILER_RECIPES.recipeBuilder("gtceu_creosote")
+                .inputFluids(Creosote.getFluid(250))
+                .duration(35)
                 .save(provider);
 
-        LARGE_BOILER_RECIPES.recipeBuilder("biomass")
+        LARGE_BOILER_RECIPES.recipeBuilder("gtceu_biomass")
                 .inputFluids(Biomass.getFluid(40))
-                .duration(10)
+                .duration(85)
                 .save(provider);
 
-        LARGE_BOILER_RECIPES.recipeBuilder("oil")
+        LARGE_BOILER_RECIPES.recipeBuilder("gtceu_oil")
                 .inputFluids(Oil.getFluid(200))
-                .duration(10)
+                .duration(50)
                 .save(provider);
 
-        LARGE_BOILER_RECIPES.recipeBuilder("oil_heavy")
+        LARGE_BOILER_RECIPES.recipeBuilder("gtceu_oil_heavy")
                 .inputFluids(OilHeavy.getFluid(32))
-                .duration(10)
+                .duration(50)
                 .save(provider);
 
-        LARGE_BOILER_RECIPES.recipeBuilder("sulfuric_heavy_fuel")
+        LARGE_BOILER_RECIPES.recipeBuilder("gtceu_sulfuric_heavy_fuel")
                 .inputFluids(SulfuricHeavyFuel.getFluid(32))
-                .duration(10)
+                .duration(50)
                 .save(provider);
 
-        LARGE_BOILER_RECIPES.recipeBuilder("heavy_fuel")
+        LARGE_BOILER_RECIPES.recipeBuilder("gtceu_heavy_fuel")
                 .inputFluids(HeavyFuel.getFluid(16))
-                .duration(30)
+                .duration(90)
                 .save(provider);
 
-        LARGE_BOILER_RECIPES.recipeBuilder("fish_oil")
+        LARGE_BOILER_RECIPES.recipeBuilder("gtceu_fish_oil")
                 .inputFluids(FishOil.getFluid(160))
-                .duration(10)
+                .duration(50)
                 .save(provider);
 
         // diesel generator fuels

src/main/java/com/gregtechceu/gtceu/utils/GTUtil.java

@@ -33,7 +33,6 @@
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.crafting.RecipeType;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Block;
@@ -372,7 +371,7 @@ public static boolean isItemStackCountDivisible(ItemStack itemStack, int divisor
     }
 
     public static int getItemBurnTime(Item item) {
-        return ForgeHooks.getBurnTime(item.getDefaultInstance(), RecipeType.SMELTING);
+        return ForgeHooks.getBurnTime(item.getDefaultInstance(), null);
     }
 
     public static int getPumpBiomeModifier(Holder<Biome> biome) {