Merge pull request #454 from refinedmods/feat/GH-93/portable-grid

Basic portable grid content
refinedmods · Dec 29, 2023 · bc8bca8 · bc8bca8
2 parents 80c432d + 6ea0f43
commit bc8bca8
Show file tree

Hide file tree

Showing 94 changed files with 2,156 additions and 745 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ### Added
 
 -   Custom disk models. Fluid disks now have a different model.
+-   Portable Grid
 
 ## [2.0.0-milestone.3.2] - 2023-11-03
 

diff --git a/...storage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/GridWatcher.java b/...storage2-grid-api/src/main/java/com/refinedmods/refinedstorage2/api/grid/GridWatcher.java
@@ -36,7 +36,7 @@ <T> void onChanged(
     );
 
     /**
-     * Called when the grid network has been changed.
+     * Usually called when the grid network has been changed.
      */
-    void onNetworkChanged();
+    void clear();
 }
diff --git a/...src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridOperationsImpl.java b/...src/main/java/com/refinedmods/refinedstorage2/api/grid/operations/GridOperationsImpl.java
@@ -36,7 +36,8 @@ public GridOperationsImpl(final StorageChannel<T> storageChannel,
     }
 
     @Override
-    public boolean extract(final T resource, final GridExtractMode extractMode,
+    public boolean extract(final T resource,
+                           final GridExtractMode extractMode,
                            final InsertableStorage<T> destination) {
         final long amount = getExtractableAmount(resource, extractMode);
         if (amount == 0) {

diff --git a/...a/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridWatcherRegistration.java b/...a/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridWatcherRegistration.java
@@ -9,17 +9,17 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class GridWatcherRegistration {
+class GridWatcherRegistration {
     private final GridWatcher watcher;
     private final Class<? extends Actor> actorType;
     private final Map<StorageChannelType<?>, ResourceListListener<?>> listeners = new HashMap<>();
 
-    public GridWatcherRegistration(final GridWatcher watcher, final Class<? extends Actor> actorType) {
+    GridWatcherRegistration(final GridWatcher watcher, final Class<? extends Actor> actorType) {
         this.watcher = watcher;
         this.actorType = actorType;
     }
 
-    public <T> void attach(final StorageChannel<T> storageChannel, final StorageChannelType<T> storageChannelType) {
+    <T> void attach(final StorageChannel<T> storageChannel, final StorageChannelType<T> storageChannelType) {
         final ResourceListListener<T> listener = change -> watcher.onChanged(
             storageChannelType,
             change.resourceAmount().getResource(),
@@ -34,7 +34,7 @@ public <T> void attach(final StorageChannel<T> storageChannel, final StorageChan
     }
 
     @SuppressWarnings("unchecked")
-    public <T> void detach(final StorageChannel<T> storageChannel, final StorageChannelType<T> storageChannelType) {
+    <T> void detach(final StorageChannel<T> storageChannel, final StorageChannelType<T> storageChannelType) {
         final ResourceListListener<T> listener = (ResourceListListener<T>) listeners.get(storageChannelType);
         storageChannel.removeListener(listener);
         listeners.remove(storageChannelType);

diff --git a/...rc/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridWatchers.java b/...rc/main/java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridWatchers.java
@@ -44,7 +44,7 @@ public void addWatcher(
 
     public void attachAll(final Network network) {
         watchers.forEach((watcher, registration) -> {
-            watcher.onNetworkChanged();
+            watcher.clear();
             attachAll(registration, network);
         });
     }

diff --git a/...java/com/refinedmods/refinedstorage2/api/network/impl/PriorityNetworkBuilderImplTest.java b/...java/com/refinedmods/refinedstorage2/api/network/impl/PriorityNetworkBuilderImplTest.java
@@ -76,7 +76,7 @@ void shouldRespectPriorityWhenSplitting() {
 
         // Here we ensure that container 4 (the grid) is initialized *after* container 3 (the storage),
         // according to the priority declared above.
-        verify(watcher, times(1)).onNetworkChanged();
+        verify(watcher, times(1)).clear();
         verify(watcher).onChanged(
             NetworkTestFixtures.STORAGE_CHANNEL_TYPE,
             "N3",

diff --git a/.../java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridNetworkNodeTest.java b/.../java/com/refinedmods/refinedstorage2/api/network/impl/node/grid/GridNetworkNodeTest.java
@@ -158,7 +158,7 @@ void shouldDetachWatchersFromOldNetworkAndReattachToNewNetwork(
         storageChannel.insert("D", 10, Action.EXECUTE, EmptyActor.INSTANCE);
 
         // Assert
-        verify(watcher, times(1)).onNetworkChanged();
+        verify(watcher, times(1)).clear();
 
         final ArgumentCaptor<TrackedResource> trackedResources1 = ArgumentCaptor.forClass(TrackedResource.class);
         verify(watcher, times(1)).onChanged(

diff --git a/...src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java b/...src/main/java/com/refinedmods/refinedstorage2/platform/common/AbstractModInitializer.java
@@ -64,6 +64,11 @@
 import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveContainerMenu;
 import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.externalstorage.ExternalStorageContainerMenu;
+import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.AbstractPortableGridBlockEntity;
+import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridBlock;
+import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridItem;
+import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridLootItemFunctionSerializer;
+import com.refinedmods.refinedstorage2.platform.common.storage.portablegrid.PortableGridType;
 import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlock;
 import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.storage.storageblock.FluidStorageBlockBlockItem;
@@ -122,6 +127,7 @@
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CONTROLLER;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CRAFTING_GRID;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CREATIVE_CONTROLLER;
+import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CREATIVE_PORTABLE_GRID;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.CREATIVE_WIRELESS_GRID;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DESTRUCTION_CORE;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.DESTRUCTOR;
@@ -137,6 +143,7 @@
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.MACHINE_CASING;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.NETWORK_RECEIVER;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.NETWORK_TRANSMITTER;
+import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PORTABLE_GRID;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.PROCESSOR_BINDING;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON;
 import static com.refinedmods.refinedstorage2.platform.common.content.ContentIds.QUARTZ_ENRICHED_IRON_BLOCK;
@@ -244,7 +251,9 @@ private void registerWirelessTransmitterRangeModifiers() {
 
     protected final void registerBlocks(
         final RegistryCallback<Block> callback,
-        final BiFunction<BlockPos, BlockState, AbstractDiskDriveBlockEntity> diskDriveBlockEntityFactory
+        final BiFunction<BlockPos, BlockState, AbstractDiskDriveBlockEntity> diskDriveBlockEntityFactory,
+        final BiFunction<BlockPos, BlockState, AbstractPortableGridBlockEntity> portableGridBlockEntityFactory,
+        final BiFunction<BlockPos, BlockState, AbstractPortableGridBlockEntity> creativePortableGridBlockEntityFactory
     ) {
         Blocks.INSTANCE.setQuartzEnrichedIronBlock(callback.register(QUARTZ_ENRICHED_IRON_BLOCK, SimpleBlock::new));
         Blocks.INSTANCE.setDiskDrive(
@@ -279,6 +288,14 @@ protected final void registerBlocks(
         Blocks.INSTANCE.setStorageMonitor(callback.register(STORAGE_MONITOR, StorageMonitorBlock::new));
         Blocks.INSTANCE.getNetworkReceiver().registerBlocks(callback);
         Blocks.INSTANCE.getNetworkTransmitter().registerBlocks(callback);
+        Blocks.INSTANCE.setPortableGrid(callback.register(PORTABLE_GRID, () -> new PortableGridBlock(
+            PortableGridType.NORMAL,
+            portableGridBlockEntityFactory
+        )));
+        Blocks.INSTANCE.setCreativePortableGrid(callback.register(CREATIVE_PORTABLE_GRID, () -> new PortableGridBlock(
+            PortableGridType.CREATIVE,
+            creativePortableGridBlockEntityFactory
+        )));
     }
 
     protected final void registerItems(
@@ -310,6 +327,14 @@ protected final void registerItems(
             creativeWirelessGridItemSupplier
         ));
         callback.register(STORAGE_MONITOR, () -> new SimpleBlockItem(Blocks.INSTANCE.getStorageMonitor()));
+        Items.INSTANCE.setPortableGrid(callback.register(
+            PORTABLE_GRID,
+            () -> new PortableGridItem(Blocks.INSTANCE.getPortableGrid())
+        ));
+        Items.INSTANCE.setCreativePortableGrid(callback.register(
+            CREATIVE_PORTABLE_GRID,
+            () -> new PortableGridItem(Blocks.INSTANCE.getCreativePortableGrid())
+        ));
     }
 
     private void registerSimpleItems(final RegistryCallback<Item> callback) {
@@ -481,7 +506,11 @@ protected final void registerBlockEntities(
         final RegistryCallback<BlockEntityType<?>> callback,
         final BlockEntityTypeFactory typeFactory,
         final BlockEntityTypeFactory.BlockEntitySupplier<? extends AbstractDiskDriveBlockEntity>
-            diskDriveBlockEntitySupplier
+            diskDriveBlockEntitySupplier,
+        final BlockEntityTypeFactory.BlockEntitySupplier<? extends AbstractPortableGridBlockEntity>
+            portableGridBlockEntitySupplier,
+        final BlockEntityTypeFactory.BlockEntitySupplier<? extends AbstractPortableGridBlockEntity>
+            creativePortableGridBlockEntitySupplier
     ) {
         BlockEntities.INSTANCE.setCable(callback.register(
             CABLE,
@@ -588,6 +617,17 @@ protected final void registerBlockEntities(
                 Blocks.INSTANCE.getNetworkTransmitter().toArray()
             )
         ));
+        BlockEntities.INSTANCE.setPortableGrid(callback.register(
+            PORTABLE_GRID,
+            () -> typeFactory.create(portableGridBlockEntitySupplier::create, Blocks.INSTANCE.getPortableGrid())
+        ));
+        BlockEntities.INSTANCE.setCreativePortableGrid(callback.register(
+            CREATIVE_PORTABLE_GRID,
+            () -> typeFactory.create(
+                creativePortableGridBlockEntitySupplier::create,
+                Blocks.INSTANCE.getCreativePortableGrid()
+            )
+        ));
     }
 
     protected final void registerMenus(final RegistryCallback<MenuType<?>> callback,
@@ -671,6 +711,10 @@ protected final void registerLootFunctions(final RegistryCallback<LootItemFuncti
             STORAGE_BLOCK,
             () -> new LootItemFunctionType(new StorageBlockLootItemFunctionSerializer())
         ));
+        LootFunctions.INSTANCE.setPortableGrid(callback.register(
+            PORTABLE_GRID,
+            () -> new LootItemFunctionType(new PortableGridLootItemFunctionSerializer())
+        ));
         LootFunctions.INSTANCE.setEnergy(callback.register(
             createIdentifier("energy"),
             () -> new LootItemFunctionType(new EnergyLootItemFunctionSerializer())