Merge pull request #444 from refinedmods/refactor/GH-443/partitioning

refactor: partition by feature

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java

@@ -5,41 +5,41 @@
 import com.refinedmods.refinedstorage2.api.network.component.NetworkComponent;
 import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage;
 import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer;
-import com.refinedmods.refinedstorage2.platform.api.blockentity.constructor.ConstructorStrategyFactory;
-import com.refinedmods.refinedstorage2.platform.api.blockentity.destructor.DestructorStrategyFactory;
-import com.refinedmods.refinedstorage2.platform.api.blockentity.storagemonitor.StorageMonitorExtractionStrategy;
-import com.refinedmods.refinedstorage2.platform.api.blockentity.storagemonitor.StorageMonitorInsertionStrategy;
-import com.refinedmods.refinedstorage2.platform.api.blockentity.wirelesstransmitter.WirelessTransmitterRangeModifier;
+import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.exporter.ExporterTransferStrategyFactory;
 import com.refinedmods.refinedstorage2.platform.api.grid.Grid;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridExtractionStrategy;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridExtractionStrategyFactory;
 import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHint;
 import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHints;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionStrategy;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionStrategyFactory;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollingStrategy;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollingStrategyFactory;
 import com.refinedmods.refinedstorage2.platform.api.grid.GridSynchronizer;
-import com.refinedmods.refinedstorage2.platform.api.integration.recipemod.IngredientConverter;
-import com.refinedmods.refinedstorage2.platform.api.item.EnergyItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.item.NetworkBoundItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.item.SlotReference;
-import com.refinedmods.refinedstorage2.platform.api.item.SlotReferenceFactory;
-import com.refinedmods.refinedstorage2.platform.api.item.SlotReferenceProvider;
-import com.refinedmods.refinedstorage2.platform.api.item.StorageContainerItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.network.node.exporter.ExporterTransferStrategyFactory;
-import com.refinedmods.refinedstorage2.platform.api.network.node.externalstorage.PlatformExternalStorageProviderFactory;
-import com.refinedmods.refinedstorage2.platform.api.network.node.importer.ImporterTransferStrategyFactory;
-import com.refinedmods.refinedstorage2.platform.api.registry.PlatformRegistry;
-import com.refinedmods.refinedstorage2.platform.api.resource.FluidResource;
-import com.refinedmods.refinedstorage2.platform.api.resource.ItemResource;
-import com.refinedmods.refinedstorage2.platform.api.resource.ResourceFactory;
-import com.refinedmods.refinedstorage2.platform.api.resource.ResourceRendering;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.importer.ImporterTransferStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.recipemod.IngredientConverter;
+import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItemHelper;
 import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository;
+import com.refinedmods.refinedstorage2.platform.api.storage.StorageType;
 import com.refinedmods.refinedstorage2.platform.api.storage.channel.PlatformStorageChannelType;
-import com.refinedmods.refinedstorage2.platform.api.storage.type.StorageType;
+import com.refinedmods.refinedstorage2.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory;
+import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy;
+import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy;
+import com.refinedmods.refinedstorage2.platform.api.support.energy.EnergyItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.NetworkBoundItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReferenceFactory;
+import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReferenceProvider;
+import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.FluidResource;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.ItemResource;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering;
 import com.refinedmods.refinedstorage2.platform.api.upgrade.BuiltinUpgradeDestinations;
 import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry;
+import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier;
 
 import java.util.Collection;
 import java.util.Optional;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java

@@ -5,41 +5,41 @@
 import com.refinedmods.refinedstorage2.api.network.component.NetworkComponent;
 import com.refinedmods.refinedstorage2.api.network.energy.EnergyStorage;
 import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer;
