diff options
| author | Alexandre Tardif <alexandre.b.tardif@gmail.com> | 2022-07-30 08:04:26 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-30 13:04:26 +0100 |
| commit | 5c5df02d043fb212f1e67dcd8846861a77af3187 (patch) | |
| tree | 2f2708787c9cbf9b167ab13945f72623d9e03051 /src | |
| parent | 372cf557dd4b0ee0e37b1a7a4c7c4feeccd8a550 (diff) | |
| download | GT5-Unofficial-5c5df02d043fb212f1e67dcd8846861a77af3187.tar.gz GT5-Unofficial-5c5df02d043fb212f1e67dcd8846861a77af3187.tar.bz2 GT5-Unofficial-5c5df02d043fb212f1e67dcd8846861a77af3187.zip | |
Fix plasma turbine fuel overflow (#1173)
* Allow PA to parallel over 64 for UEV+ machines
* Uncap parallel for locked recipes
* Fix fuel overflow for Plasma Turbines
Co-authored-by: Alexandre Tardif <alexandre.tardif@nexusinno.com>
Diffstat (limited to 'src')
2 files changed, 17 insertions, 10 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java index 8b907de989..05cb507511 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java @@ -128,16 +128,7 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_E * GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolSpeed * 50)); - int toolQualityLevel = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality; - if (toolQualityLevel >= 6) { - overflowMultiplier = 3; - } - else if (toolQualityLevel >= 3) { - overflowMultiplier = 2; - } - else { - overflowMultiplier = 1; - } + overflowMultiplier = getOverflowMultiplier(aStack); flowMultipliers[0] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mSteamMultiplier; flowMultipliers[1] = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mGasMultiplier; @@ -194,6 +185,21 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_E return aTotal; } + public int getOverflowMultiplier(ItemStack aStack) { + int aOverflowMultiplier = 0; + int toolQualityLevel = GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality; + if (toolQualityLevel >= 6) { + aOverflowMultiplier = 3; + } + else if (toolQualityLevel >= 3) { + aOverflowMultiplier = 2; + } + else { + aOverflowMultiplier = 1; + } + return aOverflowMultiplier; + } + @Override public int getDamageToComponent(ItemStack aStack) { return 1; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java index 10f14c18e2..01bf9118ca 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java @@ -193,6 +193,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar ((GT_MetaGenerated_Tool) aStack.getItem()).getToolStats(aStack).getSpeedMultiplier() * ((GT_MetaGenerated_Tool) aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed * 50)); + overflowMultiplier = getOverflowMultiplier(aStack); } else { counter++; } |