diff options
| author | Maxim <maxim235@gmx.de> | 2023-01-14 15:41:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-14 15:41:55 +0100 |
| commit | 834c0b4712a6e533df24d959a48d470db803cf78 (patch) | |
| tree | 12905658df092c420ff520e3764cced192485106 /src/main/java/gregtech/common | |
| parent | 63097af8f79d151617eb104e7dcfe28fdf1121e3 (diff) | |
| download | GT5-Unofficial-834c0b4712a6e533df24d959a48d470db803cf78.tar.gz GT5-Unofficial-834c0b4712a6e533df24d959a48d470db803cf78.tar.bz2 GT5-Unofficial-834c0b4712a6e533df24d959a48d470db803cf78.zip | |
Add connection type getter (#1652)
* Added connection type and getter
* Added getter for total eu
* Replace old getters
Diffstat (limited to 'src/main/java/gregtech/common')
2 files changed, 3 insertions, 9 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java index e6bd674beb..0694434137 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_NanoForge.java @@ -25,7 +25,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPowerMultiBlockBase; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ExoticEnergyInputHelper; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; @@ -253,9 +252,7 @@ public class GT_MetaTileEntity_NanoForge lEUt = 0; mOutputItems = null; mOutputFluids = null; - long tVoltage = GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList()); - long tAmps = GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(getExoticAndNormalEnergyHatchList()); - long tTotalEU = tVoltage * tAmps; + long tTotalEU = getMaxInputEu(); GT_Recipe tRecipe = map.findRecipe(getBaseMetaTileEntity(), null, false, false, tTotalEU, tFluidInputs, null, tItemInputs); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java index 42170779df..99b9bd26be 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PlasmaForge.java @@ -1098,10 +1098,7 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul protected boolean processRecipe(ItemStack[] tItems, FluidStack[] tFluids) { // Gets the EU input of the - long tVoltage = GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList()); - long tAmps = GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(getExoticAndNormalEnergyHatchList()); - - long tTotalEU = tVoltage * tAmps; + long tTotalEU = GT_ExoticEnergyInputHelper.getTotalEuMulti(getExoticAndNormalEnergyHatchList()); // Hacky method to determine if double energy hatches are being used. if (getExoticAndNormalEnergyHatchList().get(0) instanceof GT_MetaTileEntity_Hatch_Energy) { @@ -1282,7 +1279,7 @@ public class GT_MetaTileEntity_PlasmaForge extends GT_MetaTileEntity_AbstractMul GT_ExoticEnergyInputHelper.getMaxInputVoltageMulti(getExoticAndNormalEnergyHatchList())) + EnumChatFormatting.RESET + " EU/t(*" + EnumChatFormatting.YELLOW + GT_Utility.formatNumbers( - GT_ExoticEnergyInputHelper.getMaxInputAmpsMulti(getExoticAndNormalEnergyHatchList())) + GT_ExoticEnergyInputHelper.getMaxWorkingInputAmpsMulti(getExoticAndNormalEnergyHatchList())) + EnumChatFormatting.RESET + "A) " + StatCollector.translateToLocal("GT5U.machines.tier") + ": " + EnumChatFormatting.YELLOW + VN[ |