diff options
| author | Maxim <maxim235@gmx.de> | 2023-01-14 21:40:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-14 21:40:40 +0100 |
| commit | 50fa8d1b5474715159085bad8dbdc161e5153308 (patch) | |
| tree | ecace0b2a7ded8852c76ce96ec0f4d00bcd6a582 /src | |
| parent | 11bf85d959c6248a1c19b4ddfdaa60a21ff999df (diff) | |
| download | GT5-Unofficial-50fa8d1b5474715159085bad8dbdc161e5153308.tar.gz GT5-Unofficial-50fa8d1b5474715159085bad8dbdc161e5153308.tar.bz2 GT5-Unofficial-50fa8d1b5474715159085bad8dbdc161e5153308.zip | |
Fix mabs exotic hatches (#496)
* Fix MABS not accepting multi amp hatches below UV glass
* Clean up using new getters
* Spotless
* spotlessApply (#497)
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java index a173ca4c36..80abaa270f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java @@ -361,10 +361,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter protected boolean processRecipe(ItemStack[] tItems, FluidStack[] tFluids) { if (tItems.length <= 0 && tFluids.length <= 0) return false; - long tVoltage = this.getMaxInputVoltage() - / this.getExoticAndNormalEnergyHatchList().size(); - long tAmps = this.getMaxInputAmps(); - long tTotalEU = tVoltage * tAmps; + long tTotalEU = getAverageInputVoltage() * getMaxInputAmps(); GT_Recipe recipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, tTotalEU, tFluids, tItems); if (recipe == null) return false; @@ -423,7 +420,15 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter } } } - return this.glassTier >= 8 || this.getExoticEnergyHatches().size() <= 0; + // Disallow lasers if the glass is below UV tier + if (glassTier < 8) { + for (GT_MetaTileEntity_Hatch hatchEnergy : getExoticEnergyHatches()) { + if (hatchEnergy.getConnectionType() == GT_MetaTileEntity_Hatch.ConnectionType.LASER) { + return false; + } + } + } + return true; } @Override @@ -532,15 +537,12 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter StatCollector.translateToLocal("GT5U.multiblock.usage") + ": " + EnumChatFormatting.RED + GT_Utility.formatNumbers(-lEUt) + EnumChatFormatting.RESET + " EU/t", StatCollector.translateToLocal("GT5U.multiblock.mei") + ": " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers( - GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList())) + + GT_Utility.formatNumbers(getAverageInputVoltage()) + EnumChatFormatting.RESET + " EU/t(*" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(this.getMaxInputAmps()) + + GT_Utility.formatNumbers(getMaxInputAmps()) + EnumChatFormatting.RESET + "A) " + StatCollector.translateToLocal("GT5U.machines.tier") + ": " + EnumChatFormatting.YELLOW - + GT_Values.VN[ - GT_Utility.getTier(GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti( - getExoticAndNormalEnergyHatchList()))] + + GT_Values.VN[GT_Utility.getTier(getAverageInputVoltage())] + EnumChatFormatting.RESET, "Parallels: " + EnumChatFormatting.BLUE + paras + EnumChatFormatting.RESET, "Coil Discount: " + EnumChatFormatting.BLUE + discountP + "%" + EnumChatFormatting.RESET, |