diff options
| -rw-r--r-- | dependencies.gradle | 2 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index 31ad15cc9c..5123c65c7b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,5 +1,5 @@ dependencies { - compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.214:dev') + compile('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.218:dev') compile("com.github.GTNewHorizons:StructureLib:1.2.0-beta.2:dev") compile("com.github.GTNewHorizons:ModularUI:1.0.38:dev") {transitive=false} compile("com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev") 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, |