aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-05-31 15:20:17 +0900
committerGitHub <noreply@github.com>2023-05-31 08:20:17 +0200
commit12408f48befc7fc0c2ee1d0273e5c0273bdf858c (patch)
tree25330ab3e54cec9ee1355c5d6cac919f2c1e6b01 /src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity
parenta5e517bf2a55a8e8168f623931ca578ea1b222c3 (diff)
downloadGT5-Unofficial-12408f48befc7fc0c2ee1d0273e5c0273bdf858c.tar.gz
GT5-Unofficial-12408f48befc7fc0c2ee1d0273e5c0273bdf858c.tar.bz2
GT5-Unofficial-12408f48befc7fc0c2ee1d0273e5c0273bdf858c.zip
Make fluid generator hatch fill partial amount (#647)
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java12
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java4
2 files changed, 3 insertions, 13 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
index 80939fd49d..e5fe875ab7 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_FluidGenerator.java
@@ -166,17 +166,7 @@ public abstract class GT_MetaTileEntity_Hatch_FluidGenerator extends GT_MetaTile
@Override
public boolean canTankBeFilled() {
- if (this.getCapacity() - this.getFluidAmount() > 0) {
- // Logger.INFO("Total Space: "+this.getCapacity());
- // Logger.INFO("Current amount: "+this.getFluidAmount());
- // Logger.INFO("To add: "+this.getAmountOfFluidToGenerate());
- // Logger.INFO("Space Free: "+(this.getCapacity()-this.getFluidAmount()));
- }
- if (this.mFluid == null || (this.mFluid != null
- && (this.getCapacity() - this.getFluidAmount() >= this.getAmountOfFluidToGenerate()))) {
- return true;
- }
- return false;
+ return true;
}
@Override
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
index a62d30f6ab..6945e4928d 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
@@ -31,7 +31,7 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
public String[] getCustomTooltip() {
String[] aTooltip = new String[2];
aTooltip[0] = "Infinite water supply hatch";
- aTooltip[1] = "Refills half of its capacity every 5 seconds";
+ aTooltip[1] = "Fills to max capacity every 5 seconds";
return aTooltip;
}
@@ -42,7 +42,7 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
@Override
public int getAmountOfFluidToGenerate() {
- return 1_000_000_000;
+ return 2_000_000_000;
}
@Override