From f5378e060e7e4dd4194a3fce1043a0306f8130de Mon Sep 17 00:00:00 2001 From: PrototypeTrousers Date: Sat, 29 Jan 2022 17:21:12 -0300 Subject: [PATCH] fix importing from storage drawers --- .../util/inv/AdaptorItemRepository.java | 308 +++++++++--------- 1 file changed, 154 insertions(+), 154 deletions(-) diff --git a/src/main/java/appeng/util/inv/AdaptorItemRepository.java b/src/main/java/appeng/util/inv/AdaptorItemRepository.java index c9b71358b..86f5db69e 100644 --- a/src/main/java/appeng/util/inv/AdaptorItemRepository.java +++ b/src/main/java/appeng/util/inv/AdaptorItemRepository.java @@ -12,198 +12,198 @@ import java.util.Iterator; public class AdaptorItemRepository extends InventoryAdaptor { - protected final IItemRepository itemRepository; + protected final IItemRepository itemRepository; - public AdaptorItemRepository( IItemRepository itemRepository ) - { - this.itemRepository = itemRepository; - } + public AdaptorItemRepository( IItemRepository itemRepository ) + { + this.itemRepository = itemRepository; + } - @Override - public ItemStack removeItems( int amount, ItemStack filter, IInventoryDestination destination ) - { - ItemStack rv = ItemStack.EMPTY; - ItemStack extracted = ItemStack.EMPTY; + @Override + public ItemStack removeItems( int amount, ItemStack filter, IInventoryDestination destination ) + { + ItemStack rv = ItemStack.EMPTY; + ItemStack extracted = ItemStack.EMPTY; - if( !filter.isEmpty() ) - { - extracted = this.itemRepository.extractItem( filter, amount, true ); - } - else - { - for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() ) - { - extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true ); - if( !extracted.isEmpty() ) - { - break; - } - } - } + if( !filter.isEmpty() ) + { + extracted = this.itemRepository.extractItem( filter, amount, true ); + } + else + { + for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() ) + { + extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true ); + if( !extracted.isEmpty() ) + { + break; + } + } + } - if( destination != null ) - { + if( destination != null ) + { - if( extracted.isEmpty() || !destination.canInsert( extracted ) ) - { - return rv; - } + if( extracted.isEmpty() || !destination.canInsert( extracted ) ) + { + return rv; + } - } + } - extracted = this.itemRepository.extractItem( filter, amount, false ); + extracted = this.itemRepository.extractItem( filter.isEmpty() ? extracted : filter, amount, false ); - return extracted; - } + return extracted; + } - @Override - public ItemStack simulateRemove( int amount, ItemStack filter, IInventoryDestination destination ) - { - ItemStack rv = ItemStack.EMPTY; - ItemStack extracted = ItemStack.EMPTY; + @Override + public ItemStack simulateRemove( int amount, ItemStack filter, IInventoryDestination destination ) + { + ItemStack rv = ItemStack.EMPTY; + ItemStack extracted = ItemStack.EMPTY; - if( !filter.isEmpty() ) - { - extracted = this.itemRepository.extractItem( filter, amount, true ); - } - else - { - for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() ) - { - extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true ); - if( !extracted.isEmpty() ) - { - break; - } - } - } + if( !filter.isEmpty() ) + { + extracted = this.itemRepository.extractItem( filter, amount, true ); + } + else + { + for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() ) + { + extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true ); + if( !extracted.isEmpty() ) + { + break; + } + } + } - if( destination != null ) - { + if( destination != null ) + { - if( extracted.isEmpty() || !destination.canInsert( extracted ) ) - { - return rv; - } + if( extracted.isEmpty() || !destination.canInsert( extracted ) ) + { + return rv; + } - } + } - return extracted; - } + return extracted; + } - @Override - public ItemStack removeSimilarItems( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination ) - { - ItemStack rv = ItemStack.EMPTY; - ItemStack extracted = ItemStack.EMPTY; + @Override + public ItemStack removeSimilarItems( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination ) + { + ItemStack rv = ItemStack.EMPTY; + ItemStack extracted = ItemStack.EMPTY; - for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() ) - { - if( Platform.itemComparisons().isFuzzyEqualItem( record.itemPrototype, filter, fuzzyMode ) ) - { - extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true ); - } + for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() ) + { + if( Platform.itemComparisons().isFuzzyEqualItem( record.itemPrototype, filter, fuzzyMode ) ) + { + extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true ); + } - if( !extracted.isEmpty() ) - { - break; - } - } + if( !extracted.isEmpty() ) + { + break; + } + } - if( destination != null ) - { + if( destination != null ) + { - if( extracted.isEmpty() || !destination.canInsert( extracted ) ) - { - return rv; - } + if( extracted.isEmpty() || !destination.canInsert( extracted ) ) + { + return rv; + } - } + } - extracted = this.itemRepository.extractItem( extracted, amount, false ); + extracted = this.itemRepository.extractItem( extracted, amount, false ); - return extracted; - } + return extracted; + } - @Override - public ItemStack simulateSimilarRemove( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination ) - { - ItemStack rv = ItemStack.EMPTY; - ItemStack extracted = ItemStack.EMPTY; + @Override + public ItemStack simulateSimilarRemove( int amount, ItemStack filter, FuzzyMode fuzzyMode, IInventoryDestination destination ) + { + ItemStack rv = ItemStack.EMPTY; + ItemStack extracted = ItemStack.EMPTY; - for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() ) - { - if( Platform.itemComparisons().isFuzzyEqualItem( record.itemPrototype, filter, fuzzyMode ) ) - { - extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true ); - } + for( IItemRepository.ItemRecord record : this.itemRepository.getAllItems() ) + { + if( Platform.itemComparisons().isFuzzyEqualItem( record.itemPrototype, filter, fuzzyMode ) ) + { + extracted = this.itemRepository.extractItem( record.itemPrototype, amount, true ); + } - if( !extracted.isEmpty() ) - { - break; - } - } + if( !extracted.isEmpty() ) + { + break; + } + } - if( destination != null ) - { + if( destination != null ) + { - if( extracted.isEmpty() || !destination.canInsert( extracted ) ) - { - return rv; - } + if( extracted.isEmpty() || !destination.canInsert( extracted ) ) + { + return rv; + } - } + } - return extracted; - } + return extracted; + } - @Override - public ItemStack addItems( ItemStack toBeAdded ) - { - return this.addItems( toBeAdded, false ); - } + @Override + public ItemStack addItems( ItemStack toBeAdded ) + { + return this.addItems( toBeAdded, false ); + } - protected ItemStack addItems( final ItemStack itemsToAdd, final boolean simulate ) - { - if( itemsToAdd.isEmpty() ) - { - return ItemStack.EMPTY; - } + protected ItemStack addItems( final ItemStack itemsToAdd, final boolean simulate ) + { + if( itemsToAdd.isEmpty() ) + { + return ItemStack.EMPTY; + } - ItemStack left = itemsToAdd.copy(); + ItemStack left = itemsToAdd.copy(); - left = this.itemRepository.insertItem( left, simulate ); + left = this.itemRepository.insertItem( left, simulate ); - if( left.isEmpty() ) - { - return ItemStack.EMPTY; - } + if( left.isEmpty() ) + { + return ItemStack.EMPTY; + } - return left; - } + return left; + } - @Override - public ItemStack simulateAdd( ItemStack toBeSimulated ) - { - return this.addItems( toBeSimulated, true ); - } + @Override + public ItemStack simulateAdd( ItemStack toBeSimulated ) + { + return this.addItems( toBeSimulated, true ); + } - @Override - public boolean containsItems() - { - return !this.itemRepository.getAllItems().isEmpty(); - } + @Override + public boolean containsItems() + { + return !this.itemRepository.getAllItems().isEmpty(); + } - @Override - public boolean hasSlots() - { - return true; - } + @Override + public boolean hasSlots() + { + return true; + } - @Override - public Iterator iterator() - { - return null; - } + @Override + public Iterator iterator() + { + return null; + } }