Fix wonky source import logic, use proper canAccept/Provide metho…

…ds to check during import/export
62832 · Dec 24, 2024 · 44dc77c · 44dc77c
1 parent f51faf2
commit 44dc77c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/src/main/java/gripe/_90/arseng/me/strategy/SourceStorageExportStrategy.java b/src/main/java/gripe/_90/arseng/me/strategy/SourceStorageExportStrategy.java
@@ -43,7 +43,7 @@ public long transfer(StackTransferContext context, AEKey what, long amount) {
                     context.getActionSource(),
                     Actionable.MODULATE);
 
-            if (extracted > 0) {
+            if (extracted > 0 && sourceTile.canAcceptSource(extracted)) {
                 sourceTile.receiveSource(extracted, false);
             }
 

diff --git a/src/main/java/gripe/_90/arseng/me/strategy/SourceStorageImportStrategy.java b/src/main/java/gripe/_90/arseng/me/strategy/SourceStorageImportStrategy.java
@@ -46,30 +46,29 @@ public boolean transfer(StackTransferContext context) {
         var inv = context.getInternalStorage().getInventory();
 
         // Check how much source we can actually insert
-        var amount = inv.insert(SourceKey.KEY, rawAmount, Actionable.SIMULATE, context.getActionSource());
+        var amount = (int) inv.insert(SourceKey.KEY, rawAmount, Actionable.SIMULATE, context.getActionSource());
 
-        if (amount > 0) {
-            sourceTile.extractSource((int) amount, false);
-        }
+        if (amount > 0 && sourceTile.canProvideSource(amount)) {
+            sourceTile.extractSource(amount, false);
+            var inserted = inv.insert(SourceKey.KEY, amount, Actionable.MODULATE, context.getActionSource());
 
-        var inserted = inv.insert(SourceKey.KEY, amount, Actionable.MODULATE, context.getActionSource());
+            if (inserted < amount) {
+                var leftover = amount - inserted;
+                var backFill = (int) Math.min(leftover, sourceTile.getSourceCapacity() - sourceTile.getSource());
 
-        if (inserted < amount) {
-            var leftover = amount - inserted;
-            var backFill = (int) Math.min(leftover, sourceTile.getSourceCapacity() - sourceTile.getSource());
+                if (backFill > 0) {
+                    sourceTile.receiveSource(backFill, false);
+                }
 
-            if (backFill > 0) {
-                sourceTile.receiveSource(backFill, false);
+                if (leftover > backFill) {
+                    LOGGER.error("Storage import issue, voided {} source.", leftover - backFill);
+                }
             }
 
-            if (leftover > backFill) {
-                LOGGER.error("Storage import issue, voided {} source.", leftover - backFill);
-            }
+            var opsUsed = Math.max(1, inserted / SourceKeyType.TYPE.getAmountPerOperation());
+            context.reduceOperationsRemaining(opsUsed);
         }
 
-        var opsUsed = Math.max(1, inserted / SourceKeyType.TYPE.getAmountPerOperation());
-        context.reduceOperationsRemaining(opsUsed);
-
         return amount > 0;
     }
 }