diff options
| author | BlueWeabo <ilia.iliev2005@gmail.com> | 2023-08-03 20:20:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-03 19:20:45 +0200 |
| commit | dea0915106c5314f25558f90c1958ff62365a806 (patch) | |
| tree | 3207d245c489709a1d683435740a5ebd3c1fb7d1 /src/main | |
| parent | 86501313b382363047748e5b44c86db76ebb2370 (diff) | |
| download | GT5-Unofficial-dea0915106c5314f25558f90c1958ff62365a806.tar.gz GT5-Unofficial-dea0915106c5314f25558f90c1958ff62365a806.tar.bz2 GT5-Unofficial-dea0915106c5314f25558f90c1958ff62365a806.zip | |
fix Steam multiblocks not having their parallel (#712)
Diffstat (limited to 'src/main')
3 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java index ed1765dfd3..43a06d912e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java @@ -74,7 +74,10 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override protected void setProcessingLogicPower(ProcessingLogic logic) { logic.setAvailableVoltage(V[1]); - logic.setAvailableAmperage(1); + // We need to trick the GT_ParallelHelper we have enough amps for all recipe parallels, but also make sure we + // don't use them for overclocking so we will disable amperageOC + logic.setAvailableAmperage(getMaxParallelRecipes()); + logic.setAmperageOC(false); } public ArrayList<FluidStack> getAllSteamStacks() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java index 658a1db4a8..400889ad0b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamCompressor.java @@ -17,6 +17,7 @@ import com.gtnewhorizon.structurelib.structure.StructureDefinition; import gregtech.api.enums.Textures; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gregtech.api.logic.ProcessingLogic; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; @@ -119,4 +120,9 @@ public class GregtechMetaTileEntity_SteamCompressor return GT_Recipe.GT_Recipe_Map.sCompressorRecipes; } + @Override + protected ProcessingLogic createProcessingLogic() { + return super.createProcessingLogic().setMaxParallel(getMaxParallelRecipes()); + } + } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java index a08df17367..f4c37374e2 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/GregtechMetaTileEntity_SteamMacerator.java @@ -147,6 +147,6 @@ public class GregtechMetaTileEntity_SteamMacerator return items.toArray(new ItemStack[0]); }); } - }; + }.setMaxParallel(getMaxParallelRecipes()); } } |