Dev (#47)

* Update settings.gradle

* Update gradle-wrapper.properties

* Update dependencies.gradle

dependencies.gradle

@@ -1,10 +1,10 @@
 // Add your dependencies here
 
 dependencies {
-	api('com.github.GTNewHorizons:ForestryMC:4.8.2:dev')
-	implementation('com.github.GTNewHorizons:GTNHLib:0.2.4:dev')
+	api('com.github.GTNewHorizons:ForestryMC:4.9.3:dev')
+	implementation('com.github.GTNewHorizons:GTNHLib:0.2.11:dev')
 
-	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.18-GTNH:dev')
+	devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.6.1-GTNH:dev')
 
 	compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:api')
 	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev')

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -17,7 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.14'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
 }
-
-

src/main/java/binnie/botany/flower/TileEntityFlower.java

@@ -42,6 +42,7 @@ import forestry.api.genetics.IPollinatable;
 import forestry.api.lepidopterology.IButterfly;
 import forestry.api.lepidopterology.IButterflyNursery;
 import forestry.lepidopterology.entities.EntityButterfly;
+import forestry.plugins.PluginLepidopterology;
 
 public class TileEntityFlower extends TileEntity implements IPollinatable, IButterflyNursery {
 
@@ -456,7 +457,7 @@ public class TileEntityFlower extends TileEntity implements IPollinatable, IButt
         if (worldObj.rand.nextFloat() >= spawn.getGenome().getPrimary().getRarity() * 0.5f) {
             return;
         }
-        if (worldObj.countEntities(EntityButterfly.class) > 100) {
+        if (worldObj.countEntities(EntityButterfly.class) > PluginLepidopterology.spawnConstraint) {
             return;
         }
         if (!spawn.canSpawn(worldObj, x, y, z)) {

src/main/java/binnie/core/machines/transfer/TransferRequest.java

@@ -256,7 +256,12 @@ public class TransferRequest {
         FluidStack largeAmountOfLiquid = containerLiquid.copy();
         largeAmountOfLiquid.amount = tank.getCapacity();
         int amountAdded = tank.fill(largeAmountOfLiquid, false);
-        int numberOfContainersToAdd = amountAdded / containerLiquid.amount;
+        int numberOfContainersToAdd;
+        if (containerLiquid.amount > 0) {
+            numberOfContainersToAdd = amountAdded / containerLiquid.amount;
+        } else {
+            numberOfContainersToAdd = item.stackSize;
+        }
         if (numberOfContainersToAdd > item.stackSize) {
             numberOfContainersToAdd = item.stackSize;
         }
@@ -358,7 +363,12 @@ public class TransferRequest {
         int maximumExtractedLiquid = item.stackSize * fluid.amount;
         FluidStack drainedLiquid = tank.drain(maximumExtractedLiquid, false);
         int amountInTank = (drainedLiquid == null) ? 0 : drainedLiquid.amount;
-        int numberOfContainersToFill = amountInTank / fluid.amount;
+        int numberOfContainersToFill;
+        if (fluid.amount > 0) {
+            numberOfContainersToFill = amountInTank / fluid.amount;
+        } else {
+            numberOfContainersToFill = item.stackSize;
+        }
         if (numberOfContainersToFill > item.stackSize) {
             numberOfContainersToFill = item.stackSize;
         }