diff options
| author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-04 20:19:07 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-06-05 20:08:26 +0200 |
| commit | 738cb253db6dca54925c2ea0f9130edfdc30c384 (patch) | |
| tree | 6d94809f3c0cc6edd49ae4ff0b4e0ac07123b3eb /src/main/java/gregtech/common/tileentities | |
| parent | 4c8948ef3851c8bc97dc55990059a1250f71e88d (diff) | |
| download | GT5-Unofficial-738cb253db6dca54925c2ea0f9130edfdc30c384.tar.gz GT5-Unofficial-738cb253db6dca54925c2ea0f9130edfdc30c384.tar.bz2 GT5-Unofficial-738cb253db6dca54925c2ea0f9130edfdc30c384.zip | |
Moved the casing IDs for the Large Chemical Reactor: 14, 15 -> 4, 5
Limited the minimal recipe time for the LCM to 2 ticks to avoid bugs.
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
| -rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java index aeff099248..1a7b444b54 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java @@ -20,7 +20,7 @@ import net.minecraftforge.fluids.FluidStack; public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_MultiBlockBase { - private static final int CASING_INDEX = 62; + private static final int CASING_INDEX = 52; public GT_MetaTileEntity_LargeChemicalReactor(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -43,7 +43,7 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu "Does not lose efficiency when overclocked", "Accepts fluids instead of fluid cells", "Size(WxHxD): 3x3x3", - "3x3x3 of Chemically Inert Machine Casings (hollow, min 24!)", + "3x3x3 of Chemically Inert Machine Casings (hollow, min 8!)", "Controller (Front centered)", "1x Cupronickel Coil Block (Bottom centered)", "1x PTFE Pipe Machine Casing (inside the hollow casings)", @@ -120,11 +120,14 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu int EUt = recipe.mEUt; int maxProgresstime = recipe.mDuration; - while (EUt <= gregtech.api.enums.GT_Values.V[tier - 1] && maxProgresstime > 1) { + while (EUt <= gregtech.api.enums.GT_Values.V[tier - 1] && maxProgresstime > 2) { EUt *= 4; maxProgresstime /= 4; } - maxProgresstime = Math.max(maxProgresstime, 1); + if (maxProgresstime < 2) { + maxProgresstime = 2; + EUt = recipe.mEUt * recipe.mDuration / 2; + } this.mEUt = -EUt; this.mMaxProgresstime = maxProgresstime; @@ -151,14 +154,14 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu if ((y == -1) && (block != GregTech_API.sBlockCasings5 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 0)) { return false; - } else if (y == 0 && (block != GregTech_API.sBlockCasings4 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 15)) { + } else if (y == 0 && (block != GregTech_API.sBlockCasings4 || aBaseMetaTileEntity.getMetaIDOffset(x, y, z) != 5)) { return false; } } else if (x != 0 || y != 0 || z != 0) { if (!addInputToMachineList(tileEntity, CASING_INDEX) && !addOutputToMachineList(tileEntity, CASING_INDEX) && !addMaintenanceToMachineList(tileEntity, CASING_INDEX) && !addEnergyInputToMachineList(tileEntity, CASING_INDEX)) { - if (block == GregTech_API.sBlockCasings4 && aBaseMetaTileEntity.getMetaIDOffset(x, y, z) == 14) { + if (block == GregTech_API.sBlockCasings4 && aBaseMetaTileEntity.getMetaIDOffset(x, y, z) == 4) { casingAmount++; } else { return false; |