refactor: add network package structure under support

refinedmods · Nov 3, 2023 · 2edb8e8 · 2edb8e8
1 parent 17a5609
commit 2edb8e8
Show file tree

Hide file tree

Showing 86 changed files with 152 additions and 128 deletions.
diff --git a/...-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java b/...-platform-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApi.java
@@ -28,10 +28,10 @@
 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.network.bounditem.NetworkBoundItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.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;

diff --git a/...form-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java b/...form-api/src/main/java/com/refinedmods/refinedstorage2/platform/api/PlatformApiProxy.java
@@ -28,10 +28,10 @@
 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.network.bounditem.NetworkBoundItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.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;

diff --git a/...finedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java b/...finedmods/refinedstorage2/platform/api/support/energy/AbstractNetworkBoundEnergyItem.java
@@ -1,9 +1,9 @@
 package com.refinedmods.refinedstorage2.platform.api.support.energy;
 
 import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.NetworkBoundItemHelper;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.NetworkBoundItemSession;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...tractNetworkNodeContainerBlockEntity.java → ...tractNetworkNodeContainerBlockEntity.java b/...tractNetworkNodeContainerBlockEntity.java → ...tractNetworkNodeContainerBlockEntity.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support;
+package com.refinedmods.refinedstorage2.platform.api.support.network;
 
 import com.refinedmods.refinedstorage2.api.network.node.NetworkNode;
 import com.refinedmods.refinedstorage2.platform.api.PlatformApi;

diff --git a/...support/PlatformNetworkNodeContainer.java → ...network/PlatformNetworkNodeContainer.java b/...support/PlatformNetworkNodeContainer.java → ...network/PlatformNetworkNodeContainer.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support;
+package com.refinedmods.refinedstorage2.platform.api.support.network;
 
 import com.refinedmods.refinedstorage2.api.network.node.container.NetworkNodeContainer;
 

diff --git a/...workbounditem/NetworkBoundItemHelper.java → ...ork/bounditem/NetworkBoundItemHelper.java b/...workbounditem/NetworkBoundItemHelper.java → ...ork/bounditem/NetworkBoundItemHelper.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import java.util.List;
 import java.util.Optional;

diff --git a/...orkbounditem/NetworkBoundItemSession.java → ...rk/bounditem/NetworkBoundItemSession.java b/...orkbounditem/NetworkBoundItemSession.java → ...rk/bounditem/NetworkBoundItemSession.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import com.refinedmods.refinedstorage2.api.network.Network;
 

diff --git a/...pport/networkbounditem/SlotReference.java → ...port/network/bounditem/SlotReference.java b/...pport/networkbounditem/SlotReference.java → ...port/network/bounditem/SlotReference.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import java.util.Optional;
 

diff --git a/...etworkbounditem/SlotReferenceFactory.java → ...twork/bounditem/SlotReferenceFactory.java b/...etworkbounditem/SlotReferenceFactory.java → ...twork/bounditem/SlotReferenceFactory.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import net.minecraft.network.FriendlyByteBuf;
 import org.apiguardian.api.API;

diff --git a/...tworkbounditem/SlotReferenceProvider.java → ...work/bounditem/SlotReferenceProvider.java b/...tworkbounditem/SlotReferenceProvider.java → ...work/bounditem/SlotReferenceProvider.java
@@ -1,4 +1,4 @@
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
 
 import java.util.List;
 import java.util.Set;

diff --git a/.../com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/package-info.java b/.../com/refinedmods/refinedstorage2/platform/api/support/network/bounditem/package-info.java
@@ -0,0 +1,7 @@
+@ParametersAreNonnullByDefault
+@FieldsAndMethodsAreNonnullByDefault
+package com.refinedmods.refinedstorage2.platform.api.support.network.bounditem;
+
+import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
+
+import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/...upport/networkbounditem/package-info.java → ...orm/api/support/network/package-info.java b/...upport/networkbounditem/package-info.java → ...orm/api/support/network/package-info.java
@@ -1,6 +1,6 @@
 @ParametersAreNonnullByDefault
 @FieldsAndMethodsAreNonnullByDefault
-package com.refinedmods.refinedstorage2.platform.api.support.networkbounditem;
+package com.refinedmods.refinedstorage2.platform.api.support.network;
 
 import com.refinedmods.refinedstorage2.api.core.FieldsAndMethodsAreNonnullByDefault;
 

diff --git a/...src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java b/...src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java
@@ -78,11 +78,11 @@
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlock;
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorContainerMenu;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeContainerBlockEntityImpl;
 import com.refinedmods.refinedstorage2.platform.common.support.SimpleBlock;
 import com.refinedmods.refinedstorage2.platform.common.support.SimpleBlockItem;
 import com.refinedmods.refinedstorage2.platform.common.support.SimpleItem;
 import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyLootItemFunctionSerializer;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeContainerBlockEntityImpl;
 import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceFactory;
 import com.refinedmods.refinedstorage2.platform.common.upgrade.FortuneUpgradeItem;
 import com.refinedmods.refinedstorage2.platform.common.upgrade.RangeUpgradeItem;

