Make large boilers lose temperature when redstone-disabled and improve GUI fuel display (#1080)

Author: Technici4n

src/main/java/aztech/modern_industrialization/machines/blockentities/BoilerMachineBlockEntity.java

@@ -117,7 +117,7 @@ public void tick() {
             return;
 
         steamHeater.tick(Collections.singletonList(inventory.getFluidStacks().get(0)), Collections.singletonList(inventory.getFluidStacks().get(1)));
-        fuelBurning.tick(Collections.singletonList(inventory.getItemStacks().get(0)), Collections.emptyList());
+        fuelBurning.tick(Collections.singletonList(inventory.getItemStacks().get(0)), Collections.emptyList(), true);
 
         for (Direction direction : Direction.values()) {
             getInventory().autoExtractFluids(level, worldPosition, direction);

src/main/java/aztech/modern_industrialization/machines/blockentities/multiblocks/SteamBoilerMultiblockBlockEntity.java

@@ -110,14 +110,16 @@ public void tick() {
             if (shapeValid.shapeValid) {
                 if (redstoneControl.doAllowNormalOperation(this)) {
                     steamHeater.tick(inventory.getFluidInputs(), inventory.getFluidOutputs());
-                    fuelBurning.tick(inventory.getItemInputs(), inventory.getFluidInputs());
+                    fuelBurning.tick(inventory.getItemInputs(), inventory.getFluidInputs(), true);
                     this.isActiveComponent.updateActive(fuelBurning.isBurning(), this);
                 } else {
+                    steamHeater.tickDisabled();
+                    fuelBurning.tick(inventory.getItemInputs(), inventory.getFluidInputs(), false);
                     this.isActiveComponent.updateActive(false, this);
                 }
             } else {
-                fuelBurning.disable();
-                steamHeater.decreaseTemperature(1);
+                steamHeater.tickDisabled();
+                fuelBurning.clearActiveFuel();
                 this.isActiveComponent.updateActive(false, this);
             }
             setChanged();

src/main/java/aztech/modern_industrialization/machines/components/FuelBurningComponent.java

@@ -64,6 +64,10 @@ public class FuelBurningComponent implements IComponent {
      * Buffer of EU that was burnt already, and is awaiting to be turned into heat.
      */
     private long burningEuBuffer;
+    /**
+     * Total EU of the currently burning item. If 0 it means that we are burning fluid instead.
+     */
+    private long burningItemTotalEu;
 
     public FuelBurningComponent(TemperatureComponent temperature, long maxEuProduction, long euPerDegree, long burningEuMultiplier) {
         this.temperature = temperature;
@@ -88,15 +92,20 @@ public boolean isBurning() {
         return burningEuBuffer > 0;
     }
 
-    public void disable() {
+    public void clearActiveFuel() {
         burningEuBuffer = 0;
+        burningItemTotalEu = 0;
     }
 
     public double getBurningProgress() {
-        return Math.min(1.0, (double) burningEuBuffer / (5 * 20 * maxEuProduction));
+        if (burningItemTotalEu == 0) {
+            return Math.min(1.0, (double) burningEuBuffer / (5 * 20 * maxEuProduction));
+        } else {
+            return Math.min(1.0, (double) burningEuBuffer / burningItemTotalEu);
+        }
     }
 
-    public void tick(List<ConfigurableItemStack> itemInputs, List<ConfigurableFluidStack> fluidInputs) {
+    public void tick(List<ConfigurableItemStack> itemInputs, List<ConfigurableFluidStack> fluidInputs, boolean canConsumeNewFuel) {
         // Turn buffer into heat
         long maxEuInsertion = Math.min(burningEuBuffer, maxEuProduction);
 
@@ -109,6 +118,10 @@ public void tick(List<ConfigurableItemStack> itemInputs, List<ConfigurableFluidS
             temperature.decreaseTemperature(1);
         }
 
+        if (!canConsumeNewFuel) {
+            return;
+        }
+
         // Refill buffer with item fuel
         outer: while (burningEuBuffer < maxEuProduction) {
             // Find first item fuel
@@ -117,7 +130,9 @@ public void tick(List<ConfigurableItemStack> itemInputs, List<ConfigurableFluidS
                 if (ItemStackHelper.consumeFuel(stack, true)) {
                     int fuelTime = fuel.getBurnTime(null);
                     if (fuelTime > 0) {
-                        burningEuBuffer += fuelTime * EU_PER_BURN_TICK * burningEuMultiplier;
+                        long fuelTotalEu = fuelTime * EU_PER_BURN_TICK * burningEuMultiplier;
+                        burningEuBuffer += fuelTotalEu;
+                        burningItemTotalEu = fuelTotalEu;
                         ItemStackHelper.consumeFuel(stack, false);
                         continue outer;
                     }
@@ -137,6 +152,7 @@ public void tick(List<ConfigurableItemStack> itemInputs, List<ConfigurableFluidS
                         if (mbConsumed > 0) {
                             stack.decrement(mbConsumed);
                             burningEuBuffer += mbConsumed * euPerMb;
+                            burningItemTotalEu = 0;
                             continue outer;
                         }
                     }
@@ -149,12 +165,15 @@ public void tick(List<ConfigurableItemStack> itemInputs, List<ConfigurableFluidS
     @Override
     public void writeNbt(CompoundTag tag, HolderLookup.Provider registries) {
         tag.putLong("burningEuBuffer", burningEuBuffer);
-
+        if (burningItemTotalEu != 0) {
+            tag.putLong("burningItemTotalEu", burningItemTotalEu);
+        }
     }
 
     @Override
     public void readNbt(CompoundTag tag, HolderLookup.Provider registries, boolean isUpgradingMachine) {
         burningEuBuffer = tag.getLong("burningEuBuffer");
+        burningItemTotalEu = tag.getLong("burningItemTotalEu");
     }
 
     public List<Component> getTooltips() {

src/main/java/aztech/modern_industrialization/machines/components/SteamHeaterComponent.java

@@ -107,6 +107,10 @@ public double tick(List<ConfigurableFluidStack> fluidInputs, List<ConfigurableFl
         return totalEuProduced;
     }
 
+    public void tickDisabled() {
+        this.decreaseTemperature(INPUT_ENERGY_RATIO_FOR_STARTUP * this.maxEuProduction / this.euPerDegree);
+    }
+
     private double tryMakeSteam(List<ConfigurableFluidStack> input, List<ConfigurableFluidStack> output, Fluid water, Fluid steam, int euPerSteamMb) {
         return tryMakeSteam(new MIFluidStorage(input), new MIFluidStorage(output), water, steam, euPerSteamMb);