wip

refinedmods · Dec 27, 2023 · 9457191 · 9457191
1 parent 3e6d61c
commit 9457191
Show file tree

Hide file tree

Showing 46 changed files with 1,108 additions and 61 deletions.
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
@@ -55,6 +55,9 @@
 import com.refinedmods.refinedstorage2.platform.common.networking.NetworkReceiverBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterBlockEntity;
 import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterContainerMenu;
+import com.refinedmods.refinedstorage2.platform.common.portablegrid.PortableGridBlock;
+import com.refinedmods.refinedstorage2.platform.common.portablegrid.PortableGridItem;
+import com.refinedmods.refinedstorage2.platform.common.portablegrid.PortableGridType;
 import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType;
 import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType;
 import com.refinedmods.refinedstorage2.platform.common.storage.StorageTypes;
@@ -122,6 +125,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 +141,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;
@@ -279,6 +284,12 @@ 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
+        )));
+        Blocks.INSTANCE.setCreativePortableGrid(callback.register(CREATIVE_PORTABLE_GRID, () -> new PortableGridBlock(
+            PortableGridType.CREATIVE
+        )));
     }
 
     protected final void registerItems(
@@ -310,6 +321,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) {

diff --git a/...-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java b/...-common/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/Blocks.java
@@ -14,6 +14,7 @@
 import com.refinedmods.refinedstorage2.platform.common.networking.CableBlock;
 import com.refinedmods.refinedstorage2.platform.common.networking.NetworkReceiverBlock;
 import com.refinedmods.refinedstorage2.platform.common.networking.NetworkTransmitterBlock;
+import com.refinedmods.refinedstorage2.platform.common.portablegrid.PortableGridBlock;
 import com.refinedmods.refinedstorage2.platform.common.storage.FluidStorageType;
 import com.refinedmods.refinedstorage2.platform.common.storage.ItemStorageType;
 import com.refinedmods.refinedstorage2.platform.common.storage.diskdrive.DiskDriveBlock;
@@ -26,12 +27,13 @@
 
 import java.util.EnumMap;
 import java.util.Map;
-import java.util.Objects;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
 
 import net.minecraft.world.item.DyeColor;
 
+import static java.util.Objects.requireNonNull;
+
 public final class Blocks {
     public static final DyeColor COLOR = DyeColor.LIGHT_BLUE;
     public static final DyeColor CABLE_LIKE_COLOR = DyeColor.GRAY;
@@ -146,6 +148,10 @@ public final class Blocks {
     private Supplier<InterfaceBlock> iface;
     @Nullable
     private Supplier<StorageMonitorBlock> storageMonitor;
+    @Nullable
+    private Supplier<PortableGridBlock> portableGrid;
+    @Nullable
+    private Supplier<PortableGridBlock> creativePortableGrid;
 
     private Blocks() {
     }
@@ -155,15 +161,15 @@ public BlockColorMap<CableBlock> getCable() {
     }
 
     public SimpleBlock getQuartzEnrichedIronBlock() {
-        return Objects.requireNonNull(quartzEnrichedIronBlock).get();
+        return requireNonNull(quartzEnrichedIronBlock).get();
     }
 
     public DiskDriveBlock getDiskDrive() {
-        return Objects.requireNonNull(diskDrive).get();
+        return requireNonNull(diskDrive).get();
     }
 
     public SimpleBlock getMachineCasing() {
-        return Objects.requireNonNull(machineCasing).get();
+        return requireNonNull(machineCasing).get();
     }
 
     public BlockColorMap<GridBlock> getGrid() {
@@ -224,7 +230,7 @@ public void setInterface(final Supplier<InterfaceBlock> interfaceSupplier) {
     }
 
     public InterfaceBlock getInterface() {
-        return Objects.requireNonNull(iface).get();
+        return requireNonNull(iface).get();
     }
 
     public BlockColorMap<ExternalStorageBlock> getExternalStorage() {
@@ -252,7 +258,7 @@ public void setStorageMonitor(final Supplier<StorageMonitorBlock> supplier) {
     }
 
     public StorageMonitorBlock getStorageMonitor() {
-        return Objects.requireNonNull(storageMonitor).get();
+        return requireNonNull(storageMonitor).get();
     }
 
     public BlockColorMap<NetworkReceiverBlock> getNetworkReceiver() {
@@ -262,4 +268,20 @@ public BlockColorMap<NetworkReceiverBlock> getNetworkReceiver() {
     public BlockColorMap<NetworkTransmitterBlock> getNetworkTransmitter() {
         return networkTransmitter;
     }
+
+    public PortableGridBlock getPortableGrid() {
+        return requireNonNull(portableGrid).get();
+    }
+
+    public void setPortableGrid(final Supplier<PortableGridBlock> supplier) {
+        this.portableGrid = supplier;
+    }
+
+    public PortableGridBlock getCreativePortableGrid() {
+        return requireNonNull(creativePortableGrid).get();
+    }
+
+    public void setCreativePortableGrid(final Supplier<PortableGridBlock> supplier) {
+        this.creativePortableGrid = supplier;
+    }
 }
diff --git a/...mon/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java b/...mon/src/main/java/com/refinedmods/refinedstorage2/platform/common/content/ContentIds.java
@@ -52,6 +52,8 @@ public final class ContentIds {
     public static final ResourceLocation NETWORK_RECEIVER = createIdentifier("network_receiver");
     public static final ResourceLocation NETWORK_CARD = createIdentifier("network_card");
     public static final ResourceLocation NETWORK_TRANSMITTER = createIdentifier("network_transmitter");
+    public static final ResourceLocation PORTABLE_GRID = createIdentifier("portable_grid");
+    public static final ResourceLocation CREATIVE_PORTABLE_GRID = createIdentifier("creative_portable_grid");
 
     private ContentIds() {
     }

diff --git a/...in/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java b/...in/java/com/refinedmods/refinedstorage2/platform/common/content/CreativeModeTabItems.java
@@ -36,6 +36,8 @@ private static void appendBlocks(final Consumer<ItemStack> consumer) {
         itemConsumer.accept(Blocks.INSTANCE.getDiskDrive());
         appendBlockColors(consumer, Blocks.INSTANCE.getGrid());
         appendBlockColors(consumer, Blocks.INSTANCE.getCraftingGrid());
+        itemConsumer.accept(Items.INSTANCE.getPortableGrid());
+        itemConsumer.accept(Items.INSTANCE.getCreativePortableGrid());
         Items.INSTANCE.getDetectors().stream().map(Supplier::get).forEach(itemConsumer);
         itemConsumer.accept(Blocks.INSTANCE.getInterface());
         Arrays.stream(ItemStorageType.Variant.values()).forEach(variant -> itemConsumer.accept(