mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-14 09:14:50 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
948876ffcd | ||
|
|
83142abde9 |
No files matched your search
+3
-3
@@ -1,10 +1,10 @@
|
||||
// Add your dependencies here
|
||||
|
||||
dependencies {
|
||||
api('com.github.GTNewHorizons:ForestryMC:4.8.8:dev')
|
||||
implementation('com.github.GTNewHorizons:GTNHLib:0.2.10: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.25-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')
|
||||
|
||||
+1
-1
@@ -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
|
||||
|
||||
+1
-3
@@ -17,7 +17,5 @@ pluginManagement {
|
||||
}
|
||||
|
||||
plugins {
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.19'
|
||||
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22'
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user