diff --git a/...common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java b/...common/src/main/java/com/refinedmods/refinedstorage2/platform/common/PlatformApiImpl.java
@@ -32,10 +32,10 @@
 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.network.bounditem.NetworkBoundItemHelper;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReferenceFactory;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.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;
@@ -59,13 +59,13 @@
 import com.refinedmods.refinedstorage2.platform.common.storage.channel.StorageChannelTypes;
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.CompositeStorageMonitorExtractionStrategy;
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.CompositeStorageMonitorInsertionStrategy;
-import com.refinedmods.refinedstorage2.platform.common.support.LevelConnectionProvider;
 import com.refinedmods.refinedstorage2.platform.common.support.energy.EnergyItemHelperImpl;
 import com.refinedmods.refinedstorage2.platform.common.support.energy.ItemEnergyStorage;
-import com.refinedmods.refinedstorage2.platform.common.support.networkbounditem.CompositeSlotReferenceProvider;
-import com.refinedmods.refinedstorage2.platform.common.support.networkbounditem.InventorySlotReference;
-import com.refinedmods.refinedstorage2.platform.common.support.networkbounditem.InventorySlotReferenceFactory;
-import com.refinedmods.refinedstorage2.platform.common.support.networkbounditem.NetworkBoundItemHelperImpl;
+import com.refinedmods.refinedstorage2.platform.common.support.network.LevelConnectionProvider;
+import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.CompositeSlotReferenceProvider;
+import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.InventorySlotReference;
+import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.InventorySlotReferenceFactory;
+import com.refinedmods.refinedstorage2.platform.common.support.network.bounditem.NetworkBoundItemHelperImpl;
 import com.refinedmods.refinedstorage2.platform.common.support.registry.PlatformRegistryImpl;
 import com.refinedmods.refinedstorage2.platform.common.support.resource.FluidResourceFactory;
 import com.refinedmods.refinedstorage2.platform.common.support.resource.ItemResourceFactory;

diff --git a/...m/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlock.java b/...m/refinedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlock.java
@@ -5,7 +5,7 @@
 import com.refinedmods.refinedstorage2.platform.common.content.Blocks;
 import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider;
 import com.refinedmods.refinedstorage2.platform.common.support.NamedBlockItem;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockEntityTicker;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker;
 
 import javax.annotation.Nullable;
 

diff --git a/...nedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlockEntity.java b/...nedmods/refinedstorage2/platform/common/constructordestructor/ConstructorBlockEntity.java
@@ -12,7 +12,7 @@
 import com.refinedmods.refinedstorage2.platform.common.Platform;
 import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
 import com.refinedmods.refinedstorage2.platform.common.content.ContentNames;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractSchedulingNetworkNodeContainerBlockEntity;
+import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations;
 
 import java.util.ArrayList;

diff --git a/...om/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlock.java b/...om/refinedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlock.java
@@ -5,7 +5,7 @@
 import com.refinedmods.refinedstorage2.platform.common.content.Blocks;
 import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider;
 import com.refinedmods.refinedstorage2.platform.common.support.NamedBlockItem;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockEntityTicker;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker;
 
 import javax.annotation.Nullable;
 

diff --git a/...inedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlockEntity.java b/...inedmods/refinedstorage2/platform/common/constructordestructor/DestructorBlockEntity.java
@@ -10,10 +10,10 @@
 import com.refinedmods.refinedstorage2.platform.common.Platform;
 import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
 import com.refinedmods.refinedstorage2.platform.common.content.ContentNames;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractUpgradeableNetworkNodeContainerBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.support.FilterModeSettings;
 import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider;
+import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractUpgradeableNetworkNodeContainerBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl;
 import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations;
 

diff --git a/.../src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntities.java b/.../src/main/java/com/refinedmods/refinedstorage2/platform/common/content/BlockEntities.java
@@ -17,7 +17,7 @@
 import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.ItemStorageBlockBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storagemonitor.StorageMonitorBlockEntity;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeContainerBlockEntityImpl;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeContainerBlockEntityImpl;
 import com.refinedmods.refinedstorage2.platform.common.wirelesstransmitter.WirelessTransmitterBlockEntity;
 
 import java.util.EnumMap;

diff --git a/...ava/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntity.java b/...ava/com/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntity.java
@@ -7,10 +7,10 @@
 import com.refinedmods.refinedstorage2.platform.common.Platform;
 import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
 import com.refinedmods.refinedstorage2.platform.common.content.ContentNames;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractRedstoneModeNetworkNodeContainerBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider;
 import com.refinedmods.refinedstorage2.platform.common.support.energy.BlockEntityEnergyStorage;
 import com.refinedmods.refinedstorage2.platform.common.support.energy.CreativeEnergyStorage;
+import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity;
 
 import com.google.common.util.concurrent.RateLimiter;
 import net.minecraft.core.BlockPos;

diff --git a/...m/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntityTicker.java b/...m/refinedmods/refinedstorage2/platform/common/controller/ControllerBlockEntityTicker.java
@@ -1,7 +1,7 @@
 package com.refinedmods.refinedstorage2.platform.common.controller;
 
 import com.refinedmods.refinedstorage2.api.network.impl.node.controller.ControllerNetworkNode;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockEntityTicker;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker;
 
 import java.util.function.Supplier;
 

