diff --git a/src/main/java/gripe/_90/appliede/AppliedEConfig.java b/src/main/java/gripe/_90/appliede/AppliedEConfig.java index b16518d..a2a6052 100644 --- a/src/main/java/gripe/_90/appliede/AppliedEConfig.java +++ b/src/main/java/gripe/_90/appliede/AppliedEConfig.java @@ -21,8 +21,7 @@ public class AppliedEConfig { private AppliedEConfig(ForgeConfigSpec.Builder builder) { moduleEnergyUsage = builder.comment("The amount of AE energy per tick used by the ME Transmutation Module.") .defineInRange("moduleEnergyUsage", 25.0, 0, Double.MAX_VALUE); - transmutationPowerMultiplier = builder.comment( - "The amount of AE energy used to transmute 1 EMC through the ME Transmutation Module.") + transmutationPowerMultiplier = builder.comment("The amount of AE energy used to transmute items, per 2000 EMC.") .defineInRange("transmutationPowerMultiplier", 1.0, 0, Double.MAX_VALUE); emcPerByte = builder.comment( "The number of EMC units (of any tier) per byte as used in AE2 auto-crafting.", diff --git a/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java b/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java index 00785f2..c771c2b 100644 --- a/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java +++ b/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java @@ -24,6 +24,7 @@ import gripe._90.appliede.AppliedE; import gripe._90.appliede.AppliedEConfig; import gripe._90.appliede.me.key.EMCKey; +import gripe._90.appliede.me.key.EMCKeyType; import gripe._90.appliede.menu.TransmutationTerminalMenu; import moze_intel.projecte.api.ItemInfo; @@ -323,7 +324,8 @@ private List getProvidersForExtraction(IActionSource source) private long getAmountAfterPowerExpenditure(BigInteger maxEmc, BigInteger itemEmc) { var energyService = service.getGrid().getEnergyService(); var multiplier = BigDecimal.valueOf(PowerMultiplier.CONFIG.multiplier) - .multiply(BigDecimal.valueOf(AppliedEConfig.CONFIG.getTransmutationPowerMultiplier())); + .multiply(BigDecimal.valueOf(AppliedEConfig.CONFIG.getTransmutationPowerMultiplier())) + .divide(BigDecimal.valueOf(EMCKeyType.TYPE.getAmountPerOperation()), 4, RoundingMode.HALF_UP); var toExpend = new BigDecimal(maxEmc).multiply(multiplier).min(BigDecimal.valueOf(Double.MAX_VALUE)); var available = energyService.extractAEPower(toExpend.doubleValue(), Actionable.SIMULATE, PowerMultiplier.ONE);