move gtce blocking code out of generic item adaptor

fixes crash with ae2 fluid crafting
This commit is contained in:
Salomão
2020-10-25 00:48:53 -03:00
parent 00e19d67a2
commit 719ea5090b
7 changed files with 107 additions and 45 deletions
@@ -69,8 +69,6 @@ public abstract class InventoryAdaptor implements Iterable<ItemSlot>
public abstract ItemStack simulateRemove( int amount, ItemStack filter, IInventoryDestination destination );
public abstract boolean canRemoveAllExceptCircuits();
// return what was extracted.
public abstract ItemStack removeSimilarItems( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination );
@@ -84,4 +82,5 @@ public abstract class InventoryAdaptor implements Iterable<ItemSlot>
public abstract boolean containsItems();
public abstract boolean hasSlots();
}
@@ -21,7 +21,6 @@ package appeng.util.inv;
import java.util.Iterator;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
@@ -32,7 +31,6 @@ import appeng.util.Platform;
public class AdaptorItemHandler extends InventoryAdaptor
{
final static ItemStack integratedCircuit = new ItemStack((Item.getByNameOrId("gregtech:meta_item_1")),1,32766); // Gregtech Community Edition Integrated Circuit
protected final IItemHandler itemHandler;
public AdaptorItemHandler( IItemHandler itemHandler )
@@ -267,17 +265,4 @@ public class AdaptorItemHandler extends InventoryAdaptor
return new ItemHandlerIterator( this.itemHandler );
}
@Override
public boolean canRemoveAllExceptCircuits()
{
int slots = this.itemHandler.getSlots();
for( int slot = 0; slot < slots; slot++ )
{
ItemStack is = this.itemHandler.getStackInSlot( slot );
if ( is.isEmpty() || is.isItemEqual(integratedCircuit)) continue;
return false;
}
return true;
}
}
@@ -226,9 +226,4 @@ public class AdaptorList extends InventoryAdaptor
return new StackToSlotIterator( this.i.iterator() );
}
@Override
public boolean canRemoveAllExceptCircuits() {
return false;
}
}
@@ -204,9 +204,4 @@ public class IMEAdaptor extends InventoryAdaptor
this.maxSlots = maxSlots;
}
@Override
public boolean canRemoveAllExceptCircuits() {
return false;
}
}