From 224687afe1b8a8b1384f88b00a29540386be93b1 Mon Sep 17 00:00:00 2001 From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com> Date: Thu, 14 Nov 2024 21:16:51 +1100 Subject: [PATCH 1/3] Increase Efficiency of Solid Fuels in Large Boilers --- .../api/capability/impl/BoilerRecipeLogic.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java index 28b2ee7afd0..4e25a081cdd 100644 --- a/src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/BoilerRecipeLogic.java @@ -120,13 +120,13 @@ protected void trySearchNewRecipe() { for (int i = 0; i < importItems.getSlots(); i++) { ItemStack stack = importItems.getStackInSlot(i); int fuelBurnTime = (int) Math.ceil(TileEntityFurnace.getItemBurnTime(stack)); - if (fuelBurnTime / 80 > 0) { // try to ensure this fuel can burn for at least 1 tick + if (fuelBurnTime / 8 > 0) { // try to ensure this fuel can burn for at least 1 tick if (FluidUtil.getFluidHandler(stack) != null) continue; - this.excessFuel += fuelBurnTime % 80; - int excessProgress = this.excessFuel / 80; - this.excessFuel %= 80; + this.excessFuel += fuelBurnTime % 8; + int excessProgress = this.excessFuel / 8; + this.excessFuel %= 8; setMaxProgress(excessProgress + - adjustBurnTimeForThrottle(boiler.boilerType.runtimeBoost(fuelBurnTime / 80))); + adjustBurnTimeForThrottle(boiler.boilerType.runtimeBoost(fuelBurnTime / 8))); stack.shrink(1); didStartRecipe = true; break; From f261c35700cc76fa84a318df901ef1759eaa1d6b Mon Sep 17 00:00:00 2001 From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com> Date: Thu, 14 Nov 2024 21:18:31 +1100 Subject: [PATCH 2/3] Update Tooltips --- .../metatileentities/multi/MetaTileEntityLargeBoiler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java index 6921ca44d5f..4961913e208 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java +++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java @@ -213,7 +213,7 @@ public void addInformation(ItemStack stack, @Nullable World player, @NotNull Lis boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gregtech.multiblock.large_boiler.rate_tooltip", - (int) (boilerType.steamPerTick() * 20 * boilerType.runtimeBoost(20) / 20.0))); + (int) (boilerType.steamPerTick() * 20 * boilerType.runtimeBoost(200) / 20.0))); tooltip.add( I18n.format("gregtech.multiblock.large_boiler.heat_time_tooltip", boilerType.getTicksToBoiling() / 20)); tooltip.add(I18n.format("gregtech.universal.tooltip.base_production_fluid", boilerType.steamPerTick())); From fe855a1ee916cfbb6af72efc2df3209c11f64d35 Mon Sep 17 00:00:00 2001 From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com> Date: Thu, 14 Nov 2024 21:47:40 +1100 Subject: [PATCH 3/3] Format Numbers in Tooltip --- .../metatileentities/multi/MetaTileEntityLargeBoiler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java index 4961913e208..47a596b719b 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java +++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityLargeBoiler.java @@ -213,7 +213,8 @@ public void addInformation(ItemStack stack, @Nullable World player, @NotNull Lis boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(I18n.format("gregtech.multiblock.large_boiler.rate_tooltip", - (int) (boilerType.steamPerTick() * 20 * boilerType.runtimeBoost(200) / 20.0))); + TextFormattingUtil + .formatNumbers((int) (boilerType.steamPerTick() * 20 * boilerType.runtimeBoost(200) / 20.0)))); tooltip.add( I18n.format("gregtech.multiblock.large_boiler.heat_time_tooltip", boilerType.getTicksToBoiling() / 20)); tooltip.add(I18n.format("gregtech.universal.tooltip.base_production_fluid", boilerType.steamPerTick()));