diff options
| author | Technus <daniel112092@gmail.com> | 2017-01-11 08:56:06 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-01-11 08:56:24 +0100 |
| commit | eadaa798805a18a6d9fbaf5c55ea2a01aeacdb10 (patch) | |
| tree | 4b5c039b5bf46db10640aa0b35caf563af2fa9d7 /src/main/java/gregtech | |
| parent | 5d58f4aecc3307765a0f014835d3579bb325eb90 (diff) | |
| download | GT5-Unofficial-eadaa798805a18a6d9fbaf5c55ea2a01aeacdb10.tar.gz GT5-Unofficial-eadaa798805a18a6d9fbaf5c55ea2a01aeacdb10.tar.bz2 GT5-Unofficial-eadaa798805a18a6d9fbaf5c55ea2a01aeacdb10.zip | |
MOOOORE capacity in fluid hatches and fix generator even more
Diffstat (limited to 'src/main/java/gregtech')
3 files changed, 17 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java index 3e7b34e15b..4378957c18 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java @@ -143,6 +143,7 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity @Override public boolean doesFillContainers() { + //return getBaseMetaTileEntity().isAllowedToWork(); return false; } @@ -177,6 +178,12 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity } @Override + public boolean isLiquidOutput(byte aSide) { + //return super.isLiquidOutput(aSide); + return false; + } + + @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isAllowedToWork() && aTick % 10 == 0) { long tProducedEU = 0; @@ -192,9 +199,10 @@ public abstract class GT_MetaTileEntity_BasicGenerator extends GT_MetaTileEntity int tFuelValue = getFuelValue(mFluid), tConsumed = consumedFluidPerOperation(mFluid); if (tFuelValue > 0 && tConsumed > 0 && mFluid.amount > tConsumed) { long tFluidAmountToUse = Math.min(mFluid.amount / tConsumed, (maxEUOutput() * 20 + getMinimumStoredEU() - aBaseMetaTileEntity.getUniversalEnergyStored()) / tFuelValue); - if (tFluidAmountToUse > 0 && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) - tProducedEU = tFluidAmountToUse * tFuelValue; + if (tFluidAmountToUse > 0 && aBaseMetaTileEntity.increaseStoredEnergyUnits(tFluidAmountToUse * tFuelValue, true)) { + tProducedEU = tFluidAmountToUse * tFuelValue; mFluid.amount -= tFluidAmountToUse * tConsumed; + } } } if (mInventory[getInputSlot()] != null && aBaseMetaTileEntity.getUniversalEnergyStored() < (maxEUOutput() * 20 + getMinimumStoredEU()) && GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true) == null) { 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 4484347bd4..2bd655f8ea 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 @@ -61,7 +61,8 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch { @Override public boolean doesFillContainers() { - return true; + //return true; + return false; } @Override @@ -111,7 +112,8 @@ public class GT_MetaTileEntity_Hatch_Input extends GT_MetaTileEntity_Hatch { @Override public int getCapacity() { - return 8000 * (mTier + 1); + if (mTier<1) return 8000; + return 16000 * (mTier*(mTier>>2)); } @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 036f5e2195..c9826aa174 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 @@ -106,7 +106,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch { @Override public boolean doesEmptyContainers() { - return true; + return false; } @Override @@ -141,7 +141,8 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_Hatch { @Override public int getCapacity() { - return 8000 * (mTier + 1); + if (mTier<1) return 8000; + return 16000 * (mTier*(mTier>>2)); } @Override |