aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-11-07 15:53:38 +0100
committerMartin Robertz <dream-master@gmx.net>2021-11-07 15:53:59 +0100
commit14ccdfc4d899cecafd04d01e57d14b61a5f4d244 (patch)
tree6c0f4d0228c403c7f6f76fd41190b640c344417c
parente050b6b1f52a0874071e4392e8a309cdbb280c60 (diff)
downloadGT5-Unofficial-14ccdfc4d899cecafd04d01e57d14b61a5f4d244.tar.gz
GT5-Unofficial-14ccdfc4d899cecafd04d01e57d14b61a5f4d244.tar.bz2
GT5-Unofficial-14ccdfc4d899cecafd04d01e57d14b61a5f4d244.zip
fix hatch capacity code
(cherry picked from commit 17f9f29fbdf18f794e6459fcb4b1f84b5b393b16)
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java4
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java
index 25a956f2ee..e7423f80d5 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Input.java
@@ -21,7 +21,7 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
public GT_MetaTileEntity_Hatch_Input(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, 3, new String[]{
"Fluid Input for Multiblocks",
- "Capacity: " + GT_Utility.formatNumbers(16000*(aTier*(aTier+1)>>1)) + "L"});
+ "Capacity: " + GT_Utility.formatNumbers(8000*(1>>aTier)) + "L"});
}
public GT_MetaTileEntity_Hatch_Input(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
@@ -139,7 +139,7 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch {
@Override
public int getCapacity() {
- return 16000*(mTier*(mTier+1)>>1);
+ return 8000*(1<<mTier);
}
@Override
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java
index 29bae81c59..c0443d113a 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java
@@ -29,7 +29,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch {
public GT_MetaTileEntity_Hatch_Output(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, 4, new String[]{
"Fluid Output for Multiblocks",
- "Capacity: " + GT_Utility.formatNumbers(16000*(aTier*(aTier+1)>>1)) + "L",
+ "Capacity: " + GT_Utility.formatNumbers(8000*(1>>aTier)) + "L",
"Right click with screwdriver to restrict output",
"Can be restricted to put out Items and/or Steam/No Steam/1 specific Fluid",
"Restricted Output Hatches are given priority for Multiblock Fluid output"});
@@ -201,7 +201,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch {
@Override
public int getCapacity() {
- return 16000*(mTier*(mTier+1)>>1);
+ return 8000*(1<<mTier);
}
@Override