diff options
| author | BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> | 2022-12-17 20:58:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-17 19:58:34 +0100 |
| commit | 58eb0fa7aaeb177ba9514e95c2b0e6570320a6cb (patch) | |
| tree | 90187953f5c53406772eb63e1e3748c42d412fec /src/main/java/gregtech/api/metatileentity/implementations | |
| parent | c5590e230195adf4dfbf3b7334bd662d03b97af1 (diff) | |
| download | GT5-Unofficial-58eb0fa7aaeb177ba9514e95c2b0e6570320a6cb.tar.gz GT5-Unofficial-58eb0fa7aaeb177ba9514e95c2b0e6570320a6cb.tar.bz2 GT5-Unofficial-58eb0fa7aaeb177ba9514e95c2b0e6570320a6cb.zip | |
More Fixes to the PCB Factory (#1554)
* why am I so bad at spotting bugs
* fixes fixes fixes, who needs to reset multipliers
* remove the comment
* fix oc oops
* fix the roughnessMultiplier
* fix accidental energy discount
* remove the useless hatch boolean
* fix units
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
2 files changed, 26 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java index 991a03eb96..56bc92e851 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_ExtendedPowerMultiBlockBase.java @@ -139,7 +139,7 @@ public abstract class GT_MetaTileEntity_ExtendedPowerMultiBlockBase< /* 3*/ StatCollector.translateToLocal("GT5U.multiblock.usage") + ": " + EnumChatFormatting.RED + GT_Utility.formatNumbers(getActualEnergyUsage()) + EnumChatFormatting.RESET + " EU/t", /* 4*/ StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(voltage) + EnumChatFormatting.RESET + " EU/t(*" + amps + ")" + + GT_Utility.formatNumbers(voltage) + EnumChatFormatting.RESET + " EU/t(*" + amps + " A)" + StatCollector.translateToLocal("GT5U.machines.tier") + ": " + EnumChatFormatting.YELLOW + VN[GT_Utility.getTier(voltage)] + EnumChatFormatting.RESET, diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index c67785664c..6df995258e 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -1286,6 +1286,31 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity return mExoticEnergyHatches; } + /** + * @return Returns true if there is 1 TT Energy Hatch OR up to 2 Energy Hatches + */ + public boolean checkExoticAndNormalEnergyHatches() { + if (mExoticEnergyHatches.isEmpty() && mEnergyHatches.isEmpty()) { + return false; + } + + if (mExoticEnergyHatches.size() >= 1) { + if (!mEnergyHatches.isEmpty()) { + return false; + } + + if (mExoticEnergyHatches.size() != 1) { + return false; + } + } + + if (mEnergyHatches.size() > 2) { + return false; + } + + return true; + } + @Override public boolean useModularUI() { return true; |