-import com.refinedmods.refinedstorage2.platform.api.blockentity.constructor.ConstructorStrategyFactory;
-import com.refinedmods.refinedstorage2.platform.api.blockentity.destructor.DestructorStrategyFactory;
-import com.refinedmods.refinedstorage2.platform.api.blockentity.storagemonitor.StorageMonitorExtractionStrategy;
-import com.refinedmods.refinedstorage2.platform.api.blockentity.storagemonitor.StorageMonitorInsertionStrategy;
-import com.refinedmods.refinedstorage2.platform.api.blockentity.wirelesstransmitter.WirelessTransmitterRangeModifier;
+import com.refinedmods.refinedstorage2.platform.api.constructordestructor.ConstructorStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.constructordestructor.DestructorStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.exporter.ExporterTransferStrategyFactory;
 import com.refinedmods.refinedstorage2.platform.api.grid.Grid;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridExtractionStrategy;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridExtractionStrategyFactory;
 import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHint;
 import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionHints;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionStrategy;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridInsertionStrategyFactory;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollingStrategy;
-import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollingStrategyFactory;
 import com.refinedmods.refinedstorage2.platform.api.grid.GridSynchronizer;
-import com.refinedmods.refinedstorage2.platform.api.integration.recipemod.IngredientConverter;
-import com.refinedmods.refinedstorage2.platform.api.item.EnergyItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.item.NetworkBoundItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.item.SlotReference;
-import com.refinedmods.refinedstorage2.platform.api.item.SlotReferenceFactory;
-import com.refinedmods.refinedstorage2.platform.api.item.SlotReferenceProvider;
-import com.refinedmods.refinedstorage2.platform.api.item.StorageContainerItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.network.node.exporter.ExporterTransferStrategyFactory;
-import com.refinedmods.refinedstorage2.platform.api.network.node.externalstorage.PlatformExternalStorageProviderFactory;
-import com.refinedmods.refinedstorage2.platform.api.network.node.importer.ImporterTransferStrategyFactory;
-import com.refinedmods.refinedstorage2.platform.api.registry.PlatformRegistry;
-import com.refinedmods.refinedstorage2.platform.api.resource.FluidResource;
-import com.refinedmods.refinedstorage2.platform.api.resource.ItemResource;
-import com.refinedmods.refinedstorage2.platform.api.resource.ResourceFactory;
-import com.refinedmods.refinedstorage2.platform.api.resource.ResourceRendering;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategy;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridInsertionStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.importer.ImporterTransferStrategyFactory;
+import com.refinedmods.refinedstorage2.platform.api.recipemod.IngredientConverter;
+import com.refinedmods.refinedstorage2.platform.api.storage.StorageContainerItemHelper;
 import com.refinedmods.refinedstorage2.platform.api.storage.StorageRepository;
+import com.refinedmods.refinedstorage2.platform.api.storage.StorageType;
 import com.refinedmods.refinedstorage2.platform.api.storage.channel.PlatformStorageChannelType;
-import com.refinedmods.refinedstorage2.platform.api.storage.type.StorageType;
+import com.refinedmods.refinedstorage2.platform.api.storage.externalstorage.PlatformExternalStorageProviderFactory;
+import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorExtractionStrategy;
+import com.refinedmods.refinedstorage2.platform.api.storagemonitor.StorageMonitorInsertionStrategy;
+import com.refinedmods.refinedstorage2.platform.api.support.energy.EnergyItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.NetworkBoundItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReferenceFactory;
+import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReferenceProvider;
+import com.refinedmods.refinedstorage2.platform.api.support.registry.PlatformRegistry;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.FluidResource;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.ItemResource;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceFactory;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.ResourceRendering;
 import com.refinedmods.refinedstorage2.platform.api.upgrade.BuiltinUpgradeDestinations;
 import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeRegistry;
+import com.refinedmods.refinedstorage2.platform.api.wirelesstransmitter.WirelessTransmitterRangeModifier;
 
 import java.util.Collection;
 import java.util.Optional;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/blockentity/ConfigurationCardTarget.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/ConfigurationCardTarget.java

