Re-add power consumption for inserted/extracted EMC items

62832 · Jun 7, 2024 · c3d2a73 · c3d2a73
1 parent c268a0d
commit c3d2a73
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java b/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java
@@ -175,6 +175,12 @@ public long insertItem(
             var itemEmc = BigInteger.valueOf(IEMCProxy.INSTANCE.getSellValue(what.toStack()));
             var totalEmc = itemEmc.multiply(BigInteger.valueOf(amount));
 
+            amount = getAmountAfterPowerExpenditure(totalEmc, itemEmc);
+
+            if (amount == 0) {
+                return 0;
+            }
+
             var providers = new ArrayList<>(service.getProviders());
             Collections.shuffle(providers);
             distributeEmc(totalEmc, providers);
@@ -221,13 +227,20 @@ public long extractItem(AEItemKey what, long amount, Actionable mode, IActionSou
         var itemEmc = BigInteger.valueOf(IEMCProxy.INSTANCE.getValue(what.toStack()));
         var totalEmc = itemEmc.multiply(BigInteger.valueOf(amount));
 
+        var providers = getProvidersForExtraction(source);
+        var availableEmc = totalEmc.min(
+                providers.equals(service.getProviders())
+                        ? service.getEmc()
+                        : providers.get(0).getEmc());
+
+        amount = availableEmc.divide(itemEmc).longValue();
+
+        if (amount == 0) {
+            return 0;
+        }
+
         if (mode == Actionable.MODULATE) {
-            var providers = getProvidersForExtraction(source);
-            var availableEmc = totalEmc.min(
-                    providers.equals(service.getProviders())
-                            ? service.getEmc()
-                            : providers.get(0).getEmc());
-            amount = availableEmc.divide(itemEmc).longValue();
+            amount = getAmountAfterPowerExpenditure(availableEmc, itemEmc);
 
             if (amount == 0) {
                 return 0;
@@ -292,7 +305,6 @@ private List<IKnowledgeProvider> getProvidersForExtraction(IActionSource source)
         return providers;
     }
 
-    // FIXME
     private long getAmountAfterPowerExpenditure(BigInteger maxEmc, BigInteger itemEmc) {
         var energyService = service.getGrid().getEnergyService();
         var multiplier = BigDecimal.valueOf(PowerMultiplier.CONFIG.multiplier);