From 99ebd8efe0bfa380085eb8c526546fdded48b20a Mon Sep 17 00:00:00 2001 From: Runakai1 <48415331+Runakai1@users.noreply.github.com> Date: Sun, 18 Jun 2023 14:56:09 +0200 Subject: [PATCH] Fix Alveary Simulation of Temperatures (#52) * Fix Alveary Simulation of Temperatures * Spottless * spotlessApply (#53) Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../forestry/apiculture/multiblock/AlvearyController.java | 2 -- .../java/forestry/apiculture/multiblock/TileAlvearyFan.java | 2 +- .../forestry/apiculture/multiblock/TileAlvearyHeater.java | 4 ++-- .../apiculture/multiblock/TileAlvearyHygroregulator.java | 6 +++--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java index 19a82def1..cfbfcb066 100644 --- a/src/main/java/forestry/apiculture/multiblock/AlvearyController.java +++ b/src/main/java/forestry/apiculture/multiblock/AlvearyController.java @@ -414,7 +414,6 @@ public class AlvearyController extends RectangularMultiblockControllerBase tempChange += change; tempChange = Math.max(boundaryDown - temperature, tempChange); tempChange = Math.min(boundaryUp - temperature, tempChange); - tempChange = (change > 0 && tempChange < 0) || (change < 0 && tempChange > 0) ? 0 : tempChange; } @Override @@ -424,7 +423,6 @@ public class AlvearyController extends RectangularMultiblockControllerBase humidChange += change; humidChange = Math.max(boundaryDown - humidity, humidChange); humidChange = Math.min(boundaryUp - humidity, humidChange); - humidChange = (change > 0 && humidChange < 0) || (change < 0 && humidChange > 0) ? 0 : humidChange; } /* GUI */ diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java index 28e6f8ebb..65ca44163 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyFan.java @@ -32,7 +32,7 @@ public class TileAlvearyFan extends TileAlvearyClimatiser { @Override public float getBoundaryDown() { - return 0.05f; + return -1f; } @Override diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java index a7c765ef1..603e9a6ea 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHeater.java @@ -22,12 +22,12 @@ public class TileAlvearyHeater extends TileAlvearyClimatiser { @Override public float getChangePerTransfer() { - return 0.01f; + return 0.015f; } @Override public float getBoundaryUp() { - return 2.5f; + return 3.5f; } @Override diff --git a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java index 214cd71b4..fb562a8a9 100644 --- a/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java +++ b/src/main/java/forestry/apiculture/multiblock/TileAlvearyHygroregulator.java @@ -56,9 +56,9 @@ public class TileAlvearyHygroregulator extends TileAlveary this.tankManager = new TankManager(this, liquidTank); this.recipes = new HygroregulatorRecipe[] { - new HygroregulatorRecipe(new FluidStack(water, 1), 1, 0.01f, -0.005f), - new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.005f), - new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, 0.02f, -0.01f) }; + new HygroregulatorRecipe(new FluidStack(water, 1), 1, +0.01f, -0.0005f), + new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.0005f), + new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.001f) }; } @Override