fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix non-deterministic ME Interface behavior

Browse Source 
As a side effect, allows ME Interfaces to fully utilize allowed operations instead of doing at most 1 push per cycle
Closes #440
This commit is contained in:
NotMyWing
2024-05-24 19:05:06 +11:00
parent 5f20e3346c
commit 9f19e05592
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/helpers/DualityInterface.java
+12 -2
View File
@@ -978,6 +978,8 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
continue; continue;
} else { } else {
IMEMonitor<IAEItemStack> inv = sm.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class)); IMEMonitor<IAEItemStack> inv = sm.getInventory(AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class));
var allItemsCanBeInserted = true;
for (int x = 0; x < table.getSizeInventory(); x++) { for (int x = 0; x < table.getSizeInventory(); x++) {
final ItemStack is = table.getStackInSlot(x); final ItemStack is = table.getStackInSlot(x);
if (is.isEmpty()) { if (is.isEmpty()) {
@@ -985,9 +987,16 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
} }
IAEItemStack result = inv.injectItems(AEItemStack.fromItemStack(is), Actionable.SIMULATE, this.mySource); IAEItemStack result = inv.injectItems(AEItemStack.fromItemStack(is), Actionable.SIMULATE, this.mySource);
if (result != null) { if (result != null) {
return false; allItemsCanBeInserted = false;
break;
} }
} }
if (!allItemsCanBeInserted) {
continue;
}
this.visitedFaces.clear();
for (int x = 0; x < table.getSizeInventory(); x++) { for (int x = 0; x < table.getSizeInventory(); x++) {
final ItemStack is = table.getStackInSlot(x); final ItemStack is = table.getStackInSlot(x);
if (!is.isEmpty()) { if (!is.isEmpty()) {
@@ -995,6 +1004,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
} }
} }
pushItemsOut(s); pushItemsOut(s);
return true; return true;
} }
} }
@@ -1044,7 +1054,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn
} }
if (this.acceptsItems(ad, table)) { if (this.acceptsItems(ad, table)) {
visitedFaces.remove(s); this.visitedFaces.clear();
for (int x = 0; x < table.getSizeInventory(); x++) { for (int x = 0; x < table.getSizeInventory(); x++) {
final ItemStack is = table.getStackInSlot(x); final ItemStack is = table.getStackInSlot(x);
if (!is.isEmpty()) { if (!is.isEmpty()) {