From ebefc70b6d41c19c61fc21f548a942a0331f7fb6 Mon Sep 17 00:00:00 2001 From: joegnis Date: Wed, 4 Sep 2024 06:53:16 -0400 Subject: Fixes #17207 (#3041) Changed methods in OverclockCalculator: - setEUtDiscount - setSpeedBoost - setHeatDiscountMultiplier Most of other changes are directly related to them. Adds a unit test. Co-authored-by: boubou19 --- .../blocks/tileEntity/MTEComponentAssemblyLine.java | 4 ++-- .../blocks/tileEntity/MTEPreciseAssembler.java | 2 +- .../java/gregtech/api/logic/AbstractProcessingLogic.java | 8 ++++---- src/main/java/gregtech/api/util/OverclockCalculator.java | 6 +++--- src/main/java/gregtech/api/util/ParallelHelper.java | 4 ++-- .../tileentities/machines/multi/MTEPCBFactory.java | 6 +++--- .../multi/processing/MTEIndustrialAlloySmelter.java | 2 +- .../multi/processing/steam/MTESteamCentrifuge.java | 4 ++-- .../multi/processing/steam/MTESteamCompressor.java | 4 ++-- .../multi/processing/steam/MTESteamForgeHammer.java | 4 ++-- .../multi/processing/steam/MTESteamMacerator.java | 4 ++-- .../machines/multi/processing/steam/MTESteamMixer.java | 4 ++-- .../machines/multi/processing/steam/MTESteamWasher.java | 4 ++-- .../multi/production/MTEIndustrialRockBreaker.java | 4 ++-- .../multi/production/mega/MTEMegaAlloyBlastSmelter.java | 6 +++--- .../gregtech/multiblock/MTEDEFusionCrafter.java | 2 +- .../multi/godforge_modules/MTEBaseModule.java | 16 ++++++++-------- src/main/java/tectech/util/GodforgeMath.java | 2 +- 18 files changed, 43 insertions(+), 43 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java index 6110cf6eeb..6485f0769a 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEComponentAssemblyLine.java @@ -50,7 +50,7 @@ public class MTEComponentAssemblyLine extends MTEExtendedPowerMultiBlockBase STRUCTURE_DEFINITION = StructureDefinition .builder() @@ -321,7 +321,7 @@ public class MTEComponentAssemblyLine extends MTEExtendedPowerMultiBlockBase mode == 0 ? 1 : (int) Math.pow(2, 4 + (casingTier + 1))); } diff --git a/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java b/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java index ed953d9477..af86e7a9fa 100644 --- a/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java +++ b/src/main/java/gregtech/api/logic/AbstractProcessingLogic.java @@ -39,8 +39,8 @@ public abstract class AbstractProcessingLogic

maxParallelSupplier; protected int calculatedParallels = 0; protected int batchSize = 1; - protected float euModifier = 1.0f; - protected float speedBoost = 1.0f; + protected double euModifier = 1.0; + protected double speedBoost = 1.0; protected boolean amperageOC = true; protected boolean isCleanroom; @@ -100,12 +100,12 @@ public abstract class AbstractProcessingLogic

@Override protected OverclockCalculator createOverclockCalculator(@Nonnull GTRecipe recipe) { return super.createOverclockCalculator(recipe).setNoOverclock(isNoOC()) - .setEUtDiscount((float) Math.sqrt(mUpgradesInstalled == 0 ? 1 : mUpgradesInstalled)) + .setEUtDiscount(Math.sqrt(mUpgradesInstalled == 0 ? 1 : mUpgradesInstalled)) .setSpeedBoost(getDurationMultiplierFromRoughness()) .setDurationDecreasePerOC(mOCTier2 ? 4.0 : 2.0); } @@ -590,8 +590,8 @@ public class MTEPCBFactory extends MTEExtendedPowerMultiBlockBase return !mOCTier1 && !mOCTier2; } - private float getDurationMultiplierFromRoughness() { - return (float) Math.pow(mRoughnessMultiplier, 2); + private double getDurationMultiplierFromRoughness() { + return Math.pow(mRoughnessMultiplier, 2); } private int ticker = 0; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java index ed14343fa3..db36800f42 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialAlloySmelter.java @@ -195,7 +195,7 @@ public class MTEIndustrialAlloySmelter extends GTPPMultiBlockBase im @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33F) - .setSpeedBoost(1.5F); + .setEUtDiscount(1.33) + .setSpeedBoost(1.5); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java index 9588a5d11a..d924f13f49 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamCompressor.java @@ -253,8 +253,8 @@ public class MTESteamCompressor extends MTESteamMultiBase im @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33F) - .setSpeedBoost(1.5F); + .setEUtDiscount(1.33) + .setSpeedBoost(1.5); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java index 76e3ade135..128a021826 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamForgeHammer.java @@ -306,8 +306,8 @@ public class MTESteamForgeHammer extends MTESteamMultiBase @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33F) - .setSpeedBoost(1.5F); + .setEUtDiscount(1.33) + .setSpeedBoost(1.5); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java index 43e6245557..2c9c64be28 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMacerator.java @@ -255,8 +255,8 @@ public class MTESteamMacerator extends MTESteamMultiBase impl @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33F) - .setSpeedBoost(1.5F); + .setEUtDiscount(1.33) + .setSpeedBoost(1.5); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java index 1fc6e55042..9fa16b0f65 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamMixer.java @@ -353,8 +353,8 @@ public class MTESteamMixer extends MTESteamMultiBase implements I @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33F) - .setSpeedBoost(1.5F); + .setEUtDiscount(1.33) + .setSpeedBoost(1.5); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java index 438a762da6..c1b1b8dcb6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/steam/MTESteamWasher.java @@ -331,8 +331,8 @@ public class MTESteamWasher extends MTESteamMultiBase implements @Nonnull protected OverclockCalculator createOverclockCalculator(@NotNull GTRecipe recipe) { return OverclockCalculator.ofNoOverclock(recipe) - .setEUtDiscount(1.33F) - .setSpeedBoost(1.5F); + .setEUtDiscount(1.33) + .setSpeedBoost(1.5); } }.setMaxParallelSupplier(this::getMaxParallelRecipes); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java index 4b91b42d9f..0adfa82732 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/MTEIndustrialRockBreaker.java @@ -316,8 +316,8 @@ public class MTEIndustrialRockBreaker extends GTPPMultiBlockBase STRUCTURE_DEFINITION = StructureDefinition @@ -254,7 +254,7 @@ public class MTEMegaAlloyBlastSmelter extends MTEExtendedPowerMultiBlockBase