From c549b77542d4af93c44c2921ca11ac8bfb25ae60 Mon Sep 17 00:00:00 2001 From: BlueWeabo Date: Sat, 5 Aug 2023 10:39:23 +0300 Subject: Fix steam multis now overclocking recipes which consume 2 eu/t (#715) * fix steam multis now overclocking recipes which consume 2 eu/t * remove unneeded comment part --- .../steam/GregtechMetaTileEntity_SteamCompressor.java | 14 +++++++++++++- .../steam/GregtechMetaTileEntity_SteamMacerator.java | 10 ++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common') 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 400889ad0b..0e396c5782 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 @@ -7,8 +7,12 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.GregTech_API.sBlockCasings1; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; +import javax.annotation.Nonnull; + import net.minecraft.item.ItemStack; +import org.jetbrains.annotations.NotNull; + import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; @@ -20,6 +24,7 @@ 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_OverclockCalculator; import gregtech.api.util.GT_Recipe; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_SteamMultiBase; @@ -122,7 +127,14 @@ public class GregtechMetaTileEntity_SteamCompressor @Override protected ProcessingLogic createProcessingLogic() { - return super.createProcessingLogic().setMaxParallel(getMaxParallelRecipes()); + return new ProcessingLogic() { + + @Override + @Nonnull + protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + return GT_OverclockCalculator.ofNoOverclock(recipe); + } + }.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 f4c37374e2..82190dc6d0 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 @@ -13,6 +13,8 @@ import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; +import org.jetbrains.annotations.NotNull; + import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.ISurvivalBuildEnvironment; @@ -26,6 +28,7 @@ import gregtech.api.logic.ProcessingLogic; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.objects.XSTR; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; +import gregtech.api.util.GT_OverclockCalculator; import gregtech.api.util.GT_ParallelHelper; import gregtech.api.util.GT_Recipe; import gtPlusPlus.core.lib.CORE; @@ -147,6 +150,13 @@ public class GregtechMetaTileEntity_SteamMacerator return items.toArray(new ItemStack[0]); }); } + + @Override + @Nonnull + protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) { + return GT_OverclockCalculator.ofNoOverclock(recipe); + } + }.setMaxParallel(getMaxParallelRecipes()); } } -- cgit