diff options
author | BlueWeabo <76872108+BlueWeabo@users.noreply.github.com> | 2022-08-28 00:26:24 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-27 23:26:24 +0200 |
commit | eab6801116c10c9b2535d0bf596527f69268373e (patch) | |
tree | 1a42387d8464b22839d5d6cd7c00b9e1b54d1b9f /src/main/java/gregtech/common | |
parent | 9733d9ecee5790cb26570fbbd35c5321637e75ae (diff) | |
download | GT5-Unofficial-eab6801116c10c9b2535d0bf596527f69268373e.tar.gz GT5-Unofficial-eab6801116c10c9b2535d0bf596527f69268373e.tar.bz2 GT5-Unofficial-eab6801116c10c9b2535d0bf596527f69268373e.zip |
Make MultiSmelter able to do more than 128 parallels (#1310)
* Make MultiSmelter able to do more than 128 parallels
The multismelter was before only able to do 128 and it got to that with HSS-G coils.
With this change it will be able to go above that with the higher tier coils.
This change won't cause any more lag than it is currently creating.
* undo public method
* spotlessApply (#1312)
Co-authored-by: BlueWeabo <76872108+BlueWeabo@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r-- | src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java index 7d3b341786..2411845c56 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java @@ -94,7 +94,7 @@ public class GT_MetaTileEntity_MultiFurnace GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Furnace") .addInfo("Controller Block for the Multi Smelter") - .addInfo("Smelts up to 8-128 items at once") + .addInfo("Smelts up to 8-8192 items at once") .addInfo("Items smelted increases with coil tier") .addPollutionAmount(getPollutionPerSecond(null)) .addSeparator() @@ -169,26 +169,26 @@ public class GT_MetaTileEntity_MultiFurnace if (tInputList.isEmpty()) return false; int mVolatage = GT_Utility.safeInt(getMaxInputVoltage()); - int tMaxParrallel = 8 * this.mLevel; - int tCurrenParrallel = 0; + int tMaxParallel = this.mLevel; + int tCurrentParallel = 0; ArrayList<ItemStack> smeltedOutputs = new ArrayList<>(); ArrayList<Integer> outputStackSizes = new ArrayList<>(); for (ItemStack item : tInputList) { ItemStack smeltedOutput = GT_ModHandler.getSmeltingOutput(item, false, null); if (smeltedOutput != null) { smeltedOutputs.add(smeltedOutput); - if (item.stackSize <= (tMaxParrallel - tCurrenParrallel)) { - tCurrenParrallel += item.stackSize; + if (item.stackSize <= (tMaxParallel - tCurrentParallel)) { + tCurrentParallel += item.stackSize; outputStackSizes.add(smeltedOutput.stackSize * item.stackSize); item.stackSize = 0; } else { - int remainingStackSize = tCurrenParrallel + item.stackSize - tMaxParrallel; + int remainingStackSize = tCurrentParallel + item.stackSize - tMaxParallel; outputStackSizes.add(smeltedOutput.stackSize * (item.stackSize - remainingStackSize)); item.stackSize = remainingStackSize; break; } } - if (tCurrenParrallel == tMaxParrallel) { + if (tCurrentParallel == tMaxParallel) { break; } } @@ -235,7 +235,11 @@ public class GT_MetaTileEntity_MultiFurnace if (mMaintenanceHatches.size() != 1) return false; - this.mLevel = getCoilLevel().getLevel(); + if (getCoilLevel().getHeat() < 9000) { + this.mLevel = 8 * getCoilLevel().getLevel(); + } else { + this.mLevel = 1 << (getCoilLevel().getTier()); + } this.mCostDiscount = getCoilLevel().getCostDiscount(); return true; } @@ -297,7 +301,7 @@ public class GT_MetaTileEntity_MultiFurnace + ": " + EnumChatFormatting.YELLOW + mEfficiency / 100.0F + EnumChatFormatting.RESET + " %", StatCollector.translateToLocal("GT5U.MS.multismelting") + ": " + EnumChatFormatting.GREEN - + mLevel * 8 + EnumChatFormatting.RESET + " Discount: (EU/t) / " + + mLevel + EnumChatFormatting.RESET + " Discount: (EU/t) / " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mCostDiscount) + EnumChatFormatting.RESET, StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + EnumChatFormatting.GREEN + mPollutionReduction + EnumChatFormatting.RESET + " %" |