diff --git a/...src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlock.java b/...src/main/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlock.java
@@ -9,9 +9,9 @@
 import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider;
 import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock;
 import com.refinedmods.refinedstorage2.platform.common.support.NamedBlockItem;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockEntityTicker;
 import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionType;
 import com.refinedmods.refinedstorage2.platform.common.support.direction.DirectionTypeImpl;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

diff --git a/...in/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlockEntity.java b/...in/java/com/refinedmods/refinedstorage2/platform/common/detector/DetectorBlockEntity.java
@@ -9,10 +9,10 @@
 import com.refinedmods.refinedstorage2.platform.common.Platform;
 import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
 import com.refinedmods.refinedstorage2.platform.common.content.ContentNames;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractRedstoneModeNetworkNodeContainerBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.support.FilterWithFuzzyMode;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.AbstractSingleAmountContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.support.containermenu.ExtendedMenuProvider;
+import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.support.resource.ResourceContainerImpl;
 
 import javax.annotation.Nullable;

diff --git a/...src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlock.java b/...src/main/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlock.java
@@ -9,7 +9,7 @@
 import com.refinedmods.refinedstorage2.platform.common.support.ColorableBlock;
 import com.refinedmods.refinedstorage2.platform.common.support.DirectionalCableBlockShapes;
 import com.refinedmods.refinedstorage2.platform.common.support.NamedBlockItem;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockEntityTicker;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...in/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlockEntity.java b/...in/java/com/refinedmods/refinedstorage2/platform/common/exporter/ExporterBlockEntity.java
@@ -11,7 +11,7 @@
 import com.refinedmods.refinedstorage2.platform.common.content.BlockEntities;
 import com.refinedmods.refinedstorage2.platform.common.content.ContentNames;
 import com.refinedmods.refinedstorage2.platform.common.content.Items;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractSchedulingNetworkNodeContainerBlockEntity;
+import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractSchedulingNetworkNodeContainerBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.upgrade.UpgradeDestinations;
 
 import java.util.List;

diff --git a/...in/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlockEntity.java b/...in/java/com/refinedmods/refinedstorage2/platform/common/grid/AbstractGridBlockEntity.java
@@ -15,7 +15,7 @@
 import com.refinedmods.refinedstorage2.platform.api.storage.channel.PlatformStorageChannelType;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.ItemResource;
 import com.refinedmods.refinedstorage2.platform.common.storage.channel.StorageChannelTypes;
-import com.refinedmods.refinedstorage2.platform.common.support.AbstractRedstoneModeNetworkNodeContainerBlockEntity;
+import com.refinedmods.refinedstorage2.platform.common.support.network.AbstractRedstoneModeNetworkNodeContainerBlockEntity;
 
 import java.util.List;
 import java.util.Objects;

diff --git a/...src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlock.java b/...src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/CraftingGridBlock.java
@@ -6,7 +6,7 @@
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker;
 import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider;
 import com.refinedmods.refinedstorage2.platform.common.support.NamedBlockItem;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockEntityTicker;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker;
 
 import javax.annotation.Nullable;
 

diff --git a/...-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridBlock.java b/...-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/GridBlock.java
@@ -6,7 +6,7 @@
 import com.refinedmods.refinedstorage2.platform.common.support.AbstractBlockEntityTicker;
 import com.refinedmods.refinedstorage2.platform.common.support.BlockItemProvider;
 import com.refinedmods.refinedstorage2.platform.common.support.NamedBlockItem;
-import com.refinedmods.refinedstorage2.platform.common.support.NetworkNodeBlockEntityTicker;
+import com.refinedmods.refinedstorage2.platform.common.support.network.NetworkNodeBlockEntityTicker;
 
 import javax.annotation.Nullable;
 

diff --git a/...mmon/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGrid.java b/...mmon/src/main/java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGrid.java
@@ -18,7 +18,7 @@
 import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
 import com.refinedmods.refinedstorage2.platform.api.grid.Grid;
 import com.refinedmods.refinedstorage2.platform.api.storage.channel.PlatformStorageChannelType;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.NetworkBoundItemSession;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.NetworkBoundItemSession;
 import com.refinedmods.refinedstorage2.platform.api.support.resource.ItemResource;
 import com.refinedmods.refinedstorage2.platform.common.storage.channel.StorageChannelTypes;
 

diff --git a/.../java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridContainerMenu.java b/.../java/com/refinedmods/refinedstorage2/platform/common/grid/WirelessGridContainerMenu.java
@@ -2,7 +2,7 @@
 
 import com.refinedmods.refinedstorage2.platform.api.PlatformApi;
 import com.refinedmods.refinedstorage2.platform.api.grid.Grid;
-import com.refinedmods.refinedstorage2.platform.api.support.networkbounditem.SlotReference;
+import com.refinedmods.refinedstorage2.platform.api.support.network.bounditem.SlotReference;
 import com.refinedmods.refinedstorage2.platform.common.content.Menus;
 
 import net.minecraft.network.FriendlyByteBuf;