From 46955643b9f8c27ebc8bbad962001503ceee9c08 Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Sun, 28 Jun 2020 13:28:14 +0200 Subject: [PATCH] Utils ported --- build.gradle | 1 + .../main/java/appeng/util/BlockUpdate.java | 0 .../java/appeng/util/ClassInstantiation.java | 0 .../main/java/appeng/util/ConfigManager.java | 0 .../main/java/appeng/util/EnumCycler.java | 0 .../main/java/appeng/util/FakePlayer.java | 0 .../java/appeng/util/IConfigManagerHost.java | 0 .../util/ISlimReadableNumberConverter.java | 0 .../util/IWideReadableNumberConverter.java | 0 .../main/java/appeng/util/IWorldCallable.java | 0 .../util/InWorldToolOperationResult.java | 0 .../java/appeng/util/InventoryAdaptor.java | 0 .../main/java/appeng/util/ItemSorters.java | 0 .../src}/main/java/appeng/util/Lazy.java | 0 .../main/java/appeng/util/LookDirection.java | 0 .../src}/main/java/appeng/util/Platform.java | 5 + .../java/appeng/util/ReadOnlyCollection.java | 0 .../appeng/util/ReadableNumberConverter.java | 0 .../main/java/appeng/util/SettingsFrom.java | 0 .../main/java/appeng/util/UUIDMatcher.java | 0 .../util/helpers/ItemComparisonHelper.java | 0 .../appeng/util/helpers/ItemHandlerUtil.java | 0 .../java/appeng/util/helpers/P2PHelper.java | 0 .../java/appeng/util/inv/AdaptorFixedInv.java | 0 .../util/inv/AdaptorItemHandlerPlayerInv.java | 0 .../java/appeng/util/inv/AdaptorList.java | 0 .../appeng/util/inv/IAEAppEngInventory.java | 0 .../util/inv/IInventoryDestination.java | 0 .../main/java/appeng/util/inv/IMEAdaptor.java | 0 .../appeng/util/inv/IMEAdaptorIterator.java | 0 .../util/inv/IMEInventoryDestination.java | 0 .../java/appeng/util/inv/InvOperation.java | 0 .../appeng/util/inv/ItemHandlerIterator.java | 0 .../util/inv/ItemListIgnoreCrafting.java | 0 .../main/java/appeng/util/inv/ItemSlot.java | 0 .../util/inv/WrapperChainedItemHandler.java | 0 .../util/inv/WrapperCursorItemHandler.java | 0 .../util/inv/WrapperFilteredItemHandler.java | 0 .../util/inv/WrapperInvItemHandler.java | 0 .../util/inv/WrapperSupplierItemHandler.java | 0 .../inv/filter/AEItemDefinitionFilter.java | 0 .../appeng/util/inv/filter/AEItemFilters.java | 0 .../appeng/util/inv/filter/IAEItemFilter.java | 0 .../java/appeng/util/item/AEItemStack.java | 0 .../appeng/util/item/AEItemStackRegistry.java | 0 .../appeng/util/item/AESharedItemStack.java | 0 .../main/java/appeng/util/item/AEStack.java | 0 .../appeng/util/item/AbstractItemList.java | 0 .../java/appeng/util/item/FuzzyItemList.java | 0 .../main/java/appeng/util/item/ItemList.java | 0 .../java/appeng/util/item/ItemModList.java | 0 .../util/item/MeaningfulItemIterator.java | 0 .../java/appeng/util/item/NullItemList.java | 0 .../java/appeng/util/item/StrictItemList.java | 0 .../util/iterators/ChainedIterator.java | 0 .../appeng/util/iterators/InvIterator.java | 0 .../appeng/util/iterators/NullIterator.java | 0 .../util/iterators/ProxyNodeIterator.java | 0 .../util/iterators/StackToSlotIterator.java | 0 .../prioritylist/DefaultPriorityList.java | 0 .../util/prioritylist/FuzzyPriorityList.java | 0 .../util/prioritylist/IPartitionList.java | 0 .../util/prioritylist/MergedPriorityList.java | 0 .../prioritylist/PrecisePriorityList.java | 0 .../block/paint/PaintSplotchesBlock.java | 2 +- .../block/spatial/MatrixFrameBlock.java | 6 +- .../InterfaceTerminalScreen.java | 4 +- .../appeng/container/AEBaseContainer.java | 20 +-- .../implementations/PatternTermContainer.java | 6 +- .../appeng/container/slot/AppEngSlot.java | 4 +- .../container/slot/CraftingTermSlot.java | 4 +- .../core/sync/packets/JEIRecipePacket.java | 4 +- .../java/appeng/debug/ItemGenBlockEntity.java | 2 +- .../appeng/fluids/helper/FluidCellConfig.java | 2 +- .../java/appeng/helpers/AEGlassMaterial.java | 8 +- .../java/appeng/helpers/DualityInterface.java | 12 +- .../appeng/helpers/InvalidPatternHelper.java | 6 +- .../java/appeng/helpers/PatternHelper.java | 6 +- .../modules/jei/RecipeTransferHandler.java | 4 +- .../implementations/CraftingCPUCluster.java | 12 +- src/main/java/appeng/parts/AEBasePart.java | 2 +- .../java/appeng/parts/CableBusStorage.java | 4 +- .../parts/automation/FormationPlanePart.java | 2 +- .../appeng/parts/p2p/ItemP2PTunnelPart.java | 4 +- .../reporting/ConversionMonitorPart.java | 2 +- .../parts/reporting/PatternTerminalPart.java | 4 +- .../tile/crafting/CraftingBlockEntity.java | 2 +- .../MolecularAssemblerBlockEntity.java | 20 +-- .../tile/grindstone/GrinderBlockEntity.java | 8 +- .../tile/inventory/AppEngCellInventory.java | 72 ++------ .../inventory/AppEngInternalAEInventory.java | 164 +++++++----------- .../inventory/AppEngInternalInventory.java | 103 +++++------ .../tile/misc/CellWorkbenchBlockEntity.java | 14 +- .../appeng/tile/misc/ChargerBlockEntity.java | 8 +- .../tile/misc/CondenserBlockEntity.java | 4 +- .../tile/misc/InscriberBlockEntity.java | 8 +- .../tile/misc/SecurityStationBlockEntity.java | 2 +- .../misc/VibrationChamberBlockEntity.java | 6 +- .../tile/networking/WirelessBlockEntity.java | 2 +- .../tile/qnb/QuantumBridgeBlockEntity.java | 4 +- .../spatial/SpatialIOPortBlockEntity.java | 6 +- .../appeng/tile/storage/ChestBlockEntity.java | 4 +- .../appeng/tile/storage/DriveBlockEntity.java | 4 +- .../tile/storage/IOPortBlockEntity.java | 6 +- .../appeng/util/iterators/AEInvIterator.java | 55 ------ 105 files changed, 239 insertions(+), 379 deletions(-) rename {src => core/src}/main/java/appeng/util/BlockUpdate.java (100%) rename {src => core/src}/main/java/appeng/util/ClassInstantiation.java (100%) rename {src => core/src}/main/java/appeng/util/ConfigManager.java (100%) rename {src => core/src}/main/java/appeng/util/EnumCycler.java (100%) rename {src => core/src}/main/java/appeng/util/FakePlayer.java (100%) rename {src => core/src}/main/java/appeng/util/IConfigManagerHost.java (100%) rename {src => core/src}/main/java/appeng/util/ISlimReadableNumberConverter.java (100%) rename {src => core/src}/main/java/appeng/util/IWideReadableNumberConverter.java (100%) rename {src => core/src}/main/java/appeng/util/IWorldCallable.java (100%) rename {src => core/src}/main/java/appeng/util/InWorldToolOperationResult.java (100%) rename {src => core/src}/main/java/appeng/util/InventoryAdaptor.java (100%) rename {src => core/src}/main/java/appeng/util/ItemSorters.java (100%) rename {src => core/src}/main/java/appeng/util/Lazy.java (100%) rename {src => core/src}/main/java/appeng/util/LookDirection.java (100%) rename {src => core/src}/main/java/appeng/util/Platform.java (99%) rename {src => core/src}/main/java/appeng/util/ReadOnlyCollection.java (100%) rename {src => core/src}/main/java/appeng/util/ReadableNumberConverter.java (100%) rename {src => core/src}/main/java/appeng/util/SettingsFrom.java (100%) rename {src => core/src}/main/java/appeng/util/UUIDMatcher.java (100%) rename {src => core/src}/main/java/appeng/util/helpers/ItemComparisonHelper.java (100%) rename {src => core/src}/main/java/appeng/util/helpers/ItemHandlerUtil.java (100%) rename {src => core/src}/main/java/appeng/util/helpers/P2PHelper.java (100%) rename {src => core/src}/main/java/appeng/util/inv/AdaptorFixedInv.java (100%) rename {src => core/src}/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java (100%) rename {src => core/src}/main/java/appeng/util/inv/AdaptorList.java (100%) rename {src => core/src}/main/java/appeng/util/inv/IAEAppEngInventory.java (100%) rename {src => core/src}/main/java/appeng/util/inv/IInventoryDestination.java (100%) rename {src => core/src}/main/java/appeng/util/inv/IMEAdaptor.java (100%) rename {src => core/src}/main/java/appeng/util/inv/IMEAdaptorIterator.java (100%) rename {src => core/src}/main/java/appeng/util/inv/IMEInventoryDestination.java (100%) rename {src => core/src}/main/java/appeng/util/inv/InvOperation.java (100%) rename {src => core/src}/main/java/appeng/util/inv/ItemHandlerIterator.java (100%) rename {src => core/src}/main/java/appeng/util/inv/ItemListIgnoreCrafting.java (100%) rename {src => core/src}/main/java/appeng/util/inv/ItemSlot.java (100%) rename {src => core/src}/main/java/appeng/util/inv/WrapperChainedItemHandler.java (100%) rename {src => core/src}/main/java/appeng/util/inv/WrapperCursorItemHandler.java (100%) rename {src => core/src}/main/java/appeng/util/inv/WrapperFilteredItemHandler.java (100%) rename {src => core/src}/main/java/appeng/util/inv/WrapperInvItemHandler.java (100%) rename {src => core/src}/main/java/appeng/util/inv/WrapperSupplierItemHandler.java (100%) rename {src => core/src}/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java (100%) rename {src => core/src}/main/java/appeng/util/inv/filter/AEItemFilters.java (100%) rename {src => core/src}/main/java/appeng/util/inv/filter/IAEItemFilter.java (100%) rename {src => core/src}/main/java/appeng/util/item/AEItemStack.java (100%) rename {src => core/src}/main/java/appeng/util/item/AEItemStackRegistry.java (100%) rename {src => core/src}/main/java/appeng/util/item/AESharedItemStack.java (100%) rename {src => core/src}/main/java/appeng/util/item/AEStack.java (100%) rename {src => core/src}/main/java/appeng/util/item/AbstractItemList.java (100%) rename {src => core/src}/main/java/appeng/util/item/FuzzyItemList.java (100%) rename {src => core/src}/main/java/appeng/util/item/ItemList.java (100%) rename {src => core/src}/main/java/appeng/util/item/ItemModList.java (100%) rename {src => core/src}/main/java/appeng/util/item/MeaningfulItemIterator.java (100%) rename {src => core/src}/main/java/appeng/util/item/NullItemList.java (100%) rename {src => core/src}/main/java/appeng/util/item/StrictItemList.java (100%) rename {src => core/src}/main/java/appeng/util/iterators/ChainedIterator.java (100%) rename {src => core/src}/main/java/appeng/util/iterators/InvIterator.java (100%) rename {src => core/src}/main/java/appeng/util/iterators/NullIterator.java (100%) rename {src => core/src}/main/java/appeng/util/iterators/ProxyNodeIterator.java (100%) rename {src => core/src}/main/java/appeng/util/iterators/StackToSlotIterator.java (100%) rename {src => core/src}/main/java/appeng/util/prioritylist/DefaultPriorityList.java (100%) rename {src => core/src}/main/java/appeng/util/prioritylist/FuzzyPriorityList.java (100%) rename {src => core/src}/main/java/appeng/util/prioritylist/IPartitionList.java (100%) rename {src => core/src}/main/java/appeng/util/prioritylist/MergedPriorityList.java (100%) rename {src => core/src}/main/java/appeng/util/prioritylist/PrecisePriorityList.java (100%) delete mode 100644 src/main/java/appeng/util/iterators/AEInvIterator.java diff --git a/build.gradle b/build.gradle index 0ef02db17..6d013fecb 100644 --- a/build.gradle +++ b/build.gradle @@ -78,6 +78,7 @@ allprojects { dependencies { compile project(":api") + compile project(":core") } subprojects { diff --git a/src/main/java/appeng/util/BlockUpdate.java b/core/src/main/java/appeng/util/BlockUpdate.java similarity index 100% rename from src/main/java/appeng/util/BlockUpdate.java rename to core/src/main/java/appeng/util/BlockUpdate.java diff --git a/src/main/java/appeng/util/ClassInstantiation.java b/core/src/main/java/appeng/util/ClassInstantiation.java similarity index 100% rename from src/main/java/appeng/util/ClassInstantiation.java rename to core/src/main/java/appeng/util/ClassInstantiation.java diff --git a/src/main/java/appeng/util/ConfigManager.java b/core/src/main/java/appeng/util/ConfigManager.java similarity index 100% rename from src/main/java/appeng/util/ConfigManager.java rename to core/src/main/java/appeng/util/ConfigManager.java diff --git a/src/main/java/appeng/util/EnumCycler.java b/core/src/main/java/appeng/util/EnumCycler.java similarity index 100% rename from src/main/java/appeng/util/EnumCycler.java rename to core/src/main/java/appeng/util/EnumCycler.java diff --git a/src/main/java/appeng/util/FakePlayer.java b/core/src/main/java/appeng/util/FakePlayer.java similarity index 100% rename from src/main/java/appeng/util/FakePlayer.java rename to core/src/main/java/appeng/util/FakePlayer.java diff --git a/src/main/java/appeng/util/IConfigManagerHost.java b/core/src/main/java/appeng/util/IConfigManagerHost.java similarity index 100% rename from src/main/java/appeng/util/IConfigManagerHost.java rename to core/src/main/java/appeng/util/IConfigManagerHost.java diff --git a/src/main/java/appeng/util/ISlimReadableNumberConverter.java b/core/src/main/java/appeng/util/ISlimReadableNumberConverter.java similarity index 100% rename from src/main/java/appeng/util/ISlimReadableNumberConverter.java rename to core/src/main/java/appeng/util/ISlimReadableNumberConverter.java diff --git a/src/main/java/appeng/util/IWideReadableNumberConverter.java b/core/src/main/java/appeng/util/IWideReadableNumberConverter.java similarity index 100% rename from src/main/java/appeng/util/IWideReadableNumberConverter.java rename to core/src/main/java/appeng/util/IWideReadableNumberConverter.java diff --git a/src/main/java/appeng/util/IWorldCallable.java b/core/src/main/java/appeng/util/IWorldCallable.java similarity index 100% rename from src/main/java/appeng/util/IWorldCallable.java rename to core/src/main/java/appeng/util/IWorldCallable.java diff --git a/src/main/java/appeng/util/InWorldToolOperationResult.java b/core/src/main/java/appeng/util/InWorldToolOperationResult.java similarity index 100% rename from src/main/java/appeng/util/InWorldToolOperationResult.java rename to core/src/main/java/appeng/util/InWorldToolOperationResult.java diff --git a/src/main/java/appeng/util/InventoryAdaptor.java b/core/src/main/java/appeng/util/InventoryAdaptor.java similarity index 100% rename from src/main/java/appeng/util/InventoryAdaptor.java rename to core/src/main/java/appeng/util/InventoryAdaptor.java diff --git a/src/main/java/appeng/util/ItemSorters.java b/core/src/main/java/appeng/util/ItemSorters.java similarity index 100% rename from src/main/java/appeng/util/ItemSorters.java rename to core/src/main/java/appeng/util/ItemSorters.java diff --git a/src/main/java/appeng/util/Lazy.java b/core/src/main/java/appeng/util/Lazy.java similarity index 100% rename from src/main/java/appeng/util/Lazy.java rename to core/src/main/java/appeng/util/Lazy.java diff --git a/src/main/java/appeng/util/LookDirection.java b/core/src/main/java/appeng/util/LookDirection.java similarity index 100% rename from src/main/java/appeng/util/LookDirection.java rename to core/src/main/java/appeng/util/LookDirection.java diff --git a/src/main/java/appeng/util/Platform.java b/core/src/main/java/appeng/util/Platform.java similarity index 99% rename from src/main/java/appeng/util/Platform.java rename to core/src/main/java/appeng/util/Platform.java index d82abd233..833104b71 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/core/src/main/java/appeng/util/Platform.java @@ -90,6 +90,7 @@ import net.minecraft.util.registry.Registry; import net.minecraft.world.RayTraceContext; import net.minecraft.world.World; +import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.text.DecimalFormat; import java.util.*; @@ -1152,4 +1153,8 @@ public class Platform { return ItemStack.EMPTY; } + public static boolean canStack(ItemStack a, ItemStack b) { + return itemComparisons().isSameItem(a, b); + } + } diff --git a/src/main/java/appeng/util/ReadOnlyCollection.java b/core/src/main/java/appeng/util/ReadOnlyCollection.java similarity index 100% rename from src/main/java/appeng/util/ReadOnlyCollection.java rename to core/src/main/java/appeng/util/ReadOnlyCollection.java diff --git a/src/main/java/appeng/util/ReadableNumberConverter.java b/core/src/main/java/appeng/util/ReadableNumberConverter.java similarity index 100% rename from src/main/java/appeng/util/ReadableNumberConverter.java rename to core/src/main/java/appeng/util/ReadableNumberConverter.java diff --git a/src/main/java/appeng/util/SettingsFrom.java b/core/src/main/java/appeng/util/SettingsFrom.java similarity index 100% rename from src/main/java/appeng/util/SettingsFrom.java rename to core/src/main/java/appeng/util/SettingsFrom.java diff --git a/src/main/java/appeng/util/UUIDMatcher.java b/core/src/main/java/appeng/util/UUIDMatcher.java similarity index 100% rename from src/main/java/appeng/util/UUIDMatcher.java rename to core/src/main/java/appeng/util/UUIDMatcher.java diff --git a/src/main/java/appeng/util/helpers/ItemComparisonHelper.java b/core/src/main/java/appeng/util/helpers/ItemComparisonHelper.java similarity index 100% rename from src/main/java/appeng/util/helpers/ItemComparisonHelper.java rename to core/src/main/java/appeng/util/helpers/ItemComparisonHelper.java diff --git a/src/main/java/appeng/util/helpers/ItemHandlerUtil.java b/core/src/main/java/appeng/util/helpers/ItemHandlerUtil.java similarity index 100% rename from src/main/java/appeng/util/helpers/ItemHandlerUtil.java rename to core/src/main/java/appeng/util/helpers/ItemHandlerUtil.java diff --git a/src/main/java/appeng/util/helpers/P2PHelper.java b/core/src/main/java/appeng/util/helpers/P2PHelper.java similarity index 100% rename from src/main/java/appeng/util/helpers/P2PHelper.java rename to core/src/main/java/appeng/util/helpers/P2PHelper.java diff --git a/src/main/java/appeng/util/inv/AdaptorFixedInv.java b/core/src/main/java/appeng/util/inv/AdaptorFixedInv.java similarity index 100% rename from src/main/java/appeng/util/inv/AdaptorFixedInv.java rename to core/src/main/java/appeng/util/inv/AdaptorFixedInv.java diff --git a/src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java b/core/src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java similarity index 100% rename from src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java rename to core/src/main/java/appeng/util/inv/AdaptorItemHandlerPlayerInv.java diff --git a/src/main/java/appeng/util/inv/AdaptorList.java b/core/src/main/java/appeng/util/inv/AdaptorList.java similarity index 100% rename from src/main/java/appeng/util/inv/AdaptorList.java rename to core/src/main/java/appeng/util/inv/AdaptorList.java diff --git a/src/main/java/appeng/util/inv/IAEAppEngInventory.java b/core/src/main/java/appeng/util/inv/IAEAppEngInventory.java similarity index 100% rename from src/main/java/appeng/util/inv/IAEAppEngInventory.java rename to core/src/main/java/appeng/util/inv/IAEAppEngInventory.java diff --git a/src/main/java/appeng/util/inv/IInventoryDestination.java b/core/src/main/java/appeng/util/inv/IInventoryDestination.java similarity index 100% rename from src/main/java/appeng/util/inv/IInventoryDestination.java rename to core/src/main/java/appeng/util/inv/IInventoryDestination.java diff --git a/src/main/java/appeng/util/inv/IMEAdaptor.java b/core/src/main/java/appeng/util/inv/IMEAdaptor.java similarity index 100% rename from src/main/java/appeng/util/inv/IMEAdaptor.java rename to core/src/main/java/appeng/util/inv/IMEAdaptor.java diff --git a/src/main/java/appeng/util/inv/IMEAdaptorIterator.java b/core/src/main/java/appeng/util/inv/IMEAdaptorIterator.java similarity index 100% rename from src/main/java/appeng/util/inv/IMEAdaptorIterator.java rename to core/src/main/java/appeng/util/inv/IMEAdaptorIterator.java diff --git a/src/main/java/appeng/util/inv/IMEInventoryDestination.java b/core/src/main/java/appeng/util/inv/IMEInventoryDestination.java similarity index 100% rename from src/main/java/appeng/util/inv/IMEInventoryDestination.java rename to core/src/main/java/appeng/util/inv/IMEInventoryDestination.java diff --git a/src/main/java/appeng/util/inv/InvOperation.java b/core/src/main/java/appeng/util/inv/InvOperation.java similarity index 100% rename from src/main/java/appeng/util/inv/InvOperation.java rename to core/src/main/java/appeng/util/inv/InvOperation.java diff --git a/src/main/java/appeng/util/inv/ItemHandlerIterator.java b/core/src/main/java/appeng/util/inv/ItemHandlerIterator.java similarity index 100% rename from src/main/java/appeng/util/inv/ItemHandlerIterator.java rename to core/src/main/java/appeng/util/inv/ItemHandlerIterator.java diff --git a/src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java b/core/src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java similarity index 100% rename from src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java rename to core/src/main/java/appeng/util/inv/ItemListIgnoreCrafting.java diff --git a/src/main/java/appeng/util/inv/ItemSlot.java b/core/src/main/java/appeng/util/inv/ItemSlot.java similarity index 100% rename from src/main/java/appeng/util/inv/ItemSlot.java rename to core/src/main/java/appeng/util/inv/ItemSlot.java diff --git a/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java b/core/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java similarity index 100% rename from src/main/java/appeng/util/inv/WrapperChainedItemHandler.java rename to core/src/main/java/appeng/util/inv/WrapperChainedItemHandler.java diff --git a/src/main/java/appeng/util/inv/WrapperCursorItemHandler.java b/core/src/main/java/appeng/util/inv/WrapperCursorItemHandler.java similarity index 100% rename from src/main/java/appeng/util/inv/WrapperCursorItemHandler.java rename to core/src/main/java/appeng/util/inv/WrapperCursorItemHandler.java diff --git a/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java b/core/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java similarity index 100% rename from src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java rename to core/src/main/java/appeng/util/inv/WrapperFilteredItemHandler.java diff --git a/src/main/java/appeng/util/inv/WrapperInvItemHandler.java b/core/src/main/java/appeng/util/inv/WrapperInvItemHandler.java similarity index 100% rename from src/main/java/appeng/util/inv/WrapperInvItemHandler.java rename to core/src/main/java/appeng/util/inv/WrapperInvItemHandler.java diff --git a/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java b/core/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java similarity index 100% rename from src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java rename to core/src/main/java/appeng/util/inv/WrapperSupplierItemHandler.java diff --git a/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java b/core/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java similarity index 100% rename from src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java rename to core/src/main/java/appeng/util/inv/filter/AEItemDefinitionFilter.java diff --git a/src/main/java/appeng/util/inv/filter/AEItemFilters.java b/core/src/main/java/appeng/util/inv/filter/AEItemFilters.java similarity index 100% rename from src/main/java/appeng/util/inv/filter/AEItemFilters.java rename to core/src/main/java/appeng/util/inv/filter/AEItemFilters.java diff --git a/src/main/java/appeng/util/inv/filter/IAEItemFilter.java b/core/src/main/java/appeng/util/inv/filter/IAEItemFilter.java similarity index 100% rename from src/main/java/appeng/util/inv/filter/IAEItemFilter.java rename to core/src/main/java/appeng/util/inv/filter/IAEItemFilter.java diff --git a/src/main/java/appeng/util/item/AEItemStack.java b/core/src/main/java/appeng/util/item/AEItemStack.java similarity index 100% rename from src/main/java/appeng/util/item/AEItemStack.java rename to core/src/main/java/appeng/util/item/AEItemStack.java diff --git a/src/main/java/appeng/util/item/AEItemStackRegistry.java b/core/src/main/java/appeng/util/item/AEItemStackRegistry.java similarity index 100% rename from src/main/java/appeng/util/item/AEItemStackRegistry.java rename to core/src/main/java/appeng/util/item/AEItemStackRegistry.java diff --git a/src/main/java/appeng/util/item/AESharedItemStack.java b/core/src/main/java/appeng/util/item/AESharedItemStack.java similarity index 100% rename from src/main/java/appeng/util/item/AESharedItemStack.java rename to core/src/main/java/appeng/util/item/AESharedItemStack.java diff --git a/src/main/java/appeng/util/item/AEStack.java b/core/src/main/java/appeng/util/item/AEStack.java similarity index 100% rename from src/main/java/appeng/util/item/AEStack.java rename to core/src/main/java/appeng/util/item/AEStack.java diff --git a/src/main/java/appeng/util/item/AbstractItemList.java b/core/src/main/java/appeng/util/item/AbstractItemList.java similarity index 100% rename from src/main/java/appeng/util/item/AbstractItemList.java rename to core/src/main/java/appeng/util/item/AbstractItemList.java diff --git a/src/main/java/appeng/util/item/FuzzyItemList.java b/core/src/main/java/appeng/util/item/FuzzyItemList.java similarity index 100% rename from src/main/java/appeng/util/item/FuzzyItemList.java rename to core/src/main/java/appeng/util/item/FuzzyItemList.java diff --git a/src/main/java/appeng/util/item/ItemList.java b/core/src/main/java/appeng/util/item/ItemList.java similarity index 100% rename from src/main/java/appeng/util/item/ItemList.java rename to core/src/main/java/appeng/util/item/ItemList.java diff --git a/src/main/java/appeng/util/item/ItemModList.java b/core/src/main/java/appeng/util/item/ItemModList.java similarity index 100% rename from src/main/java/appeng/util/item/ItemModList.java rename to core/src/main/java/appeng/util/item/ItemModList.java diff --git a/src/main/java/appeng/util/item/MeaningfulItemIterator.java b/core/src/main/java/appeng/util/item/MeaningfulItemIterator.java similarity index 100% rename from src/main/java/appeng/util/item/MeaningfulItemIterator.java rename to core/src/main/java/appeng/util/item/MeaningfulItemIterator.java diff --git a/src/main/java/appeng/util/item/NullItemList.java b/core/src/main/java/appeng/util/item/NullItemList.java similarity index 100% rename from src/main/java/appeng/util/item/NullItemList.java rename to core/src/main/java/appeng/util/item/NullItemList.java diff --git a/src/main/java/appeng/util/item/StrictItemList.java b/core/src/main/java/appeng/util/item/StrictItemList.java similarity index 100% rename from src/main/java/appeng/util/item/StrictItemList.java rename to core/src/main/java/appeng/util/item/StrictItemList.java diff --git a/src/main/java/appeng/util/iterators/ChainedIterator.java b/core/src/main/java/appeng/util/iterators/ChainedIterator.java similarity index 100% rename from src/main/java/appeng/util/iterators/ChainedIterator.java rename to core/src/main/java/appeng/util/iterators/ChainedIterator.java diff --git a/src/main/java/appeng/util/iterators/InvIterator.java b/core/src/main/java/appeng/util/iterators/InvIterator.java similarity index 100% rename from src/main/java/appeng/util/iterators/InvIterator.java rename to core/src/main/java/appeng/util/iterators/InvIterator.java diff --git a/src/main/java/appeng/util/iterators/NullIterator.java b/core/src/main/java/appeng/util/iterators/NullIterator.java similarity index 100% rename from src/main/java/appeng/util/iterators/NullIterator.java rename to core/src/main/java/appeng/util/iterators/NullIterator.java diff --git a/src/main/java/appeng/util/iterators/ProxyNodeIterator.java b/core/src/main/java/appeng/util/iterators/ProxyNodeIterator.java similarity index 100% rename from src/main/java/appeng/util/iterators/ProxyNodeIterator.java rename to core/src/main/java/appeng/util/iterators/ProxyNodeIterator.java diff --git a/src/main/java/appeng/util/iterators/StackToSlotIterator.java b/core/src/main/java/appeng/util/iterators/StackToSlotIterator.java similarity index 100% rename from src/main/java/appeng/util/iterators/StackToSlotIterator.java rename to core/src/main/java/appeng/util/iterators/StackToSlotIterator.java diff --git a/src/main/java/appeng/util/prioritylist/DefaultPriorityList.java b/core/src/main/java/appeng/util/prioritylist/DefaultPriorityList.java similarity index 100% rename from src/main/java/appeng/util/prioritylist/DefaultPriorityList.java rename to core/src/main/java/appeng/util/prioritylist/DefaultPriorityList.java diff --git a/src/main/java/appeng/util/prioritylist/FuzzyPriorityList.java b/core/src/main/java/appeng/util/prioritylist/FuzzyPriorityList.java similarity index 100% rename from src/main/java/appeng/util/prioritylist/FuzzyPriorityList.java rename to core/src/main/java/appeng/util/prioritylist/FuzzyPriorityList.java diff --git a/src/main/java/appeng/util/prioritylist/IPartitionList.java b/core/src/main/java/appeng/util/prioritylist/IPartitionList.java similarity index 100% rename from src/main/java/appeng/util/prioritylist/IPartitionList.java rename to core/src/main/java/appeng/util/prioritylist/IPartitionList.java diff --git a/src/main/java/appeng/util/prioritylist/MergedPriorityList.java b/core/src/main/java/appeng/util/prioritylist/MergedPriorityList.java similarity index 100% rename from src/main/java/appeng/util/prioritylist/MergedPriorityList.java rename to core/src/main/java/appeng/util/prioritylist/MergedPriorityList.java diff --git a/src/main/java/appeng/util/prioritylist/PrecisePriorityList.java b/core/src/main/java/appeng/util/prioritylist/PrecisePriorityList.java similarity index 100% rename from src/main/java/appeng/util/prioritylist/PrecisePriorityList.java rename to core/src/main/java/appeng/util/prioritylist/PrecisePriorityList.java diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java index 46cd519b4..8a12e75f5 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java @@ -42,7 +42,7 @@ import appeng.util.Platform; public class PaintSplotchesBlock extends AEBaseTileBlock { public PaintSplotchesBlock() { - super(defaultProps(Material.WATER, MaterialColor.AIR)); + super(defaultProps(Material.WATER, MaterialColor.CLEAR)); this.setFullSize(false); this.setOpaque(false); } diff --git a/src/main/java/appeng/block/spatial/MatrixFrameBlock.java b/src/main/java/appeng/block/spatial/MatrixFrameBlock.java index 06082f28b..89834f1fb 100644 --- a/src/main/java/appeng/block/spatial/MatrixFrameBlock.java +++ b/src/main/java/appeng/block/spatial/MatrixFrameBlock.java @@ -23,7 +23,7 @@ import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.Material; import net.minecraft.block.MaterialColor; -import net.minecraft.block.material.PushReaction; +import net.minecraft.block.piston.PistonBehavior; import net.minecraft.entity.Entity; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; @@ -46,8 +46,8 @@ import appeng.block.AEBaseBlock; */ public class MatrixFrameBlock extends AEBaseBlock { - private static final Material MATERIAL = new Material(MaterialColor.AIR, false, true, true, false, false, false, - false, PushReaction.PUSH_ONLY); + private static final Material MATERIAL = new Material(MaterialColor.CLEAR, false, true, true, false, false, false, + false, PistonBehavior.PUSH_ONLY); public MatrixFrameBlock() { super(Settings.create(MATERIAL).strength(-1.0F, 6000000.0F).notSolid().noDrops()); diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java index 978c33f11..3e911e8d0 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java @@ -36,7 +36,7 @@ import net.minecraft.client.util.InputMappings; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListNBT; +import net.minecraft.nbt.ListTag; import net.minecraft.text.Text; import net.minecraftforge.fml.client.gui.GuiUtils; @@ -315,7 +315,7 @@ public class InterfaceTerminalScreen extends AEBaseScreen d.getSlotStackLimit()) { maxSize = d.getSlotStackLimit(); } @@ -449,7 +449,7 @@ public abstract class AEBaseContainer extends Container { final ItemStack t = d.getStack().copy(); if (Platform.itemComparisons().isSameItem(t, tis)) { - int maxSize = t.getMaxStackSize(); + int maxSize = t.getMaxCount(); if (maxSize > d.getSlotStackLimit()) { maxSize = d.getSlotStackLimit(); } @@ -478,7 +478,7 @@ public abstract class AEBaseContainer extends Container { } } } else { - int maxSize = tis.getMaxStackSize(); + int maxSize = tis.getMaxCount(); if (maxSize > d.getSlotStackLimit()) { maxSize = d.getSlotStackLimit(); } @@ -580,7 +580,7 @@ public abstract class AEBaseContainer extends Container { if (hand.isEmpty()) { is.setCount(Math.max(1, is.getCount() - 1)); } else if (hand.isItemEqual(is)) { - is.setCount(Math.min(is.getMaxStackSize(), is.getCount() + 1)); + is.setCount(Math.min(is.getMaxCount(), is.getCount() + 1)); } else { is = hand.copy(); is.setCount(1); @@ -632,7 +632,7 @@ public abstract class AEBaseContainer extends Container { IAEItemStack ais = slotItem.copy(); ItemStack myItem = ais.createItemStack(); - ais.setStackSize(myItem.getMaxStackSize()); + ais.setStackSize(myItem.getMaxCount()); final InventoryAdaptor adp = InventoryAdaptor.getAdaptor(player); myItem.setCount((int) ais.getStackSize()); @@ -691,7 +691,7 @@ public abstract class AEBaseContainer extends Container { final ItemStack item = player.inventory.getItemStack(); if (!item.isEmpty()) { - if (item.getCount() >= item.getMaxStackSize()) { + if (item.getCount() >= item.getMaxCount()) { liftQty = 0; } if (!Platform.itemComparisons().isSameItem(slotItem.getDefinition(), item)) { @@ -726,7 +726,7 @@ public abstract class AEBaseContainer extends Container { if (player.inventory.getItemStack().isEmpty()) { if (slotItem != null) { IAEItemStack ais = slotItem.copy(); - ais.setStackSize(ais.getDefinition().getMaxStackSize()); + ais.setStackSize(ais.getDefinition().getMaxCount()); ais = Platform.poweredExtraction(this.getPowerSource(), this.getCellInventory(), ais, this.getActionSource()); if (ais != null) { @@ -758,7 +758,7 @@ public abstract class AEBaseContainer extends Container { if (player.inventory.getItemStack().isEmpty()) { if (slotItem != null) { IAEItemStack ais = slotItem.copy(); - final long maxSize = ais.getDefinition().getMaxStackSize(); + final long maxSize = ais.getDefinition().getMaxCount(); ais.setStackSize(maxSize); ais = this.getCellInventory().extractItems(ais, Actionable.SIMULATE, this.getActionSource()); @@ -796,7 +796,7 @@ public abstract class AEBaseContainer extends Container { case CREATIVE_DUPLICATE: if (player.abilities.isCreativeMode && slotItem != null) { final ItemStack is = slotItem.createItemStack(); - is.setCount(is.getMaxStackSize()); + is.setCount(is.getMaxCount()); player.inventory.setItemStack(is); this.updateHeld(player); } @@ -813,7 +813,7 @@ public abstract class AEBaseContainer extends Container { IAEItemStack ais = slotItem.copy(); ItemStack myItem = ais.createItemStack(); - ais.setStackSize(myItem.getMaxStackSize()); + ais.setStackSize(myItem.getMaxCount()); final InventoryAdaptor adp = InventoryAdaptor.getAdaptor(player); myItem.setCount((int) ais.getStackSize()); diff --git a/src/main/java/appeng/container/implementations/PatternTermContainer.java b/src/main/java/appeng/container/implementations/PatternTermContainer.java index e301ffd84..e3d72edd2 100644 --- a/src/main/java/appeng/container/implementations/PatternTermContainer.java +++ b/src/main/java/appeng/container/implementations/PatternTermContainer.java @@ -37,7 +37,7 @@ import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.INBT; -import net.minecraft.nbt.ListNBT; +import net.minecraft.nbt.ListTag; import net.minecraft.network.PacketByteBuf; import net.minecraft.world.World; import net.minecraftforge.items.wrapper.PlayerInvWrapper; @@ -237,8 +237,8 @@ public class PatternTermContainer extends MEMonitorableContainer // encode the slot. final CompoundTag encodedValue = new CompoundTag(); - final ListNBT tagIn = new ListNBT(); - final ListNBT tagOut = new ListNBT(); + final ListTag tagIn = new ListTag(); + final ListTag tagOut = new ListTag(); for (final ItemStack i : in) { tagIn.add(this.createItemTag(i)); diff --git a/src/main/java/appeng/container/slot/AppEngSlot.java b/src/main/java/appeng/container/slot/AppEngSlot.java index 5b176d169..b39a85e85 100644 --- a/src/main/java/appeng/container/slot/AppEngSlot.java +++ b/src/main/java/appeng/container/slot/AppEngSlot.java @@ -127,12 +127,12 @@ public class AppEngSlot extends Slot { @Override public int getSlotStackLimit() { - return this.itemHandler.getSlotLimit(this.index); + return this.itemHandler.getMaxAmount(this.index, ItemStack.EMPTY); } @Override public int getItemStackLimit(@Nonnull ItemStack stack) { - return Math.min(this.getSlotStackLimit(), stack.getMaxStackSize()); + return Math.min(this.getSlotStackLimit(), stack.getMaxCount()); } @Override diff --git a/src/main/java/appeng/container/slot/CraftingTermSlot.java b/src/main/java/appeng/container/slot/CraftingTermSlot.java index 8b4c33794..fff829742 100644 --- a/src/main/java/appeng/container/slot/CraftingTermSlot.java +++ b/src/main/java/appeng/container/slot/CraftingTermSlot.java @@ -108,11 +108,11 @@ public class CraftingTermSlot extends AppEngCraftingSlot { if (action == InventoryAction.CRAFT_SHIFT) // craft into player inventory... { ia = InventoryAdaptor.getAdaptor(who); - maxTimesToCraft = (int) Math.floor((double) this.getStack().getMaxStackSize() / (double) howManyPerCraft); + maxTimesToCraft = (int) Math.floor((double) this.getStack().getMaxCount() / (double) howManyPerCraft); } else if (action == InventoryAction.CRAFT_STACK) // craft into hand, full stack { ia = new AdaptorFixedInv(new WrapperCursorItemHandler(who.inventory)); - maxTimesToCraft = (int) Math.floor((double) this.getStack().getMaxStackSize() / (double) howManyPerCraft); + maxTimesToCraft = (int) Math.floor((double) this.getStack().getMaxCount() / (double) howManyPerCraft); } else // pick up what was crafted... { diff --git a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java index 69338f359..2021e3482 100644 --- a/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java +++ b/src/main/java/appeng/core/sync/packets/JEIRecipePacket.java @@ -26,7 +26,7 @@ import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListNBT; +import net.minecraft.nbt.ListTag; import net.minecraft.network.PacketByteBuf; import appeng.api.AEApi; @@ -61,7 +61,7 @@ public class JEIRecipePacket extends BasePacket { if (comp != null) { this.recipe = new ItemStack[9][]; for (int x = 0; x < this.recipe.length; x++) { - final ListNBT list = comp.getList("#" + x, 10); + final ListTag list = comp.getList("#" + x, 10); if (list.size() > 0) { this.recipe[x] = new ItemStack[list.size()]; for (int y = 0; y < list.size(); y++) { diff --git a/src/main/java/appeng/debug/ItemGenBlockEntity.java b/src/main/java/appeng/debug/ItemGenBlockEntity.java index aca45f447..d7e2fbffe 100644 --- a/src/main/java/appeng/debug/ItemGenBlockEntity.java +++ b/src/main/java/appeng/debug/ItemGenBlockEntity.java @@ -106,7 +106,7 @@ public class ItemGenBlockEntity extends AEBaseBlockEntity { } @Override - public int getSlotLimit(int slot) { + public int getMaxAmount(int slot, ItemStack stack) { return 1; } diff --git a/src/main/java/appeng/fluids/helper/FluidCellConfig.java b/src/main/java/appeng/fluids/helper/FluidCellConfig.java index 3586e518d..7c6cb4c59 100644 --- a/src/main/java/appeng/fluids/helper/FluidCellConfig.java +++ b/src/main/java/appeng/fluids/helper/FluidCellConfig.java @@ -80,7 +80,7 @@ public class FluidCellConfig extends CellConfig { } @Override - public boolean isItemValid(int slot, ItemStack stack) { + public boolean isItemValidForSlot(int slot, ItemStack stack) { if (stack.isEmpty() || stack.getItem() instanceof FluidDummyItem) { super.isItemValid(slot, stack); } diff --git a/src/main/java/appeng/helpers/AEGlassMaterial.java b/src/main/java/appeng/helpers/AEGlassMaterial.java index 639027ca5..c38dfd808 100644 --- a/src/main/java/appeng/helpers/AEGlassMaterial.java +++ b/src/main/java/appeng/helpers/AEGlassMaterial.java @@ -19,12 +19,12 @@ package appeng.helpers; import net.minecraft.block.Material; -import net.minecraft.block.material.MaterialColor; -import net.minecraft.block.material.PushReaction; +import net.minecraft.block.MaterialColor; +import net.minecraft.block.piston.PistonBehavior; public class AEGlassMaterial { - public static final Material INSTANCE = new Material(MaterialColor.AIR, false, false, true, false, true, false, - false, PushReaction.NORMAL); + public static final Material INSTANCE = new Material(MaterialColor.CLEAR, false, false, true, false, false, + false, PistonBehavior.NORMAL); } diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 91e3286d7..055ff0e6a 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -39,7 +39,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListNBT; +import net.minecraft.nbt.ListTag; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.Direction; import net.minecraft.util.math.BlockPos; @@ -209,7 +209,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn this.craftingTracker.writeToNBT(data); data.putInt("priority", this.priority); - final ListNBT waitingToSend = new ListNBT(); + final ListTag waitingToSend = new ListTag(); if (this.waitingToSend != null) { for (final ItemStack is : this.waitingToSend) { final CompoundTag item = new CompoundTag(); @@ -222,7 +222,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn public void readFromNBT(final CompoundTag data) { this.waitingToSend = null; - final ListNBT waitingList = data.getList("waitingToSend", 10); + final ListTag waitingList = data.getList("waitingToSend", 10); if (waitingList != null) { for (int x = 0; x < waitingList.size(); x++) { final CompoundTag c = waitingList.getCompound(x); @@ -311,7 +311,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn boolean found = false; for (int x = 0; x < accountedFor.length; x++) { - final ItemStack is = this.patterns.getStackInSlot(x); + final ItemStack is = this.patterns.getInvStack(x); if (details.getPattern() == is) { accountedFor[x] = found = true; } @@ -325,7 +325,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn for (int x = 0; x < accountedFor.length; x++) { if (!accountedFor[x]) { - this.addToCraftingList(this.patterns.getStackInSlot(x)); + this.addToCraftingList(this.patterns.getInvStack(x)); } } @@ -357,7 +357,7 @@ public class DualityInterface implements IGridTickable, IStorageMonitorable, IIn req = null; } - final ItemStack stored = this.storage.getStackInSlot(slot); + final ItemStack stored = this.storage.getInvStack(slot); if (req == null && !stored.isEmpty()) { final IAEItemStack work = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) diff --git a/src/main/java/appeng/helpers/InvalidPatternHelper.java b/src/main/java/appeng/helpers/InvalidPatternHelper.java index b70a60082..71f18681a 100644 --- a/src/main/java/appeng/helpers/InvalidPatternHelper.java +++ b/src/main/java/appeng/helpers/InvalidPatternHelper.java @@ -23,7 +23,7 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListNBT; +import net.minecraft.nbt.ListTag; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; import net.minecraft.util.Formatting; @@ -44,8 +44,8 @@ public class InvalidPatternHelper { throw new IllegalArgumentException("No pattern here!"); } - final ListNBT inTag = encodedValue.getList("in", 10); - final ListNBT outTag = encodedValue.getList("out", 10); + final ListTag inTag = encodedValue.getList("in", 10); + final ListTag outTag = encodedValue.getList("out", 10); this.isCrafting = encodedValue.getBoolean("crafting"); this.canSubstitute = this.isCrafting && encodedValue.getBoolean("substitute"); diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index d21157b9a..cb6323720 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -31,7 +31,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ICraftingRecipe; import net.minecraft.recipe.RecipeType; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListNBT; +import net.minecraft.nbt.ListTag; import net.minecraft.world.World; import appeng.api.AEApi; @@ -67,8 +67,8 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable implements IRecipeTransferHandl for (final Slot slot : container.inventorySlots) { if (slot instanceof CraftingMatrixSlot || slot instanceof FakeCraftingMatrixSlot) { if (slot.getSlotIndex() == slotIndex) { - final ListNBT tags = new ListNBT(); + final ListTag tags = new ListTag(); final List list = new ArrayList<>(); final ItemStack displayed = ingredient.getDisplayedIngredient(); diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index fbc4aac24..b984fc7fd 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -33,7 +33,7 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.ListNBT; +import net.minecraft.nbt.ListTag; import net.minecraft.text.Text; import net.minecraft.world.World; import net.minecraft.server.world.ServerWorld; @@ -990,7 +990,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { data.put("link", link); } - final ListNBT list = new ListNBT(); + final ListTag list = new ListTag(); for (final Entry e : this.tasks.entrySet()) { final CompoundTag item = this.writeItem(AEItemStack.fromItemStack(e.getKey().getPattern())); item.putLong("craftingProgress", e.getValue().value); @@ -1015,8 +1015,8 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { return out; } - private ListNBT writeList(final IItemList myList) { - final ListNBT out = new ListNBT(); + private ListTag writeList(final IItemList myList) { + final ListTag out = new ListTag(); for (final IAEItemStack ais : myList) { out.add(this.writeItem(ais)); @@ -1054,7 +1054,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { this.submitLink(this.myLastLink); } - final ListNBT list = data.getList("tasks", 10); + final ListTag list = data.getList("tasks", 10); for (int x = 0; x < list.size(); x++) { final CompoundTag item = list.getCompound(x); final IAEItemStack pattern = AEItemStack.fromNBT(item); @@ -1095,7 +1095,7 @@ public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { } } - private IItemList readList(final ListNBT tag) { + private IItemList readList(final ListTag tag) { final IItemList out = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) .createList(); diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index de1a0829c..c89abacd5 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -335,7 +335,7 @@ public abstract class AEBasePart implements IPart, IGridProxyable, IActionHost, final AppEngInternalAEInventory tmp = new AppEngInternalAEInventory(null, target.getSlots()); tmp.readFromNBT(compound, "config"); for (int x = 0; x < tmp.getSlots(); x++) { - target.setStackInSlot(x, tmp.getStackInSlot(x)); + target.setStackInSlot(x, tmp.getInvStack(x)); } } } diff --git a/src/main/java/appeng/parts/CableBusStorage.java b/src/main/java/appeng/parts/CableBusStorage.java index 56dbe423b..d93928d01 100644 --- a/src/main/java/appeng/parts/CableBusStorage.java +++ b/src/main/java/appeng/parts/CableBusStorage.java @@ -56,7 +56,7 @@ public class CableBusStorage { if (this.sides != null && this.sides.length > x && part == null) { this.sides[x] = null; - this.sides = this.shrink(this.sides, true); + this.sides = this.decrement(this.sides, true); } else if (part != null) { this.sides = this.expand(this.sides, x, true); this.sides[x] = part; @@ -112,7 +112,7 @@ public class CableBusStorage { public void setFacade(final int x, @Nullable final IFacadePart facade) { if (this.facades != null && this.facades.length > x && facade == null) { this.facades[x] = null; - this.facades = this.shrink(this.facades, false); + this.facades = this.decrement(this.facades, false); } else { this.facades = this.expand(this.facades, x, false); this.facades[x] = facade; diff --git a/src/main/java/appeng/parts/automation/FormationPlanePart.java b/src/main/java/appeng/parts/automation/FormationPlanePart.java index 31d1e5996..1edb005fa 100644 --- a/src/main/java/appeng/parts/automation/FormationPlanePart.java +++ b/src/main/java/appeng/parts/automation/FormationPlanePart.java @@ -213,7 +213,7 @@ public class FormationPlanePart extends AbstractFormationPlanePart final ItemStack is = input.createItemStack(); final Item i = is.getItem(); - long maxStorage = Math.min(input.getStackSize(), is.getMaxStackSize()); + long maxStorage = Math.min(input.getStackSize(), is.getMaxCount()); boolean worked = false; final BlockEntity te = this.getHost().getTile(); diff --git a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java index 112051521..3e5db4cdd 100644 --- a/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java +++ b/src/main/java/appeng/parts/p2p/ItemP2PTunnelPart.java @@ -231,8 +231,8 @@ public class ItemP2PTunnelPart extends P2PTunnelPart implemen } @Override - public int getSlotLimit(int slot) { - return this.getDestination().getSlotLimit(slot); + public int getMaxAmount(int slot, ItemStack is) { + return this.getDestination().getMaxAmount(slot, is); } public float getPowerDrainPerTick() { diff --git a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java index 0f3270bb1..3dcd596a4 100644 --- a/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java +++ b/src/main/java/appeng/parts/reporting/ConversionMonitorPart.java @@ -121,7 +121,7 @@ public class ConversionMonitorPart extends AbstractMonitorPart { } if (this.getDisplayed() != null) { - this.extractItem(player, this.getDisplayed().getDefinition().getMaxStackSize()); + this.extractItem(player, this.getDisplayed().getDefinition().getMaxCount()); } return true; diff --git a/src/main/java/appeng/parts/reporting/PatternTerminalPart.java b/src/main/java/appeng/parts/reporting/PatternTerminalPart.java index d238b46be..9825100df 100644 --- a/src/main/java/appeng/parts/reporting/PatternTerminalPart.java +++ b/src/main/java/appeng/parts/reporting/PatternTerminalPart.java @@ -106,7 +106,7 @@ public class PatternTerminalPart extends AbstractTerminalPart { public void onChangeInventory(final FixedItemInv inv, final int slot, final InvOperation mc, final ItemStack removedStack, final ItemStack newStack) { if (inv == this.pattern && slot == 1) { - final ItemStack is = this.pattern.getStackInSlot(1); + final ItemStack is = this.pattern.getInvStack(1); if (!is.isEmpty() && is.getItem() instanceof ICraftingPatternItem) { final ICraftingPatternItem pattern = (ICraftingPatternItem) is.getItem(); final ICraftingPatternDetails details = pattern.getPatternForItem(is, @@ -136,7 +136,7 @@ public class PatternTerminalPart extends AbstractTerminalPart { private void fixCraftingRecipes() { if (this.craftingMode) { for (int x = 0; x < this.crafting.getSlots(); x++) { - final ItemStack is = this.crafting.getStackInSlot(x); + final ItemStack is = this.crafting.getInvStack(x); if (!is.isEmpty()) { is.setCount(1); } diff --git a/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java b/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java index a5f270a65..1403f693e 100644 --- a/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java @@ -280,7 +280,7 @@ public class CraftingBlockEntity extends AENetworkBlockEntity implements IAEMult for (IAEItemStack ais : inv.getAvailableItems( AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class).createList())) { ais = ais.copy(); - ais.setStackSize(ais.getDefinition().getMaxStackSize()); + ais.setStackSize(ais.getDefinition().getMaxCount()); while (true) { final IAEItemStack g = inv.extractItems(ais.copy(), Actionable.MODULATE, this.cluster.getActionSource()); diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java index c0979de64..250beace9 100644 --- a/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java +++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java @@ -160,7 +160,7 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity } private boolean canPush() { - return !this.gridInv.getStackInSlot(9).isEmpty(); + return !this.gridInv.getInvStack(9).isEmpty(); } private boolean hasMats() { @@ -169,7 +169,7 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity } for (int x = 0; x < this.craftingInv.size(); x++) { - this.craftingInv.setStack(x, this.gridInv.getStackInSlot(x)); + this.craftingInv.setStack(x, this.gridInv.getInvStack(x)); } return !this.myPlan.getOutput(this.craftingInv, this.getWorld()).isEmpty(); @@ -247,7 +247,7 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity return; } - final ItemStack is = this.patternInv.getStackInSlot(0); + final ItemStack is = this.patternInv.getInvStack(0); if (!is.isEmpty() && is.getItem() instanceof EncodedPatternItem) { if (!ItemStack.areItemsEqual(is, this.myPattern)) { @@ -332,7 +332,7 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity super.getDrops(w, pos, drops); for (int h = 0; h < this.upgrades.getSlots(); h++) { - final ItemStack is = this.upgrades.getStackInSlot(h); + final ItemStack is = this.upgrades.getInvStack(h); if (!is.isEmpty()) { drops.add(is); } @@ -348,11 +348,11 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity @Override public TickRateModulation tickingRequest(final IGridNode node, int ticksSinceLastCall) { - if (!this.gridInv.getStackInSlot(9).isEmpty()) { - this.pushOut(this.gridInv.getStackInSlot(9)); + if (!this.gridInv.getInvStack(9).isEmpty()) { + this.pushOut(this.gridInv.getInvStack(9)); // did it eject? - if (this.gridInv.getStackInSlot(9).isEmpty()) { + if (this.gridInv.getInvStack(9).isEmpty()) { this.saveChanges(); } @@ -400,7 +400,7 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity if (this.progress >= 100) { for (int x = 0; x < this.craftingInv.size(); x++) { - this.craftingInv.setStack(x, this.gridInv.getStackInSlot(x)); + this.craftingInv.setStack(x, this.gridInv.getInvStack(x)); } this.progress = 0; @@ -441,9 +441,9 @@ public class MolecularAssemblerBlockEntity extends AENetworkInvBlockEntity } private void ejectHeldItems() { - if (this.gridInv.getStackInSlot(9).isEmpty()) { + if (this.gridInv.getInvStack(9).isEmpty()) { for (int x = 0; x < 9; x++) { - final ItemStack is = this.gridInv.getStackInSlot(x); + final ItemStack is = this.gridInv.getInvStack(x); if (!is.isEmpty()) { if (this.myPlan == null || !this.myPlan.isValidItemForSlot(x, is, this.world)) { this.gridInv.setStackInSlot(9, is); diff --git a/src/main/java/appeng/tile/grindstone/GrinderBlockEntity.java b/src/main/java/appeng/tile/grindstone/GrinderBlockEntity.java index 58d05a150..10d9e11f9 100644 --- a/src/main/java/appeng/tile/grindstone/GrinderBlockEntity.java +++ b/src/main/java/appeng/tile/grindstone/GrinderBlockEntity.java @@ -81,10 +81,10 @@ public class GrinderBlockEntity extends AEBaseInvBlockEntity implements ICrankab return false; } - if (this.inv.getStackInSlot(6).isEmpty()) // Add if there isn't one... + if (this.inv.getInvStack(6).isEmpty()) // Add if there isn't one... { for (int x = 0; x < 3; x++) { - ItemStack item = this.inv.getStackInSlot(x); + ItemStack item = this.inv.getInvStack(x); if (item.isEmpty()) { continue; } @@ -93,7 +93,7 @@ public class GrinderBlockEntity extends AEBaseInvBlockEntity implements ICrankab if (r != null) { final ItemStack ais = item.copy(); ais.setCount(r.getIngredientCount()); - item.shrink(r.getIngredientCount()); + item.decrement(r.getIngredientCount()); if (item.getCount() <= 0) { item = ItemStack.EMPTY; @@ -117,7 +117,7 @@ public class GrinderBlockEntity extends AEBaseInvBlockEntity implements ICrankab this.points++; - final ItemStack processing = this.inv.getStackInSlot(SLOT_PROCESSING); + final ItemStack processing = this.inv.getInvStack(SLOT_PROCESSING); GrinderRecipe r = GrinderRecipes.findForInput(world, processing); if (r != null) { if (r.getTurns() > this.points) { diff --git a/src/main/java/appeng/tile/inventory/AppEngCellInventory.java b/src/main/java/appeng/tile/inventory/AppEngCellInventory.java index 9a1048765..d458a84e7 100644 --- a/src/main/java/appeng/tile/inventory/AppEngCellInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngCellInventory.java @@ -1,84 +1,42 @@ package appeng.tile.inventory; -import net.minecraft.item.ItemStack; -import net.minecraftforge.items.IItemHandlerModifiable; - +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.impl.DelegatingFixedItemInv; import appeng.api.storage.cells.ICellInventory; import appeng.api.storage.cells.ICellInventoryHandler; import appeng.util.inv.IAEAppEngInventory; -import appeng.util.inv.filter.IAEItemFilter; +import net.minecraft.item.ItemStack; -public class AppEngCellInventory implements IItemHandlerModifiable { - private final AppEngInternalInventory inv; - private final ICellInventoryHandler handlerForSlot[]; +public class AppEngCellInventory extends DelegatingFixedItemInv { + private final ICellInventoryHandler[] handlerForSlot; public AppEngCellInventory(final IAEAppEngInventory host, final int slots) { - this.inv = new AppEngInternalInventory(host, slots, 1); + super(new AppEngInternalInventory(host, slots, 1)); this.handlerForSlot = new ICellInventoryHandler[slots]; } - public void setHandler(final int slot, final ICellInventoryHandler handler) { + public void setHandler(final int slot, final ICellInventoryHandler handler) { this.handlerForSlot[slot] = handler; } - public void setFilter(IAEItemFilter filter) { - this.inv.setFilter(filter); - } - @Override - public void setStackInSlot(int slot, ItemStack stack) { + public boolean setInvStack(int slot, ItemStack to, Simulation simulation) { this.persist(slot); - this.inv.setStackInSlot(slot, stack); + boolean result = super.setInvStack(slot, to, simulation); this.cleanup(slot); + return result; } @Override - public int getSlots() { - return this.inv.getSlots(); - } - - @Override - public ItemStack getStackInSlot(int slot) { + public ItemStack getInvStack(int slot) { this.persist(slot); - return this.inv.getStackInSlot(slot); - } - - @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - this.persist(slot); - final ItemStack ret = this.inv.insertItem(slot, stack, simulate); - this.cleanup(slot); - return ret; - } - - @Override - public ItemStack extractItem(int slot, int amount, boolean simulate) { - this.persist(slot); - final ItemStack ret = this.inv.extractItem(slot, amount, simulate); - this.cleanup(slot); - return ret; - } - - @Override - public int getSlotLimit(int slot) { - return this.inv.getSlotLimit(slot); - } - - @Override - public boolean isItemValid(int slot, ItemStack stack) { - return this.inv.isItemValid(slot, stack); - } - - public void persist() { - for (int i = 0; i < this.getSlots(); ++i) { - this.persist(i); - } + return super.getInvStack(slot); } private void persist(int slot) { if (this.handlerForSlot[slot] != null) { - final ICellInventory ci = this.handlerForSlot[slot].getCellInv(); + final ICellInventory ci = this.handlerForSlot[slot].getCellInv(); if (ci != null) { ci.persist(); } @@ -87,9 +45,9 @@ public class AppEngCellInventory implements IItemHandlerModifiable { private void cleanup(int slot) { if (this.handlerForSlot[slot] != null) { - final ICellInventory ci = this.handlerForSlot[slot].getCellInv(); + final ICellInventory ci = this.handlerForSlot[slot].getCellInv(); - if (ci == null || ci.getItemStack() != this.inv.getStackInSlot(slot)) { + if (ci == null || ci.getItemStack() != super.getInvStack(slot)) { this.handlerForSlot[slot] = null; } } diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java index 11aed0aa8..56798aa71 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalAEInventory.java @@ -21,11 +21,15 @@ package appeng.tile.inventory; import java.util.Iterator; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import alexiil.mc.lib.attributes.ListenerRemovalToken; +import alexiil.mc.lib.attributes.ListenerToken; +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.FixedItemInv; +import alexiil.mc.lib.attributes.item.InvMarkDirtyListener; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemHandlerHelper; import appeng.api.AEApi; import appeng.api.storage.channels.IItemStorageChannel; @@ -35,10 +39,9 @@ import appeng.util.Platform; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; import appeng.util.item.AEItemStack; -import appeng.util.iterators.AEInvIterator; import appeng.util.iterators.InvIterator; -public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterable { +public class AppEngInternalAEInventory implements FixedItemInv, Iterable { private final IAEAppEngInventory te; private final IAEItemStack[] inv; private final int size; @@ -103,105 +106,74 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab } protected int getStackLimit(int slot, @Nonnull ItemStack stack) { - return Math.min(this.getSlotLimit(slot), stack.getMaxStackSize()); + return Math.min(this.getMaxAmount(slot, stack), stack.getMaxCount()); } @Override - public int getSlots() { + public ItemStack getInvStack(int slot) { + if (this.inv[slot] == null) { + return ItemStack.EMPTY; + } + + return this.inv[slot].createItemStack(); + } + + @Override + public boolean setInvStack(int slot, ItemStack to, Simulation simulation) { + if (this.te == null || !Platform.isServer()) { + return false; + } + + // FIXME: We need to implement the actual checks here, stacking /caninsert/canremove + if (true) { + throw new IllegalStateException(); + } + + if (simulation == Simulation.SIMULATE) { + return true; + } + + ItemStack oldStack = this.getInvStack(slot).copy(); + this.inv[slot] = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) + .createStack(to); + + ItemStack newStack = to.copy(); + InvOperation op = InvOperation.SET; + + if (ItemStack.areItemsEqual(oldStack, newStack)) { + if (newStack.getCount() > oldStack.getCount()) { + newStack.decrement(oldStack.getCount()); + oldStack = ItemStack.EMPTY; + op = InvOperation.INSERT; + } else { + oldStack.decrement(newStack.getCount()); + newStack = ItemStack.EMPTY; + op = InvOperation.EXTRACT; + } + } + this.fireOnChangeInventory(slot, op, oldStack, newStack); + return true; + } + + @Override + public int getSlotCount() { return this.size; } @Override - public ItemStack getStackInSlot(final int var1) { - if (this.inv[var1] == null) { - return ItemStack.EMPTY; - } - - return this.inv[var1].createItemStack(); + public boolean isItemValidForSlot(int slot, ItemStack stack) { + return true; } @Override - public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) { - if (stack.isEmpty()) { - return ItemStack.EMPTY; - } - - ItemStack existing = this.getStackInSlot(slot); - int limit = this.getStackLimit(slot, stack); - - if (!existing.isEmpty()) { - if (!ItemHandlerHelper.canItemStacksStack(stack, existing)) { - return stack; - } - - limit -= existing.getCount(); - } - - if (limit <= 0) { - return stack; - } - - boolean reachedLimit = stack.getCount() > limit; - - if (!simulate) { - if (existing.isEmpty()) { - this.inv[slot] = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) - .createStack(reachedLimit ? Platform.copyStackWithSize(stack, limit) : stack); - } else { - existing.increment(reachedLimit ? limit : stack.getCount()); - } - this.fireOnChangeInventory(slot, InvOperation.INSERT, ItemStack.EMPTY, - reachedLimit ? Platform.copyStackWithSize(stack, limit) : stack); - } - return reachedLimit ? Platform.copyStackWithSize(stack, stack.getCount() - limit) : ItemStack.EMPTY; + public int getChangeValue() { + return 0; } + @Nullable @Override - public ItemStack extractItem(int slot, int amount, boolean simulate) { - if (this.inv[slot] != null) { - final ItemStack split = this.getStackInSlot(slot); - - if (amount >= split.getCount()) { - if (!simulate) { - this.inv[slot] = null; - this.fireOnChangeInventory(slot, InvOperation.EXTRACT, split, ItemStack.EMPTY); - } - return split; - } else { - if (!simulate) { - split.increment(-amount); - this.fireOnChangeInventory(slot, InvOperation.EXTRACT, - Platform.copyStackWithSize(split, amount), ItemStack.EMPTY); - } - return Platform.copyStackWithSize(split, amount); - } - } - return ItemStack.EMPTY; - } - - @Override - public void setStackInSlot(final int slot, final ItemStack newItemStack) { - ItemStack oldStack = this.getStackInSlot(slot).copy(); - this.inv[slot] = AEApi.instance().storage().getStorageChannel(IItemStorageChannel.class) - .createStack(newItemStack); - - if (this.te != null && Platform.isServer()) { - ItemStack newStack = newItemStack.copy(); - InvOperation op = InvOperation.SET; - - if (ItemStack.areItemsEqual(oldStack, newStack)) { - if (newStack.getCount() > oldStack.getCount()) { - newStack.shrink(oldStack.getCount()); - oldStack = ItemStack.EMPTY; - op = InvOperation.INSERT; - } else { - oldStack.shrink(newStack.getCount()); - newStack = ItemStack.EMPTY; - op = InvOperation.EXTRACT; - } - } - this.fireOnChangeInventory(slot, op, oldStack, newStack); - } + public ListenerToken addListener(InvMarkDirtyListener listener, ListenerRemovalToken removalToken) { + return null; } private void fireOnChangeInventory(int slot, InvOperation op, ItemStack removed, ItemStack inserted) { @@ -214,8 +186,8 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab } @Override - public int getSlotLimit(int slot) { - return this.maxStack > 64 ? 64 : this.maxStack; + public int getMaxAmount(int slot, ItemStack is) { + return Math.min(this.maxStack, 64); } @Override @@ -223,12 +195,4 @@ public class AppEngInternalAEInventory implements IItemHandlerModifiable, Iterab return new InvIterator(this); } - public Iterator getNewAEIterator() { - return new AEInvIterator(this); - } - - @Override - public boolean isItemValid(int slot, ItemStack stack) { - return true; - } } diff --git a/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java index d12f8bac9..d8e39fdf0 100644 --- a/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java +++ b/src/main/java/appeng/tile/inventory/AppEngInternalInventory.java @@ -18,26 +18,28 @@ package appeng.tile.inventory; -import java.util.Arrays; -import java.util.Collections; -import java.util.Iterator; - -import javax.annotation.Nonnull; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundTag; -import net.minecraftforge.items.ItemStackHandler; - +import alexiil.mc.lib.attributes.Simulation; +import alexiil.mc.lib.attributes.item.FixedItemInvView; +import alexiil.mc.lib.attributes.item.filter.ConstantItemFilter; +import alexiil.mc.lib.attributes.item.filter.ItemFilter; +import alexiil.mc.lib.attributes.item.impl.FullFixedItemInv; import appeng.util.Platform; import appeng.util.inv.IAEAppEngInventory; import appeng.util.inv.InvOperation; import appeng.util.inv.filter.IAEItemFilter; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.CompoundTag; -public class AppEngInternalInventory extends ItemStackHandler implements Iterable { +import javax.annotation.Nonnull; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; + +// FIXME: the filtering is not correctly implemented and need to be reworked +public class AppEngInternalInventory extends FullFixedItemInv implements Iterable { private boolean enableClientEvents = false; private IAEAppEngInventory te; private final int[] maxStack; - private ItemStack previousStack = ItemStack.EMPTY; private IAEItemFilter filter; private boolean dirtyFlag = false; @@ -48,6 +50,8 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl this.setFilter(filter); this.maxStack = new int[size]; Arrays.fill(this.maxStack, maxStack); + + setOwnerListener(this::onContentsChanged); } public AppEngInternalInventory(final IAEAppEngInventory inventory, final int size, final int maxStack) { @@ -63,57 +67,24 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl } @Override - public int getSlotLimit(int slot) { - return this.maxStack[slot]; + public int getMaxAmount(int slot, ItemStack stack) { + return Math.min(maxStack[slot], super.getMaxAmount(slot, stack)); } - @Override - public void setStackInSlot(int slot, @Nonnull ItemStack stack) { - this.previousStack = this.getStackInSlot(slot).copy(); - super.setStackInSlot(slot, stack); - } - - @Override - @Nonnull - public ItemStack insertItem(int slot, @Nonnull ItemStack stack, boolean simulate) { - if (this.filter != null && !this.filter.allowInsert(this, slot, stack)) { - return stack; - } - - if (!simulate) { - this.previousStack = this.getStackInSlot(slot).copy(); - } - return super.insertItem(slot, stack, simulate); - } - - @Override - @Nonnull - public ItemStack extractItem(int slot, int amount, boolean simulate) { - if (this.filter != null && !this.filter.allowExtract(this, slot, amount)) { - return ItemStack.EMPTY; - } - - if (!simulate) { - this.previousStack = this.getStackInSlot(slot).copy(); - } - return super.extractItem(slot, amount, simulate); - } - - @Override - protected void onContentsChanged(int slot) { + protected void onContentsChanged(FixedItemInvView inv, int slot, ItemStack previous, ItemStack current) { if (this.getBlockEntity() != null && this.eventsEnabled() && !this.dirtyFlag) { this.dirtyFlag = true; - ItemStack newStack = this.getStackInSlot(slot).copy(); - ItemStack oldStack = this.previousStack; + ItemStack newStack = current.copy(); + ItemStack oldStack = previous; InvOperation op = InvOperation.SET; if (newStack.isEmpty() || oldStack.isEmpty() || ItemStack.areItemsEqual(newStack, oldStack)) { if (newStack.getCount() > oldStack.getCount()) { - newStack.shrink(oldStack.getCount()); + newStack.decrement(oldStack.getCount()); oldStack = ItemStack.EMPTY; op = InvOperation.INSERT; } else { - oldStack.shrink(newStack.getCount()); + oldStack.decrement(newStack.getCount()); newStack = ItemStack.EMPTY; op = InvOperation.EXTRACT; } @@ -121,10 +92,8 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl this.getBlockEntity().onChangeInventory(this, slot, op, oldStack, newStack); this.getBlockEntity().saveChanges(); - this.previousStack = ItemStack.EMPTY; this.dirtyFlag = false; } - super.onContentsChanged(slot); } protected boolean eventsEnabled() { @@ -136,7 +105,25 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl } @Override - public boolean isItemValid(int slot, ItemStack stack) { + public ItemFilter getFilterForSlot(int slot) { + if (this.maxStack[slot] == 0) { + return ConstantItemFilter.NOTHING; + } + if (this.filter != null) { + return stack -> { + // FIXME: This is not correct... + if (stack == ItemStack.EMPTY) { + return filter.allowExtract(this, slot, this.getSlot(slot).get().getCount()); + } else { + return filter.allowExtract(this, slot, this.getSlot(slot).get().getCount()); + } + }; + } + return ConstantItemFilter.ANYTHING; + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack stack) { if (this.maxStack[slot] == 0) { return false; } @@ -147,7 +134,7 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl } public void writeToNBT(final CompoundTag data, final String name) { - data.put(name, this.serializeNBT()); + data.put(name, this.toTag()); } public void readFromNBT(final CompoundTag data, final String name) { @@ -158,12 +145,12 @@ public class AppEngInternalInventory extends ItemStackHandler implements Iterabl } public void readFromNBT(final CompoundTag data) { - this.deserializeNBT(data); + this.fromTag(data); } @Override public Iterator iterator() { - return Collections.unmodifiableList(super.stacks).iterator(); + return stackIterable().iterator(); } private boolean isEnableClientEvents() { diff --git a/src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java b/src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java index e8067ff9b..aab883d44 100644 --- a/src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java +++ b/src/main/java/appeng/tile/misc/CellWorkbenchBlockEntity.java @@ -67,7 +67,7 @@ public class CellWorkbenchBlockEntity extends AEBaseBlockEntity return null; } - final ItemStack is = this.cell.getStackInSlot(0); + final ItemStack is = this.cell.getInvStack(0); if (is.isEmpty()) { return null; } @@ -83,12 +83,12 @@ public class CellWorkbenchBlockEntity extends AEBaseBlockEntity } public ICellWorkbenchItem getCell() { - if (this.cell.getStackInSlot(0).isEmpty()) { + if (this.cell.getInvStack(0).isEmpty()) { return null; } - if (this.cell.getStackInSlot(0).getItem() instanceof ICellWorkbenchItem) { - return ((ICellWorkbenchItem) this.cell.getStackInSlot(0).getItem()); + if (this.cell.getInvStack(0).getItem() instanceof ICellWorkbenchItem) { + return ((ICellWorkbenchItem) this.cell.getInvStack(0).getItem()); } return null; @@ -183,7 +183,7 @@ public class CellWorkbenchBlockEntity extends AEBaseBlockEntity return null; } - final ItemStack is = this.cell.getStackInSlot(0); + final ItemStack is = this.cell.getInvStack(0); if (is.isEmpty()) { return null; } @@ -202,8 +202,8 @@ public class CellWorkbenchBlockEntity extends AEBaseBlockEntity public void getDrops(final World w, final BlockPos pos, final List drops) { super.getDrops(w, pos, drops); - if (this.cell.getStackInSlot(0) != null) { - drops.add(this.cell.getStackInSlot(0)); + if (this.cell.getInvStack(0) != null) { + drops.add(this.cell.getInvStack(0)); } } diff --git a/src/main/java/appeng/tile/misc/ChargerBlockEntity.java b/src/main/java/appeng/tile/misc/ChargerBlockEntity.java index f980190d9..1dd6ad875 100644 --- a/src/main/java/appeng/tile/misc/ChargerBlockEntity.java +++ b/src/main/java/appeng/tile/misc/ChargerBlockEntity.java @@ -91,7 +91,7 @@ public class ChargerBlockEntity extends AENetworkPowerBlockEntity implements ICr @Override protected void writeToStream(final PacketByteBuf data) throws IOException { super.writeToStream(data); - final AEItemStack is = AEItemStack.fromItemStack(this.inv.getStackInSlot(0)); + final AEItemStack is = AEItemStack.fromItemStack(this.inv.getInvStack(0)); if (is != null) { is.writeToPacket(data); } @@ -113,7 +113,7 @@ public class ChargerBlockEntity extends AENetworkPowerBlockEntity implements ICr public void applyTurn() { this.injectExternalPower(PowerUnits.AE, POWER_PER_CRANK_TURN, Actionable.MODULATE); - final ItemStack myItem = this.inv.getStackInSlot(0); + final ItemStack myItem = this.inv.getInvStack(0); if (this.getInternalCurrentPower() > POWER_THRESHOLD) { final IMaterials materials = AEApi.instance().definitions().materials(); @@ -153,7 +153,7 @@ public class ChargerBlockEntity extends AENetworkPowerBlockEntity implements ICr return; } - final ItemStack myItem = this.inv.getStackInSlot(0); + final ItemStack myItem = this.inv.getInvStack(0); if (myItem.isEmpty()) { ItemStack held = player.inventory.getCurrentItem(); @@ -181,7 +181,7 @@ public class ChargerBlockEntity extends AENetworkPowerBlockEntity implements ICr } private boolean doWork() { - final ItemStack myItem = this.inv.getStackInSlot(0); + final ItemStack myItem = this.inv.getInvStack(0); boolean changed = false; if (!myItem.isEmpty()) { diff --git a/src/main/java/appeng/tile/misc/CondenserBlockEntity.java b/src/main/java/appeng/tile/misc/CondenserBlockEntity.java index 8d10fd527..c734fc417 100644 --- a/src/main/java/appeng/tile/misc/CondenserBlockEntity.java +++ b/src/main/java/appeng/tile/misc/CondenserBlockEntity.java @@ -102,7 +102,7 @@ public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfi } public double getStorage() { - final ItemStack is = this.storageSlot.getStackInSlot(0); + final ItemStack is = this.storageSlot.getInvStack(0); if (!is.isEmpty()) { if (is.getItem() instanceof IStorageComponent) { final IStorageComponent sc = (IStorageComponent) is.getItem(); @@ -247,7 +247,7 @@ public class CondenserBlockEntity extends AEBaseInvBlockEntity implements IConfi } @Override - public int getSlotLimit(int slot) { + public int getMaxAmount(int slot, ItemStack is) { return 64; } } diff --git a/src/main/java/appeng/tile/misc/InscriberBlockEntity.java b/src/main/java/appeng/tile/misc/InscriberBlockEntity.java index 26de66107..b411b01a7 100644 --- a/src/main/java/appeng/tile/misc/InscriberBlockEntity.java +++ b/src/main/java/appeng/tile/misc/InscriberBlockEntity.java @@ -199,7 +199,7 @@ public class InscriberBlockEntity extends AENetworkPowerBlockEntity super.getDrops(w, pos, drops); for (int h = 0; h < this.upgrades.getSlots(); h++) { - final ItemStack is = this.upgrades.getStackInSlot(h); + final ItemStack is = this.upgrades.getInvStack(h); if (!is.isEmpty()) { drops.add(is); } @@ -249,9 +249,9 @@ public class InscriberBlockEntity extends AENetworkPowerBlockEntity @Nullable public InscriberRecipe getTask() { if (this.cachedTask == null && world != null) { - ItemStack input = this.sideItemHandler.getStackInSlot(0); - ItemStack plateA = this.topItemHandler.getStackInSlot(0); - ItemStack plateB = this.bottomItemHandler.getStackInSlot(0); + ItemStack input = this.sideItemHandler.getInvStack(0); + ItemStack plateA = this.topItemHandler.getInvStack(0); + ItemStack plateB = this.bottomItemHandler.getInvStack(0); if (input.isEmpty()) { return null; // No input to handle } diff --git a/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java b/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java index a9d262e8e..45e193247 100644 --- a/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java +++ b/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java @@ -118,7 +118,7 @@ public class SecurityStationBlockEntity extends AENetworkBlockEntity implements @Override public void getDrops(final World w, final BlockPos pos, final List drops) { if (!ItemHandlerUtil.isEmpty(this.getConfigSlot())) { - drops.add(this.getConfigSlot().getStackInSlot(0)); + drops.add(this.getConfigSlot().getInvStack(0)); } for (final IAEItemStack ais : this.inventory.getStoredItems()) { diff --git a/src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java b/src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java index fcc45ce46..e4ace0161 100644 --- a/src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java +++ b/src/main/java/appeng/tile/misc/VibrationChamberBlockEntity.java @@ -134,7 +134,7 @@ public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity impleme } private boolean canEatFuel() { - final ItemStack is = this.inv.getStackInSlot(0); + final ItemStack is = this.inv.getInvStack(0); if (!is.isEmpty()) { final int newBurnTime = ForgeHooks.getBurnTime(is); if (newBurnTime > 0 && is.getCount() > 0) { @@ -206,7 +206,7 @@ public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity impleme } private void eatFuel() { - final ItemStack is = this.inv.getStackInSlot(0); + final ItemStack is = this.inv.getInvStack(0); if (!is.isEmpty()) { final int newBurnTime = ForgeHooks.getBurnTime(is); if (newBurnTime > 0 && is.getCount() > 0) { @@ -214,7 +214,7 @@ public class VibrationChamberBlockEntity extends AENetworkInvBlockEntity impleme this.setMaxBurnTime(this.getBurnTime()); final Item fuelItem = is.getItem(); - is.shrink(1); + is.decrement(1); if (is.isEmpty()) { this.inv.setStackInSlot(0, fuelItem.getRecipeRemainder(is)); diff --git a/src/main/java/appeng/tile/networking/WirelessBlockEntity.java b/src/main/java/appeng/tile/networking/WirelessBlockEntity.java index 115d0b4d3..afda632c2 100644 --- a/src/main/java/appeng/tile/networking/WirelessBlockEntity.java +++ b/src/main/java/appeng/tile/networking/WirelessBlockEntity.java @@ -138,7 +138,7 @@ public class WirelessBlockEntity extends AENetworkInvBlockEntity implements IWir } private int getBoosters() { - final ItemStack boosters = this.inv.getStackInSlot(0); + final ItemStack boosters = this.inv.getInvStack(0); return boosters == null ? 0 : boosters.getCount(); } diff --git a/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java b/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java index cc5f803d7..f27c155e9 100644 --- a/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java +++ b/src/main/java/appeng/tile/qnb/QuantumBridgeBlockEntity.java @@ -93,7 +93,7 @@ public class QuantumBridgeBlockEntity extends AENetworkInvBlockEntity implements super.writeToStream(data); int out = this.constructed; - if (!this.internalInventory.getStackInSlot(0).isEmpty() && this.constructed != -1) { + if (!this.internalInventory.getInvStack(0).isEmpty() && this.constructed != -1) { out |= this.hasSingularity; } @@ -239,7 +239,7 @@ public class QuantumBridgeBlockEntity extends AENetworkInvBlockEntity implements } public long getQEFrequency() { - final ItemStack is = this.internalInventory.getStackInSlot(0); + final ItemStack is = this.internalInventory.getInvStack(0); if (!is.isEmpty()) { final CompoundTag c = is.getTag(); if (c != null) { diff --git a/src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java b/src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java index 12f8a22af..3fdda19dd 100644 --- a/src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java +++ b/src/main/java/appeng/tile/spatial/SpatialIOPortBlockEntity.java @@ -98,7 +98,7 @@ public class SpatialIOPortBlockEntity extends AENetworkInvBlockEntity implements private void triggerTransition() { if (Platform.isServer()) { - final ItemStack cell = this.inv.getStackInSlot(0); + final ItemStack cell = this.inv.getInvStack(0); if (this.isSpatialCell(cell)) { TickHandler.INSTANCE.addCallable(null, this);// this needs to be cross world synced. } @@ -115,8 +115,8 @@ public class SpatialIOPortBlockEntity extends AENetworkInvBlockEntity implements @Override public Void call(final World world) throws Exception { - final ItemStack cell = this.inv.getStackInSlot(0); - if (this.isSpatialCell(cell) && this.inv.getStackInSlot(1).isEmpty()) { + final ItemStack cell = this.inv.getInvStack(0); + if (this.isSpatialCell(cell) && this.inv.getInvStack(1).isEmpty()) { final IGrid gi = this.getProxy().getGrid(); final IEnergyGrid energy = this.getProxy().getEnergy(); diff --git a/src/main/java/appeng/tile/storage/ChestBlockEntity.java b/src/main/java/appeng/tile/storage/ChestBlockEntity.java index cd28c8e69..bae244826 100644 --- a/src/main/java/appeng/tile/storage/ChestBlockEntity.java +++ b/src/main/java/appeng/tile/storage/ChestBlockEntity.java @@ -144,7 +144,7 @@ public class ChestBlockEntity extends AENetworkPowerBlockEntity } public ItemStack getCell() { - return this.cellInventory.getStackInSlot(0); + return this.cellInventory.getInvStack(0); } @Override @@ -471,7 +471,7 @@ public class ChestBlockEntity extends AENetworkPowerBlockEntity if (this.cellHandler != null && this.cellHandler.getChannel() == AEApi.instance().storage() .getStorageChannel(IItemStorageChannel.class)) { final IAEItemStack returns = Platform.poweredInsert(this, this.cellHandler, - AEItemStack.fromItemStack(this.inputInventory.getStackInSlot(0)), this.mySrc); + AEItemStack.fromItemStack(this.inputInventory.getInvStack(0)), this.mySrc); if (returns == null) { this.inputInventory.setStackInSlot(0, ItemStack.EMPTY); diff --git a/src/main/java/appeng/tile/storage/DriveBlockEntity.java b/src/main/java/appeng/tile/storage/DriveBlockEntity.java index acd076e1b..0a4ddfceb 100644 --- a/src/main/java/appeng/tile/storage/DriveBlockEntity.java +++ b/src/main/java/appeng/tile/storage/DriveBlockEntity.java @@ -207,7 +207,7 @@ public class DriveBlockEntity extends AENetworkInvBlockEntity implements IChestO return cellItems[slot]; } - ItemStack stackInSlot = inv.getStackInSlot(slot); + ItemStack stackInSlot = inv.getInvStack(slot); if (!stackInSlot.isEmpty()) { return stackInSlot.getItem(); } @@ -336,7 +336,7 @@ public class DriveBlockEntity extends AENetworkInvBlockEntity implements IChestO double power = 2.0; for (int x = 0; x < this.inv.getSlots(); x++) { - final ItemStack is = this.inv.getStackInSlot(x); + final ItemStack is = this.inv.getInvStack(x); this.invBySlot[x] = null; this.handlersBySlot[x] = null; diff --git a/src/main/java/appeng/tile/storage/IOPortBlockEntity.java b/src/main/java/appeng/tile/storage/IOPortBlockEntity.java index 70135d4a6..9706c1f5c 100644 --- a/src/main/java/appeng/tile/storage/IOPortBlockEntity.java +++ b/src/main/java/appeng/tile/storage/IOPortBlockEntity.java @@ -262,7 +262,7 @@ public class IOPortBlockEntity extends AENetworkInvBlockEntity try { final IEnergySource energy = this.getProxy().getEnergy(); for (int x = 0; x < NUMBER_OF_CELL_SLOTS; x++) { - final ItemStack is = this.inputCells.getStackInSlot(x); + final ItemStack is = this.inputCells.getInvStack(x); if (!is.isEmpty()) { boolean shouldMove = true; @@ -394,7 +394,7 @@ public class IOPortBlockEntity extends AENetworkInvBlockEntity private boolean moveSlot(final int x) { final InventoryAdaptor ad = new AdaptorFixedInv(this.outputCells); - if (ad.addItems(this.inputCells.getStackInSlot(x)).isEmpty()) { + if (ad.addItems(this.inputCells.getInvStack(x)).isEmpty()) { this.inputCells.setStackInSlot(x, ItemStack.EMPTY); return true; } @@ -438,7 +438,7 @@ public class IOPortBlockEntity extends AENetworkInvBlockEntity super.getDrops(w, pos, drops); for (int upgradeIndex = 0; upgradeIndex < this.upgrades.getSlots(); upgradeIndex++) { - final ItemStack stackInSlot = this.upgrades.getStackInSlot(upgradeIndex); + final ItemStack stackInSlot = this.upgrades.getInvStack(upgradeIndex); if (!stackInSlot.isEmpty()) { drops.add(stackInSlot); diff --git a/src/main/java/appeng/util/iterators/AEInvIterator.java b/src/main/java/appeng/util/iterators/AEInvIterator.java deleted file mode 100644 index dc8a78aa3..000000000 --- a/src/main/java/appeng/util/iterators/AEInvIterator.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * This file is part of Applied Energistics 2. - * Copyright (c) 2013 - 2014, AlgorithmX2, All rights reserved. - * - * Applied Energistics 2 is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Applied Energistics 2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Applied Energistics 2. If not, see . - */ - -package appeng.util.iterators; - -import java.util.Iterator; - -import appeng.api.storage.data.IAEItemStack; -import appeng.tile.inventory.AppEngInternalAEInventory; - -public final class AEInvIterator implements Iterator { - private final AppEngInternalAEInventory inventory; - private final int size; - - private int counter = 0; - - public AEInvIterator(final AppEngInternalAEInventory inventory) { - this.inventory = inventory; - this.size = this.inventory.getSlots(); - } - - @Override - public boolean hasNext() { - return this.counter < this.size; - } - - @Override - public IAEItemStack next() { - final IAEItemStack result = this.inventory.getAEStackInSlot(this.counter); - - this.counter++; - - return result; - } - - @Override - public void remove() { - throw new UnsupportedOperationException(); - } -}