@@ -1,11 +1,14 @@
-package com.refinedmods.refinedstorage2.platform.api.blockentity;
+package com.refinedmods.refinedstorage2.platform.api.configurationcard;
 
 import java.util.List;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.Item;
 import org.apiguardian.api.API;
 
+/**
+ * Implement this on a block entity that supports the configuration card.
+ */
 @API(status = API.Status.STABLE, since = "2.0.0-milestone.3.2")
 public interface ConfigurationCardTarget {
     void writeConfiguration(CompoundTag tag);

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/configurationcard/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@FieldsAndMethodsAreNonnullByDefault
+package com.refinedmods.refinedstorage2.platform.api.configurationcard;
+
+import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/blockentity/constructor/ConstructorStrategy.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/ConstructorStrategy.java

@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.blockentity.constructor;
+package com.refinedmods.refinedstorage2.platform.api.constructordestructor;
 
 import com.refinedmods.refinedstorage2.api.network.Network;
 import com.refinedmods.refinedstorage2.api.storage.Actor;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/blockentity/constructor/ConstructorStrategyFactory.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/ConstructorStrategyFactory.java

@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.blockentity.constructor;
+package com.refinedmods.refinedstorage2.platform.api.constructordestructor;
 
 import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState;
 

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/blockentity/destructor/DestructorStrategy.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/DestructorStrategy.java

@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.blockentity.destructor;
+package com.refinedmods.refinedstorage2.platform.api.constructordestructor;
 
 import com.refinedmods.refinedstorage2.api.core.filter.Filter;
 import com.refinedmods.refinedstorage2.api.network.Network;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/blockentity/destructor/DestructorStrategyFactory.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/DestructorStrategyFactory.java

@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.blockentity.destructor;
+package com.refinedmods.refinedstorage2.platform.api.constructordestructor;
 
 import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState;
 

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/integration/recipemod/package-info.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/constructordestructor/package-info.java

@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @FieldsAndMethodsAreNonnullByDefault
-package com.refinedmods.refinedstorage2.platform.api.integration.recipemod;
+package com.refinedmods.refinedstorage2.platform.api.constructordestructor;
 
 import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
 

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/network/node/exporter/AmountOverride.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/AmountOverride.java

@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.network.node.exporter;
+package com.refinedmods.refinedstorage2.platform.api.exporter;
 
 import java.util.function.LongSupplier;
 

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/network/node/exporter/ExporterTransferStrategyFactory.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/ExporterTransferStrategyFactory.java

@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.network.node.exporter;
+package com.refinedmods.refinedstorage2.platform.api.exporter;
 
 import com.refinedmods.refinedstorage2.api.network.node.exporter.ExporterTransferStrategy;
 import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/registry/package-info.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/exporter/package-info.java

@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @FieldsAndMethodsAreNonnullByDefault
-package com.refinedmods.refinedstorage2.platform.api.registry;
+package com.refinedmods.refinedstorage2.platform.api.exporter;
 
 import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
 

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/Grid.java

@@ -6,8 +6,8 @@
 import com.refinedmods.refinedstorage2.api.storage.Storage;
 import com.refinedmods.refinedstorage2.api.storage.TrackedResourceAmount;
 import com.refinedmods.refinedstorage2.api.storage.channel.StorageChannelType;
-import com.refinedmods.refinedstorage2.platform.api.resource.ItemResource;
 import com.refinedmods.refinedstorage2.platform.api.storage.channel.PlatformStorageChannelType;
+import com.refinedmods.refinedstorage2.platform.api.support.resource.ItemResource;
 
 import java.util.List;
 

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridExtractionStrategy.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridExtractionStrategy.java

@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.grid;
+package com.refinedmods.refinedstorage2.platform.api.grid.strategy;
 
 import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode;
 import com.refinedmods.refinedstorage2.platform.api.storage.channel.PlatformStorageChannelType;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridExtractionStrategyFactory.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridExtractionStrategyFactory.java

@@ -1,4 +1,6 @@
-package com.refinedmods.refinedstorage2.platform.api.grid;
+package com.refinedmods.refinedstorage2.platform.api.grid.strategy;
+
+import com.refinedmods.refinedstorage2.platform.api.grid.Grid;
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridInsertionStrategy.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridInsertionStrategy.java

@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.grid;
+package com.refinedmods.refinedstorage2.platform.api.grid.strategy;
 
 import com.refinedmods.refinedstorage2.api.grid.operations.GridInsertMode;
 

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridInsertionStrategyFactory.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridInsertionStrategyFactory.java

@@ -1,4 +1,6 @@
-package com.refinedmods.refinedstorage2.platform.api.grid;
+package com.refinedmods.refinedstorage2.platform.api.grid.strategy;
+
+import com.refinedmods.refinedstorage2.platform.api.grid.Grid;
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridScrollingStrategy.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridScrollingStrategy.java

@@ -1,5 +1,6 @@
-package com.refinedmods.refinedstorage2.platform.api.grid;
+package com.refinedmods.refinedstorage2.platform.api.grid.strategy;
 
+import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode;
 import com.refinedmods.refinedstorage2.platform.api.storage.channel.PlatformStorageChannelType;
 
 import org.apiguardian.api.API;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/GridScrollingStrategyFactory.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/GridScrollingStrategyFactory.java

@@ -1,4 +1,6 @@
-package com.refinedmods.refinedstorage2.platform.api.grid;
+package com.refinedmods.refinedstorage2.platform.api.grid.strategy;
+
+import com.refinedmods.refinedstorage2.platform.api.grid.Grid;
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/strategy/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@FieldsAndMethodsAreNonnullByDefault
+package com.refinedmods.refinedstorage2.platform.api.grid.strategy;
+
+import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/AbstractPlatformGridResource.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/AbstractPlatformGridResource.java

@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.grid;
+package com.refinedmods.refinedstorage2.platform.api.grid.view;
 
 import com.refinedmods.refinedstorage2.api.grid.view.GridResourceAttributeKey;
 import com.refinedmods.refinedstorage2.api.grid.view.GridView;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/PlatformGridResource.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/PlatformGridResource.java

@@ -1,7 +1,10 @@
-package com.refinedmods.refinedstorage2.platform.api.grid;
+package com.refinedmods.refinedstorage2.platform.api.grid.view;
 
 import com.refinedmods.refinedstorage2.api.grid.operations.GridExtractMode;
 import com.refinedmods.refinedstorage2.api.grid.view.GridResource;
+import com.refinedmods.refinedstorage2.platform.api.grid.GridScrollMode;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridExtractionStrategy;
+import com.refinedmods.refinedstorage2.platform.api.grid.strategy.GridScrollingStrategy;
 
 import java.util.List;
 import java.util.Optional;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/grid/view/package-info.java

@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@FieldsAndMethodsAreNonnullByDefault
+package com.refinedmods.refinedstorage2.platform.api.grid.view;
+
+import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/network/node/importer/ImporterTransferStrategyFactory.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/importer/ImporterTransferStrategyFactory.java

@@ -1,7 +1,7 @@
-package com.refinedmods.refinedstorage2.platform.api.network.node.importer;
+package com.refinedmods.refinedstorage2.platform.api.importer;
 
 import com.refinedmods.refinedstorage2.api.network.node.importer.ImporterTransferStrategy;
-import com.refinedmods.refinedstorage2.platform.api.network.node.exporter.AmountOverride;
+import com.refinedmods.refinedstorage2.platform.api.exporter.AmountOverride;
 import com.refinedmods.refinedstorage2.platform.api.upgrade.UpgradeState;
 
 import net.minecraft.core.BlockPos;

refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/resource/package-info.java → refinedstorage2-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/importer/package-info.java

@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @FieldsAndMethodsAreNonnullByDefault
-package com.refinedmods.refinedstorage2.platform.api.resource;
+package com.refinedmods.refinedstorage2.platform.api.importer;
 
 import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;