update

Co-authored-by: Marcel Sondaar <[email protected]>

.gitignore

@@ -30,3 +30,4 @@ src/main/resources/mixins.*.json
 *.bat
 *.DS_Store
 !gradlew.bat
+layout.json

dependencies.gradle

@@ -2,10 +2,10 @@
 
 dependencies {
     api('curse.maven:cofh-lib-220333:2388748')
-    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta27:api')
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.54-GTNH:dev')
-    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.0:api')
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
+    compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta38:api')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.29-GTNH:dev')
+    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api')
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api')
     compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')
     compileOnly('curse.maven:craftguide-75557:2459320')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.37'
 }
 
 

src/main/java/forestry/api/core/IClimateControlled.java

@@ -12,11 +12,15 @@ public interface IClimateControlled {
 
     /**
      * Change the temperature, but not lower than boundaryDown or higher than boundaryUp.
+     *
+     * When used in an alveary the change applies a 20x stronger effect
      */
     void addTemperatureChange(float change, float boundaryDown, float boundaryUp);
 
     /**
      * Change the humidity, but not lower than boundaryDown or higher than boundaryUp.
+     *
+     * When used in an alveary the change applies a 20x stronger effect
      */
     void addHumidityChange(float change, float boundaryDown, float boundaryUp);
 }

src/main/java/forestry/api/multiblock/IAlvearyComponent.java

@@ -49,6 +49,14 @@ public interface IAlvearyComponent<T extends IMultiblockLogicAlveary> extends IM
          * @param alveary   the climate controlled alveary
          */
         void changeClimate(int tickCount, IClimateControlled alveary);
+
+        /**
+         * Get the priority of this climatiser. Called when alveary is constructed.
+         * {@link #changeClimate(int, IClimateControlled)} are run in descending priority.
+         */
+        default int getPriority() {
+            return 0;
+        }
     }
 
     /**

src/main/java/forestry/apiculture/multiblock/AlvearyController.java

@@ -9,8 +9,10 @@
 package forestry.apiculture.multiblock;
 
 import java.io.IOException;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.TreeSet;
 
 import net.minecraft.block.Block;
 import net.minecraft.nbt.NBTTagCompound;
@@ -59,7 +61,9 @@ public class AlvearyController extends RectangularMultiblockControllerBase
     // PARTS
     private final Set<IBeeModifier> beeModifiers = new HashSet<>();
     private final Set<IBeeListener> beeListeners = new HashSet<>();
-    private final Set<IAlvearyComponent.Climatiser> climatisers = new HashSet<>();
+    private final Set<IAlvearyComponent.Climatiser> climatisers = new TreeSet<>(
+            Comparator.comparingInt(IAlvearyComponent.Climatiser::getPriority).thenComparingInt(Object::hashCode)
+                    .reversed());
     private final Set<IAlvearyComponent.Active> activeComponents = new HashSet<>();
 
     // CLIENT
@@ -233,26 +237,24 @@ public class AlvearyController extends RectangularMultiblockControllerBase
             beekeepingLogic.doWork();
         }
 
+        tempChange = 0;
+        humidChange = 0;
         for (IAlvearyComponent.Climatiser climatiser : climatisers) {
             climatiser.changeClimate(tickCount, this);
         }
 
-        tempChange = equalizeChange(tempChange);
-        humidChange = equalizeChange(humidChange);
-
         return canWork;
     }
 
-    private static float equalizeChange(float change) {
-        if (change == 0) {
-            return 0;
+    private float applyChange(float base, float currentChange, float extraChange, float boundaryDown,
+            float boundaryUp) {
+        float boundedNewChange = Math.max(boundaryDown, Math.min(base + currentChange + (extraChange * 20), boundaryUp))
+                - base;
+        if (extraChange > 0) {
+            return Math.max(currentChange, boundedNewChange);
+        } else {
+            return Math.min(currentChange, boundedNewChange);
         }
-
-        change *= 0.95f;
-        if (change <= 0.001f && change >= -0.001f) {
-            change = 0;
-        }
-        return change;
     }
 
     @Override
@@ -410,19 +412,13 @@ public class AlvearyController extends RectangularMultiblockControllerBase
         ChunkCoordinates coordinates = getCoordinates();
 
         float temperature = getBiome().getFloatTemperature(coordinates.posX, coordinates.posY, coordinates.posZ);
-
-        tempChange += change;
-        tempChange = Math.max(boundaryDown - temperature, tempChange);
-        tempChange = Math.min(boundaryUp - temperature, tempChange);
+        tempChange = applyChange(temperature, tempChange, change, boundaryDown, boundaryUp);
     }
 
     @Override
     public void addHumidityChange(float change, float boundaryDown, float boundaryUp) {
         float humidity = getBiome().rainfall;
-
-        humidChange += change;
-        humidChange = Math.max(boundaryDown - humidity, humidChange);
-        humidChange = Math.min(boundaryUp - humidity, humidChange);
+        humidChange = applyChange(humidity, humidChange, change, boundaryDown, boundaryUp);
     }
 
     /* GUI */

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.0005f),
-                new HygroregulatorRecipe(new FluidStack(lava, 1), 10, -0.01f, +0.0005f),
-                new HygroregulatorRecipe(new FluidStack(liquidIce, 1), 10, +0.02f, -0.001f) };
+                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) };
     }
 
     @Override
@@ -111,6 +111,11 @@ public class TileAlvearyHygroregulator extends TileAlveary
         }
     }
 
+    @Override
+    public int getPriority() {
+        return 100;
+    }
+
     /* SAVING & LOADING */
     @Override
     public void readFromNBT(NBTTagCompound nbttagcompound) {

src/main/resources/assets/forestry/lang/en_US.lang

@@ -171,6 +171,7 @@ for.gui.imprinter.name=GENOME IMPRINTER
 for.gui.inactive=Inactive
 for.gui.life=Life
 for.gui.lifespan=Lifespan
+for.gui.none=None
 for.gui.normal=Normal
 for.gui.jubilance=Jubilance: %s