diff options
author | TheEpicGamer274 <102255081+TheEpicGamer274@users.noreply.github.com> | 2023-07-09 04:25:51 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-07-09 10:25:51 +0200 |
commit | 3f83b54ca64cc14f835e4d527ebf05597e4afaeb (patch) | |
tree | 691c337b2efd683a09ee72c57c4c2165caa95837 /src/main/java/gregtech/api/metatileentity | |
parent | 430a4dc6662e1fd2fbbff6ef26f0b82688d30ead (diff) | |
download | GT5-Unofficial-3f83b54ca64cc14f835e4d527ebf05597e4afaeb.tar.gz GT5-Unofficial-3f83b54ca64cc14f835e4d527ebf05597e4afaeb.tar.bz2 GT5-Unofficial-3f83b54ca64cc14f835e4d527ebf05597e4afaeb.zip |
More quad input hatches (#2121)
* Saving
* Saving
* Spotless + Import fixes
* Attempt to fix review request
* Spotless
* spotlessApply (#2126)
Co-authored-by: GitHub GTNH Actions <>
* Fixing Requested Changes
* Update src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java
Co-authored-by: Maxim <maxim235@gmx.de>
* Update GT_MetaTileEntity_Hatch_QuadrupleHumongous.java
---------
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Maxim <maxim235@gmx.de>
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
3 files changed, 35 insertions, 5 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 e6d8b13045..57ddcf42d9 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 @@ -40,9 +40,12 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch { aNameRegional, aTier, aSlot, - new String[] { "Fluid Input for Multiblocks", - "Capacity: " + GT_Utility.formatNumbers(8000L * (1L << aTier) / aSlot) + "L", - "Can hold " + aSlot + " types of fluid." }); + new String[] { "Fluid Input for Multiblocks", "", "Can hold " + aSlot + " types of fluid." }); + mDescriptionArray[1] = "Capacity: " + GT_Utility.formatNumbers(getCapacityPerTank(aTier, aSlot)) + "L"; + } + + public int getCapacityPerTank(int aTier, int aSlot) { + return (int) (8000L * (1L << aTier) / aSlot); } public GT_MetaTileEntity_Hatch_Input(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java index cd1ea520c8..5dc04f8ea0 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_MultiInput.java @@ -30,7 +30,7 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_ super(aID, aSlot, aName, aNameRegional, aTier); this.mStoredFluid = new FluidStack[aSlot]; fluidTanks = new FluidStackTank[aSlot]; - mCapacityPer = 8000 * (1 << aTier) / aSlot; + mCapacityPer = getCapacityPerTank(aTier, aSlot); } public GT_MetaTileEntity_Hatch_MultiInput(String aName, int aSlot, int aTier, String[] aDescription, @@ -38,7 +38,7 @@ public class GT_MetaTileEntity_Hatch_MultiInput extends GT_MetaTileEntity_Hatch_ super(aName, aSlot, aTier, aDescription, aTextures); this.mStoredFluid = new FluidStack[aSlot]; fluidTanks = new FluidStackTank[aSlot]; - mCapacityPer = 8000 * (1 << aTier) / aSlot; + mCapacityPer = getCapacityPerTank(aTier, aSlot); for (int i = 0; i < aSlot; i++) { final int index = i; fluidTanks[i] = new FluidStackTank( diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java new file mode 100644 index 0000000000..86ebc857f2 --- /dev/null +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_QuadrupleHumongous.java @@ -0,0 +1,27 @@ +package gregtech.api.metatileentity.implementations; + +import gregtech.api.interfaces.ITexture; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.metatileentity.MetaTileEntity; + +public class GT_MetaTileEntity_Hatch_QuadrupleHumongous extends GT_MetaTileEntity_Hatch_MultiInput { + + public GT_MetaTileEntity_Hatch_QuadrupleHumongous(int aID, int aSlot, String aName, String aNameRegional) { + super(aID, aSlot, aName, aNameRegional, 0); + } + + public GT_MetaTileEntity_Hatch_QuadrupleHumongous(String aName, int aSlot, int aTier, String[] aDescription, + ITexture[][][] aTextures) { + super(aName, aSlot, aTier, aDescription, aTextures); + } + + @Override + public int getCapacityPerTank(int aTier, int aSlot) { + return 500_000_000; + } + + @Override + public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { + return new GT_MetaTileEntity_Hatch_QuadrupleHumongous(mName, getMaxType(), mTier, mDescriptionArray, mTextures); + } +} |