Merge pull request #730 from refinedmods/fix/NO-ISSUE/ext-storage

fix: external storage not connecting properly to fluid storages
refinedmods · Nov 30, 2024 · cf40335 · cf40335
2 parents a18776d + 93914bd
commit cf40335
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,12 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   The Autocrafting Monitor now has a sidebar with all tasks instead of using tabs.
 -   The auto-selected search box mode is now a global option used in the Autocrafter Manager as well.
 
+### Fixed
+
+-   Fixed External Fluid not connecting properly to fluid storages.
+-   Fixed Interface filter not respecting maximum stack size of a resource.
+-   Fixed potential crash when trying to build cable shapes.
+
 ### Removed
 
 -   Block of Quartz Enriched Iron (has been moved to addon mod)

diff --git a/...ge-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java b/...ge-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java
@@ -420,8 +420,8 @@ private void registerItemStorageItems(final RegistryCallback<Item> callback,
         if (variant != ItemStorageVariant.CREATIVE) {
             Items.INSTANCE.setItemStoragePart(variant, callback.register(
                 ContentIds.forItemStoragePart(variant),
-                SimpleItem::new)
-            );
+                SimpleItem::new
+            ));
         }
         Items.INSTANCE.setItemStorageDisk(variant, callback.register(
             ContentIds.forStorageDisk(variant),

diff --git a/...dmods/refinedstorage/common/constructordestructor/AbstractConstructorDestructorBlock.java b/...dmods/refinedstorage/common/constructordestructor/AbstractConstructorDestructorBlock.java
@@ -6,8 +6,7 @@
 import com.refinedmods.refinedstorage.common.support.ColorableBlock;
 import com.refinedmods.refinedstorage.common.support.DirectionalCableBlockShapes;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 
 import net.minecraft.core.Direction;
@@ -31,7 +30,8 @@ public abstract class AbstractConstructorDestructorBlock<T extends Block & Block
     implements ColorableBlock<T, I>, EntityBlock {
     public static final BooleanProperty ACTIVE = BooleanProperty.create("active");
 
-    private static final Map<DirectionalCacheShapeCacheKey, VoxelShape> SHAPE_CACHE = new HashMap<>();
+    private static final ConcurrentHashMap<DirectionalCacheShapeCacheKey, VoxelShape> SHAPE_CACHE =
+        new ConcurrentHashMap<>();
 
     private final AbstractBlockEntityTicker<B> ticker;
     private final DyeColor color;

diff --git a/...ge-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlock.java b/...ge-common/src/main/java/com/refinedmods/refinedstorage/common/exporter/ExporterBlock.java
@@ -13,7 +13,6 @@
 import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem;
 import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker;
 
-import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 
@@ -35,7 +34,8 @@
 public class ExporterBlock extends AbstractDirectionalCableBlock
     implements ColorableBlock<ExporterBlock, BaseBlockItem>, EntityBlock, BlockItemProvider<BaseBlockItem> {
     private static final Component HELP = createTranslation("item", "exporter.help");
-    private static final Map<DirectionalCacheShapeCacheKey, VoxelShape> SHAPE_CACHE = new ConcurrentHashMap<>();
+    private static final ConcurrentHashMap<DirectionalCacheShapeCacheKey, VoxelShape> SHAPE_CACHE =
+        new ConcurrentHashMap<>();
     private static final AbstractBlockEntityTicker<AbstractExporterBlockEntity> TICKER =
         new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getExporter);
 

diff --git a/...inedmods/refinedstorage/common/iface/InterfacePlatformExternalStorageProviderFactory.java b/...inedmods/refinedstorage/common/iface/InterfacePlatformExternalStorageProviderFactory.java
@@ -14,14 +14,13 @@ public class InterfacePlatformExternalStorageProviderFactory implements Platform
     public Optional<ExternalStorageProvider> create(final ServerLevel level,
                                                     final BlockPos pos,
                                                     final Direction direction) {
-        if (!(level.getBlockEntity(pos) instanceof InterfaceBlockEntity)) {
-            return Optional.empty();
-        }
-        return Optional.of(new InterfaceProxyExternalStorageProvider(level, pos));
+        return Optional.ofNullable(level.getBlockEntity(pos))
+            .filter(blockEntity -> blockEntity instanceof InterfaceBlockEntity)
+            .map(blockEntity -> new InterfaceProxyExternalStorageProvider(level, pos));
     }
 
     @Override
     public int getPriority() {
-        return -1;
+        return Integer.MIN_VALUE;
     }
 }
diff --git a/...ge-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlock.java b/...ge-common/src/main/java/com/refinedmods/refinedstorage/common/importer/ImporterBlock.java
@@ -13,8 +13,7 @@
 import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem;
 import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 
 import net.minecraft.core.BlockPos;
@@ -35,7 +34,8 @@
 public class ImporterBlock extends AbstractDirectionalCableBlock implements
     ColorableBlock<ImporterBlock, BaseBlockItem>, EntityBlock, BlockItemProvider<BaseBlockItem> {
     private static final Component HELP = createTranslation("item", "importer.help");
-    private static final Map<DirectionalCacheShapeCacheKey, VoxelShape> SHAPE_CACHE = new HashMap<>();
+    private static final ConcurrentHashMap<DirectionalCacheShapeCacheKey, VoxelShape> SHAPE_CACHE =
+        new ConcurrentHashMap<>();
     private static final AbstractBlockEntityTicker<AbstractImporterBlockEntity> TICKER =
         new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getImporter);
 

diff --git a/...ain/java/com/refinedmods/refinedstorage/common/storage/StorageContainerUpgradeRecipe.java b/...ain/java/com/refinedmods/refinedstorage/common/storage/StorageContainerUpgradeRecipe.java
@@ -29,8 +29,7 @@ public StorageContainerUpgradeRecipe(final T[] variants,
             CraftingBookCategory.MISC,
             containerProvider.apply(to).asItem().getDefaultInstance(),
             NonNullList.of(
-                Ingredient.of(getValidSourceContainers(to, variants, containerProvider)
-                    .stream().map(ItemLike::asItem).map(Item::getDefaultInstance)),
+                Ingredient.of(getValidSourceContainers(to, variants, containerProvider).toArray(new Item[0])),
                 Ingredient.of(to.getStoragePart())
             )
         );

diff --git a/...a/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlock.java b/...a/com/refinedmods/refinedstorage/common/storage/externalstorage/ExternalStorageBlock.java
@@ -13,8 +13,7 @@
 import com.refinedmods.refinedstorage.common.support.NetworkNodeBlockItem;
 import com.refinedmods.refinedstorage.common.support.network.NetworkNodeBlockEntityTicker;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 
 import net.minecraft.core.BlockPos;
@@ -39,7 +38,8 @@
 public class ExternalStorageBlock extends AbstractDirectionalCableBlock
     implements ColorableBlock<ExternalStorageBlock, BaseBlockItem>, EntityBlock, BlockItemProvider<BaseBlockItem> {
     private static final Component HELP = createTranslation("item", "external_storage.help");
-    private static final Map<DirectionalCacheShapeCacheKey, VoxelShape> SHAPE_CACHE = new HashMap<>();
+    private static final ConcurrentHashMap<DirectionalCacheShapeCacheKey, VoxelShape> SHAPE_CACHE =
+        new ConcurrentHashMap<>();
     private static final AbstractBlockEntityTicker<AbstractExternalStorageBlockEntity> TICKER =
         new NetworkNodeBlockEntityTicker<>(BlockEntities.INSTANCE::getExternalStorage);
     private static final Logger LOGGER = LoggerFactory.getLogger(ExternalStorageBlock.class);

diff --git a/...ain/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalCableBlock.java b/...ain/java/com/refinedmods/refinedstorage/common/support/AbstractDirectionalCableBlock.java
@@ -7,7 +7,7 @@
 import com.refinedmods.refinedstorage.common.support.direction.DirectionType;
 import com.refinedmods.refinedstorage.common.util.PlatformUtil;
 
-import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import javax.annotation.Nullable;
 
 import net.minecraft.core.BlockPos;
@@ -31,9 +31,10 @@
 
 public abstract class AbstractDirectionalCableBlock extends AbstractDirectionalBlock<Direction>
     implements SimpleWaterloggedBlock {
-    private final Map<DirectionalCacheShapeCacheKey, VoxelShape> shapeCache;
+    private final ConcurrentHashMap<DirectionalCacheShapeCacheKey, VoxelShape> shapeCache;
 
-    protected AbstractDirectionalCableBlock(final Map<DirectionalCacheShapeCacheKey, VoxelShape> shapeCache) {
+    protected AbstractDirectionalCableBlock(final ConcurrentHashMap<DirectionalCacheShapeCacheKey, VoxelShape>
+                                                shapeCache) {
         super(BlockConstants.CABLE_PROPERTIES);
         this.shapeCache = shapeCache;
     }

diff --git a/...orage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableShapes.java b/...orage-common/src/main/java/com/refinedmods/refinedstorage/common/support/CableShapes.java
@@ -2,8 +2,8 @@
 
 import com.refinedmods.refinedstorage.common.networking.CableConnections;
 
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
@@ -18,7 +18,7 @@ public final class CableShapes {
     private static final VoxelShape WEST = box(0, 6, 6, 6, 10, 10);
     private static final VoxelShape UP = box(6, 10, 6, 10, 16, 10);
     private static final VoxelShape DOWN = box(6, 0, 6, 10, 6, 10);
-    private static final Map<CableConnections, VoxelShape> CACHE = new HashMap<>();
+    private static final Map<CableConnections, VoxelShape> CACHE = new ConcurrentHashMap<>();
 
     private CableShapes() {
     }

diff --git a/...in/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerImpl.java b/...in/java/com/refinedmods/refinedstorage/common/support/resource/ResourceContainerImpl.java
@@ -55,19 +55,27 @@ public void setListener(@Nullable final Runnable listener) {
     public void change(final int index, final ItemStack stack, final boolean tryAlternatives) {
         if (tryAlternatives) {
             for (final ResourceFactory resourceFactory : alternativeResourceFactories) {
-                final var result = resourceFactory.create(stack);
+                final var result = resourceFactory.create(stack).map(this::respectMaxAmount);
                 if (result.isPresent()) {
                     set(index, result.get());
                     return;
                 }
             }
         }
-        primaryResourceFactory.create(stack).ifPresentOrElse(
+        primaryResourceFactory.create(stack).map(this::respectMaxAmount).ifPresentOrElse(
             resource -> set(index, resource),
             () -> remove(index)
         );
     }
 
+    private ResourceAmount respectMaxAmount(final ResourceAmount resourceAmount) {
+        final long maxAmount = getMaxAmount(resourceAmount.resource());
+        if (resourceAmount.amount() > maxAmount) {
+            return new ResourceAmount(resourceAmount.resource(), maxAmount);
+        }
+        return resourceAmount;
+    }
+
     @Override
     public void set(final int index, final ResourceAmount resourceAmount) {
         setSilently(index, resourceAmount);

diff --git a/...torage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java b/...torage-fabric/src/main/java/com/refinedmods/refinedstorage/fabric/ModInitializerImpl.java
@@ -279,15 +279,17 @@ private void registerExternalStorageProviderFactories() {
                 ItemStorage.SIDED,
                 VariantUtil::ofItemVariant,
                 resource -> resource instanceof ItemResource itemResource
-                    ? toItemVariant(itemResource) : null
+                    ? toItemVariant(itemResource) : null,
+                0
             )
         );
         RefinedStorageApi.INSTANCE.addExternalStorageProviderFactory(
             new FabricStoragePlatformExternalStorageProviderFactory<>(
                 FluidStorage.SIDED,
                 VariantUtil::ofFluidVariant,
                 resource -> resource instanceof FluidResource fluidResource
-                    ? toFluidVariant(fluidResource) : null
+                    ? toFluidVariant(fluidResource) : null,
+                -1
             )
         );
     }

diff --git a/...e/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java b/...e/fabric/storage/externalstorage/FabricStoragePlatformExternalStorageProviderFactory.java
@@ -19,20 +19,26 @@ public class FabricStoragePlatformExternalStorageProviderFactory<T>
     private final BlockApiLookup<Storage<T>, Direction> lookup;
     private final Function<T, ResourceKey> fromPlatformMapper;
     private final Function<ResourceKey, @NullableType T> toPlatformMapper;
+    private final int priority;
 
     public FabricStoragePlatformExternalStorageProviderFactory(final BlockApiLookup<Storage<T>, Direction> lookup,
                                                                final Function<T, ResourceKey> fromPlatformMapper,
                                                                @NullableType final Function<ResourceKey, T>
-                                                                   toPlatformMapper) {
+                                                                   toPlatformMapper,
+                                                               final int priority) {
         this.lookup = lookup;
         this.fromPlatformMapper = fromPlatformMapper;
         this.toPlatformMapper = toPlatformMapper;
+        this.priority = priority;
     }
 
     @Override
     public Optional<ExternalStorageProvider> create(final ServerLevel level,
                                                     final BlockPos pos,
                                                     final Direction direction) {
+        if (lookup.find(level, pos, direction) == null) {
+            return Optional.empty();
+        }
         return Optional.of(new FabricStorageExternalStorageProvider<>(
             lookup,
             fromPlatformMapper,
@@ -42,4 +48,9 @@ public Optional<ExternalStorageProvider> create(final ServerLevel level,
             direction
         ));
     }
+
+    @Override
+    public int getPriority() {
+        return priority;
+    }
 }
diff --git a/.../neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java b/.../neoforge/storage/externalstorage/FluidHandlerPlatformExternalStorageProviderFactory.java
@@ -2,6 +2,7 @@
 
 import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider;
 import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory;
+import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache;
 import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCacheImpl;
 
 import java.util.Optional;
@@ -15,6 +16,13 @@ public class FluidHandlerPlatformExternalStorageProviderFactory implements Platf
     public Optional<ExternalStorageProvider> create(final ServerLevel level,
                                                     final BlockPos pos,
                                                     final Direction direction) {
-        return Optional.of(new FluidHandlerExternalStorageProvider(new CapabilityCacheImpl(level, pos, direction)));
+        final CapabilityCache capabilityCache = new CapabilityCacheImpl(level, pos, direction);
+        return capabilityCache.getFluidHandler()
+            .map(handler -> new FluidHandlerExternalStorageProvider(capabilityCache));
+    }
+
+    @Override
+    public int getPriority() {
+        return -1;
     }
 }
diff --git a/...e/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java b/...e/neoforge/storage/externalstorage/ItemHandlerPlatformExternalStorageProviderFactory.java
@@ -2,6 +2,7 @@
 
 import com.refinedmods.refinedstorage.api.storage.external.ExternalStorageProvider;
 import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory;
+import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCache;
 import com.refinedmods.refinedstorage.neoforge.storage.CapabilityCacheImpl;
 
 import java.util.Optional;
@@ -15,6 +16,7 @@ public class ItemHandlerPlatformExternalStorageProviderFactory implements Platfo
     public Optional<ExternalStorageProvider> create(final ServerLevel level,
                                                     final BlockPos pos,
                                                     final Direction direction) {
-        return Optional.of(new ItemHandlerExternalStorageProvider(new CapabilityCacheImpl(level, pos, direction)));
+        final CapabilityCache capabilityCache = new CapabilityCacheImpl(level, pos, direction);
+        return capabilityCache.getItemHandler().map(handler -> new ItemHandlerExternalStorageProvider(capabilityCache));
     }
 }