Merge pull request #742 from refinedmods/release/2.0.0-milestone.4.11

Release v2.0.0-milestone.4.11
refinedmods · Dec 8, 2024 · 7dd02ef · 7dd02ef
2 parents c627648 + 59e4112
commit 7dd02ef
Show file tree

Hide file tree

Showing 155 changed files with 3,044 additions and 1,540 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,21 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [2.0.0-milestone.4.11] - 2024-12-08
+
+### Added
+
+-   Ability to differentiate between insert and extract storage priorities. By default, the extract priority will match the insert priority unless configured otherwise.
+
+### 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.
+-   Fixed storage disk upgrade recipes not showing properly in recipe viewers.
+-   Protect against crashes from other mods when trying to build the cached Grid tooltip.
+-   Fixed charging energy items not working on Fabric.
+
 ## [2.0.0-milestone.4.10] - 2024-11-24
 
 ### Added
@@ -814,7 +829,9 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   The Grid can now use smooth scrolling.
 -   The Grid now has syntax highlighting for the search query.
 
-[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.10...HEAD
+[Unreleased]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.11...HEAD
+
+[2.0.0-milestone.4.11]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.10...v2.0.0-milestone.4.11
 
 [2.0.0-milestone.4.10]: https://github.com/refinedmods/refinedstorage2/compare/v2.0.0-milestone.4.9...v2.0.0-milestone.4.10
 

diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
@@ -63,7 +63,6 @@
             <property name="ignoreConstructorParameter" value="true"/>
             <property name="ignoreSetter" value="true"/>
         </module>
-        <module name="IllegalCatch"/>
         <module name="IllegalInstantiation"/>
         <module name="IllegalThrows"/>
         <module name="IllegalToken"/>

diff --git a/...common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApi.java b/...common-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApi.java
@@ -7,14 +7,10 @@
 import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage;
 import com.refinedmods.refinedstorage.api.network.node.NetworkNode;
 import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy;
-import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
-import com.refinedmods.refinedstorage.api.resource.ResourceKey;
 import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.grid.Grid;
-import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHint;
-import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHints;
 import com.refinedmods.refinedstorage.common.api.grid.GridSynchronizer;
 import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy;
 import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategyFactory;
@@ -24,21 +20,23 @@
 import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.security.PlatformPermission;
+import com.refinedmods.refinedstorage.common.api.storage.StorageBlockData;
+import com.refinedmods.refinedstorage.common.api.storage.StorageBlockProvider;
 import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItemHelper;
 import com.refinedmods.refinedstorage.common.api.storage.StorageRepository;
 import com.refinedmods.refinedstorage.common.api.storage.StorageType;
 import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory;
 import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy;
 import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy;
 import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper;
+import com.refinedmods.refinedstorage.common.api.support.network.AbstractNetworkNodeContainerBlockEntity;
 import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer;
 import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider;
 import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper;
 import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry;
 import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainerInsertStrategy;
 import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory;
-import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering;
 import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType;
 import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference;
 import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory;
@@ -47,23 +45,27 @@
 import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitterRangeModifier;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nullable;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import org.apiguardian.api.API;
 
@@ -133,10 +135,6 @@ GridInsertionStrategy createGridInsertionStrategy(AbstractContainerMenu containe
 
     Collection<ResourceContainerInsertStrategy> getResourceContainerInsertStrategies();
 
-    void addAlternativeGridInsertionHint(GridInsertionHint hint);
-
-    GridInsertionHints getGridInsertionHints();
-
     GridExtractionStrategy createGridExtractionStrategy(AbstractContainerMenu containerMenu,
                                                         ServerPlayer player,
                                                         Grid grid);
@@ -161,10 +159,6 @@ GridScrollingStrategy createGridScrollingStrategy(AbstractContainerMenu containe
 
     Set<ResourceFactory> getAlternativeResourceFactories();
 
-    <T extends ResourceKey> void registerResourceRendering(Class<T> resourceClass, ResourceRendering rendering);
-
-    <T extends ResourceKey> ResourceRendering getResourceRendering(Class<T> resourceClass);
-
     void addIngredientConverter(RecipeModIngredientConverter converter);
 
     RecipeModIngredientConverter getIngredientConverter();
@@ -207,7 +201,19 @@ EnergyStorage asBlockItemEnergyStorage(
 
     Optional<Pattern> getPattern(ItemStack stack, Level level);
 
-    void openAutocraftingPreview(List<ResourceAmount> requests, @Nullable Object parentScreen);
-
     ResourceLocation getCreativeModeTabId();
+
+    AbstractNetworkNodeContainerBlockEntity<?> createStorageBlockEntity(BlockPos pos,
+                                                                        BlockState state,
+                                                                        StorageBlockProvider provider);
+
+    Block createStorageBlock(BlockBehaviour.Properties properties, StorageBlockProvider provider);
+
+    AbstractContainerMenu createStorageBlockContainerMenu(int syncId,
+                                                          Player player,
+                                                          StorageBlockData data,
+                                                          ResourceFactory resourceFactory,
+                                                          MenuType<?> menuType);
+
+    StreamCodec<RegistryFriendlyByteBuf, StorageBlockData> getStorageBlockDataStreamCodec();
 }
diff --git a/...n-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApiProxy.java b/...n-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageApiProxy.java
@@ -7,14 +7,10 @@
 import com.refinedmods.refinedstorage.api.network.energy.EnergyStorage;
 import com.refinedmods.refinedstorage.api.network.node.NetworkNode;
 import com.refinedmods.refinedstorage.api.network.security.SecurityPolicy;
-import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
-import com.refinedmods.refinedstorage.api.resource.ResourceKey;
 import com.refinedmods.refinedstorage.common.api.constructordestructor.ConstructorStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.constructordestructor.DestructorStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.exporter.ExporterTransferStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.grid.Grid;
-import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHint;
-import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHints;
 import com.refinedmods.refinedstorage.common.api.grid.GridSynchronizer;
 import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategy;
 import com.refinedmods.refinedstorage.common.api.grid.strategy.GridExtractionStrategyFactory;
@@ -24,21 +20,23 @@
 import com.refinedmods.refinedstorage.common.api.grid.strategy.GridScrollingStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.importer.ImporterTransferStrategyFactory;
 import com.refinedmods.refinedstorage.common.api.security.PlatformPermission;
+import com.refinedmods.refinedstorage.common.api.storage.StorageBlockData;
+import com.refinedmods.refinedstorage.common.api.storage.StorageBlockProvider;
 import com.refinedmods.refinedstorage.common.api.storage.StorageContainerItemHelper;
 import com.refinedmods.refinedstorage.common.api.storage.StorageRepository;
 import com.refinedmods.refinedstorage.common.api.storage.StorageType;
 import com.refinedmods.refinedstorage.common.api.storage.externalstorage.PlatformExternalStorageProviderFactory;
 import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorExtractionStrategy;
 import com.refinedmods.refinedstorage.common.api.storagemonitor.StorageMonitorInsertionStrategy;
 import com.refinedmods.refinedstorage.common.api.support.energy.EnergyItemHelper;
+import com.refinedmods.refinedstorage.common.api.support.network.AbstractNetworkNodeContainerBlockEntity;
 import com.refinedmods.refinedstorage.common.api.support.network.InWorldNetworkNodeContainer;
 import com.refinedmods.refinedstorage.common.api.support.network.NetworkNodeContainerProvider;
 import com.refinedmods.refinedstorage.common.api.support.network.item.NetworkItemHelper;
 import com.refinedmods.refinedstorage.common.api.support.registry.PlatformRegistry;
 import com.refinedmods.refinedstorage.common.api.support.resource.RecipeModIngredientConverter;
 import com.refinedmods.refinedstorage.common.api.support.resource.ResourceContainerInsertStrategy;
 import com.refinedmods.refinedstorage.common.api.support.resource.ResourceFactory;
-import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering;
 import com.refinedmods.refinedstorage.common.api.support.resource.ResourceType;
 import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReference;
 import com.refinedmods.refinedstorage.common.api.support.slotreference.SlotReferenceFactory;
@@ -47,23 +45,27 @@
 import com.refinedmods.refinedstorage.common.api.wirelesstransmitter.WirelessTransmitterRangeModifier;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import javax.annotation.Nullable;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 
 public class RefinedStorageApiProxy implements RefinedStorageApi {
@@ -229,16 +231,6 @@ public Collection<ResourceContainerInsertStrategy> getResourceContainerInsertStr
         return ensureLoaded().getResourceContainerInsertStrategies();
     }
 
-    @Override
-    public void addAlternativeGridInsertionHint(final GridInsertionHint hint) {
-        ensureLoaded().addAlternativeGridInsertionHint(hint);
-    }
-
-    @Override
-    public GridInsertionHints getGridInsertionHints() {
-        return ensureLoaded().getGridInsertionHints();
-    }
-
     @Override
     public GridExtractionStrategy createGridExtractionStrategy(final AbstractContainerMenu containerMenu,
                                                                final ServerPlayer player,
@@ -293,17 +285,6 @@ public Set<ResourceFactory> getAlternativeResourceFactories() {
         return ensureLoaded().getAlternativeResourceFactories();
     }
 
-    @Override
-    public <T extends ResourceKey> void registerResourceRendering(final Class<T> resourceClass,
-                                                                  final ResourceRendering rendering) {
-        ensureLoaded().registerResourceRendering(resourceClass, rendering);
-    }
-
-    @Override
-    public <T extends ResourceKey> ResourceRendering getResourceRendering(final Class<T> resourceClass) {
-        return ensureLoaded().getResourceRendering(resourceClass);
-    }
-
     @Override
     public void addIngredientConverter(final RecipeModIngredientConverter converter) {
         ensureLoaded().addIngredientConverter(converter);
@@ -405,13 +386,34 @@ public Optional<Pattern> getPattern(final ItemStack stack, final Level level) {
     }
 
     @Override
-    public void openAutocraftingPreview(final List<ResourceAmount> requests, @Nullable final Object parentScreen) {
-        ensureLoaded().openAutocraftingPreview(requests, parentScreen);
+    public ResourceLocation getCreativeModeTabId() {
+        return ensureLoaded().getCreativeModeTabId();
     }
 
     @Override
-    public ResourceLocation getCreativeModeTabId() {
-        return ensureLoaded().getCreativeModeTabId();
+    public AbstractNetworkNodeContainerBlockEntity<?> createStorageBlockEntity(final BlockPos pos,
+                                                                               final BlockState state,
+                                                                               final StorageBlockProvider provider) {
+        return ensureLoaded().createStorageBlockEntity(pos, state, provider);
+    }
+
+    @Override
+    public Block createStorageBlock(final BlockBehaviour.Properties properties, final StorageBlockProvider provider) {
+        return ensureLoaded().createStorageBlock(properties, provider);
+    }
+
+    @Override
+    public AbstractContainerMenu createStorageBlockContainerMenu(final int syncId,
+                                                                 final Player player,
+                                                                 final StorageBlockData data,
+                                                                 final ResourceFactory resourceFactory,
+                                                                 final MenuType<?> menuType) {
+        return ensureLoaded().createStorageBlockContainerMenu(syncId, player, data, resourceFactory, menuType);
+    }
+
+    @Override
+    public StreamCodec<RegistryFriendlyByteBuf, StorageBlockData> getStorageBlockDataStreamCodec() {
+        return ensureLoaded().getStorageBlockDataStreamCodec();
     }
 
     private RefinedStorageApi ensureLoaded() {

diff --git a/...-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageClientApi.java b/...-api/src/main/java/com/refinedmods/refinedstorage/common/api/RefinedStorageClientApi.java
@@ -0,0 +1,49 @@
+package com.refinedmods.refinedstorage.common.api;
+
+import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
+import com.refinedmods.refinedstorage.api.resource.ResourceKey;
+import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHint;
+import com.refinedmods.refinedstorage.common.api.grid.GridInsertionHints;
+import com.refinedmods.refinedstorage.common.api.support.resource.ResourceRendering;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.item.Item;
+import org.apiguardian.api.API;
+
+@API(status = API.Status.STABLE, since = "2.0.0-milestone.4.11")
+public interface RefinedStorageClientApi {
+    RefinedStorageClientApi INSTANCE = new RefinedStorageClientApiProxy();
+
+    AbstractContainerScreen<AbstractContainerMenu> createStorageBlockScreen(
+        AbstractContainerMenu menu,
+        Inventory inventory,
+        Component title,
+        Class<? extends ResourceKey> resourceClass
+    );
+
+    void openAutocraftingPreview(List<ResourceAmount> requests, @Nullable Screen parentScreen);
+
+    <T extends ResourceKey> void registerResourceRendering(Class<T> resourceClass, ResourceRendering rendering);
+
+    <T extends ResourceKey> ResourceRendering getResourceRendering(Class<T> resourceClass);
+
+    void addAlternativeGridInsertionHint(GridInsertionHint hint);
+
+    GridInsertionHints getGridInsertionHints();
+
+    void registerDiskModel(Item item, ResourceLocation model);
+
+    Set<ResourceLocation> getDiskModels();
+
+    Map<Item, ResourceLocation> getDiskModelsByItem();
+}