Do not consume extra power when reinserting leftover EMC-exported items

62832 · Jun 25, 2024 · b179f9d · b179f9d
1 parent a918fe3
commit b179f9d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/src/main/java/gripe/_90/appliede/me/misc/LearnAllItemsPacket.java b/src/main/java/gripe/_90/appliede/me/misc/LearnAllItemsPacket.java
@@ -43,6 +43,7 @@ public void handle(Supplier<NetworkEvent.Context> context) {
                                             Actionable.MODULATE,
                                             IActionSource.ofPlayer(sender),
                                             true,
+                                            true,
                                             menu::showLearned);
 
                             var me = storage.getInventory();

diff --git a/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java b/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java
@@ -147,7 +147,13 @@ public long extract(AEKey what, long amount, Actionable mode, IActionSource sour
     }
 
     public long insertItem(
-            AEItemKey what, long amount, Actionable mode, IActionSource source, boolean mayLearn, Runnable onLearn) {
+            AEItemKey what,
+            long amount,
+            Actionable mode,
+            IActionSource source,
+            boolean mayLearn,
+            boolean consumePower,
+            Runnable onLearn) {
         if (amount <= 0 || service.getProviders().isEmpty()) {
             return 0;
         }
@@ -175,7 +181,9 @@ public long insertItem(
             var itemEmc = BigInteger.valueOf(IEMCProxy.INSTANCE.getSellValue(what.toStack()));
             var totalEmc = itemEmc.multiply(BigInteger.valueOf(amount));
 
-            amount = getAmountAfterPowerExpenditure(totalEmc, itemEmc);
+            if (consumePower) {
+                amount = getAmountAfterPowerExpenditure(totalEmc, itemEmc);
+            }
 
             if (amount == 0) {
                 return 0;
@@ -205,7 +213,7 @@ public long insertItem(
     }
 
     public long insertItem(AEItemKey what, long amount, Actionable mode, IActionSource source, boolean mayLearn) {
-        return insertItem(what, amount, mode, source, mayLearn, () -> {});
+        return insertItem(what, amount, mode, source, mayLearn, true, () -> {});
     }
 
     public long extractItem(AEItemKey what, long amount, Actionable mode, IActionSource source, boolean skipStored) {

diff --git a/src/main/java/gripe/_90/appliede/menu/TransmutationTerminalMenu.java b/src/main/java/gripe/_90/appliede/menu/TransmutationTerminalMenu.java
@@ -88,6 +88,7 @@ private int transmuteItem(ItemStack stack, boolean singleItem, Player player) {
                             Actionable.MODULATE,
                             IActionSource.ofPlayer(player),
                             true,
+                            true,
                             this::showLearned);
         }
 

diff --git a/src/main/java/gripe/_90/appliede/part/EMCExportBusPart.java b/src/main/java/gripe/_90/appliede/part/EMCExportBusPart.java
@@ -133,7 +133,8 @@ protected boolean doBusWork(IGrid grid) {
 
                         if (wasInserted < extracted) {
                             var leftover = extracted - wasInserted;
-                            leftover -= networkEmc.insertItem(item, leftover, Actionable.MODULATE, source, false);
+                            leftover -= networkEmc.insertItem(
+                                    item, leftover, Actionable.MODULATE, source, false, false, () -> {});
 
                             if (leftover > 0) {
                                 LOGGER.error(
-Original file line number
+Diff line change
@@ Expand Up @@
                                 Actionable.MODULATE,
                                 IActionSource.ofPlayer(player),
                                 true,
+                                true,
                                 this::showLearned);
             }
@@ Expand Down @@