From 39038ac935e88bd5e8a9f880fc6153909d1b9745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Salom=C3=A3o?= <salomaoo@gmail.com>
Date: Wed, 12 May 2021 23:22:54 -0300
Subject: [PATCH] revert iitemrepository cache changes

---
 .../appeng/parts/misc/ItemHandlerAdapter.java |  2 +-
 .../parts/misc/ItemRepositoryAdapter.java     | 55 ++++---------------
 2 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java
index 4769445c2..2c57e27e3 100644
--- a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java
+++ b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java
@@ -93,7 +93,7 @@ class ItemHandlerAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<IAE
 			}
 			else if( countPos < countPre )
 			{
-				injectedList.add( Pair.of( i, countPos - countPre ) );
+				injectedList.add( Pair.of( i, countPre - countPos ) );
 			}
 		}
 
diff --git a/src/main/java/appeng/parts/misc/ItemRepositoryAdapter.java b/src/main/java/appeng/parts/misc/ItemRepositoryAdapter.java
index d3b12fac4..caa6291e0 100644
--- a/src/main/java/appeng/parts/misc/ItemRepositoryAdapter.java
+++ b/src/main/java/appeng/parts/misc/ItemRepositoryAdapter.java
@@ -68,32 +68,14 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         if( type == Actionable.MODULATE )
         {
-            if( this.cache.cachedAeStacks.length == 0 ) this.cache.update();
-            boolean found = false;
-            for( IAEItemStack iaeItemStack : this.cache.cachedAeStacks )
+            try
             {
-                if( iaeItemStack == null )
-                {
-                    continue;
-                }
-                if( iaeItemStack.equals( iox ) )
-                {
-                    found = true;
-                    iaeItemStack.incStackSize( iox.getStackSize() );
-                }
+                this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
             }
-            if( !found )
+            catch( GridAccessException ex )
             {
-                this.cache.cachedAeStacks = Arrays.copyOf( this.cache.cachedAeStacks, this.cache.cachedAeStacks.length + 1 );
-                IAEItemStack inserted = iox.copy();
-                if (remaining.isEmpty())
-                {
-                    this.cache.cachedAeStacks[this.cache.cachedAeStacks.length - 1] = inserted;
-                } else {
-                    this.cache.cachedAeStacks[this.cache.cachedAeStacks.length - 1] = inserted.setStackSize( iox.getStackSize() - remaining.getCount() );
-                }
+                // meh
             }
-
         }
 
         return AEItemStack.fromItemStack( remaining );
@@ -108,8 +90,7 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         final boolean simulate = ( mode == Actionable.SIMULATE );
 
-        ItemStack extracted;
-        extracted = this.itemRepository.extractItem( requestedItemStack, remainingSize, simulate );
+        ItemStack extracted = this.itemRepository.extractItem( requestedItemStack, remainingSize, simulate );
 
         if( extracted.getCount() > remainingSize )
         {
@@ -122,33 +103,19 @@ class ItemRepositoryAdapter implements IMEInventory<IAEItemStack>, IBaseMonitor<
 
         if( !extracted.isEmpty() )
         {
-            if (this.cache.cachedAeStacks.length == 0) this.cache.update();
-            IAEItemStack iaeExtracted = AEItemStack.fromItemStack( extracted );
-
             if( mode == Actionable.MODULATE )
             {
-                for ( int i = 0; i < this.cache.cachedAeStacks.length; i++ )
+                try
                 {
-                    IAEItemStack iaeItemStack = this.cache.cachedAeStacks[i];
-                    if( iaeExtracted.isSameType( iaeItemStack ) )
-                    {
-                        if( iaeExtracted.getStackSize() >= iaeItemStack.getStackSize() )
-                        {
-                            iaeExtracted.decStackSize( iaeItemStack.getStackSize() );
-                            this.cache.cachedAeStacks[i] = null;
-                        }
-                        else
-                        {
-                            iaeItemStack.decStackSize( iaeExtracted.getStackSize() );
-                            break;
-                        }
-                    }
+                    this.proxyable.getProxy().getTick().alertDevice( this.proxyable.getProxy().getNode() );
+                }
+                catch( GridAccessException ex )
+                {
+                    // meh
                 }
             }
-
             return AEItemStack.fromItemStack( extracted );
         }
-
         return null;
     }