From 8806e6231083e0099a1fd569a9b76a605d50c247 Mon Sep 17 00:00:00 2001 From: Maxim Date: Thu, 12 Jan 2023 18:53:22 +0100 Subject: Implement working amps to remove the hack (#494) * Implement working amps to remove the hack * Use long base function instead of helper * Updated dep * Also yeet hack from QFT --- .../production/GregtechMetaTileEntity_QuantumForceTransformer.java | 3 +-- .../mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/main') diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java index 1b300b26b0..2f06dafaad 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_QuantumForceTransformer.java @@ -717,8 +717,7 @@ public class GregtechMetaTileEntity_QuantumForceTransformer ItemStack[] aItemInputs, FluidStack[] aFluidInputs, GT_Recipe.GT_Recipe_Map aRecipeMap, ItemStack aStack) { int hatches = getExoticAndNormalEnergyHatchList().size(); long tVoltage = getMaxInputVoltage() / hatches; - // Need to check weather the hatches used are TT ones or not as TT hatches can request 20% more amps - long tAmps = (long) Math.floor(mExoticEnergyHatches.isEmpty() ? getMaxInputAmps() : getMaxInputAmps() * 0.80); + long tAmps = getMaxInputAmps(); long tTotalEUt = tVoltage * tAmps; byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); GT_Recipe tRecipe = aRecipeMap diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java index 2da3fc6acf..a173ca4c36 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/mega/GregTechMetaTileEntity_MegaAlloyBlastSmelter.java @@ -363,9 +363,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter if (tItems.length <= 0 && tFluids.length <= 0) return false; long tVoltage = this.getMaxInputVoltage() / this.getExoticAndNormalEnergyHatchList().size(); - long tAmps = (long) (GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(this.getExoticEnergyHatches()) * 0.8D - + GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti( - this.mEnergyHatches)); // Use 80% of the available amps for exotic hatches to get working amps + long tAmps = this.getMaxInputAmps(); long tTotalEU = tVoltage * tAmps; GT_Recipe recipe = getRecipeMap().findRecipe(getBaseMetaTileEntity(), false, tTotalEU, tFluids, tItems); @@ -537,8 +535,7 @@ public class GregTechMetaTileEntity_MegaAlloyBlastSmelter + GT_Utility.formatNumbers( GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList())) + EnumChatFormatting.RESET + " EU/t(*" + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers( - GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(getExoticAndNormalEnergyHatchList())) + + GT_Utility.formatNumbers(this.getMaxInputAmps()) + EnumChatFormatting.RESET + "A) " + StatCollector.translateToLocal("GT5U.machines.tier") + ": " + EnumChatFormatting.YELLOW + GT_Values.VN[ -- cgit