fix: the configuration card is now stack sensitive

To transfer a configured Regulator Upgrade for example.
refinedmods · Oct 12, 2024 · a2da917 · a2da917
1 parent cb4d54a
commit a2da917
Show file tree

Hide file tree

Showing 18 changed files with 43 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 -   Fixed upgrade destinations not being shown on upgrades.
 -   Fixed resources with changed data format or ID causing entire storage to fail to load.
 -   Fixed crash when trying to export fluids from an External Storage on Fabric.
+-   The Configuration Card can now also transfer the (configured) Regulator Upgrade.
 
 ## [2.0.0-milestone.4.7] - 2024-08-11
 

diff --git a/.../com/refinedmods/refinedstorage/common/api/configurationcard/ConfigurationCardTarget.java b/.../com/refinedmods/refinedstorage/common/api/configurationcard/ConfigurationCardTarget.java
@@ -5,7 +5,6 @@
 
 import net.minecraft.core.HolderLookup;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import org.apiguardian.api.API;
 
@@ -18,11 +17,11 @@ public interface ConfigurationCardTarget {
 
     void readConfiguration(CompoundTag tag, HolderLookup.Provider provider);
 
-    default List<Item> getUpgradeItems() {
+    default List<ItemStack> getUpgrades() {
         return Collections.emptyList();
     }
 
-    default boolean addUpgradeItem(ItemStack upgradeStack) {
+    default boolean addUpgrade(ItemStack upgradeStack) {
         return false;
     }
 }
diff --git a/.../main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java b/.../main/java/com/refinedmods/refinedstorage/common/autocrafting/AutocrafterBlockEntity.java
@@ -230,12 +230,12 @@ protected boolean hasRedstoneMode() {
     }
 
     @Override
-    public List<Item> getUpgradeItems() {
+    public List<ItemStack> getUpgrades() {
         return upgradeContainer.getUpgradeItems();
     }
 
     @Override
-    public boolean addUpgradeItem(final ItemStack upgradeStack) {
+    public boolean addUpgrade(final ItemStack upgradeStack) {
         return upgradeContainer.addUpgradeItem(upgradeStack);
     }
 

diff --git a/...rc/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternItemOverrides.java b/...rc/main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternItemOverrides.java
@@ -21,7 +21,7 @@ public class PatternItemOverrides extends ItemOverrides {
     private final BakedModel stonecutterModel;
     private final BakedModel smithingTableModel;
 
-    @SuppressWarnings({"DataFlowIssue"}) // null is allowed as long as we don't pass overrides
+    @SuppressWarnings({"DataFlowIssue", "deprecation"}) // null is allowed as long as we don't pass overrides
     public PatternItemOverrides(final ModelBaker modelBaker,
                                 final BakedModel emptyModel,
                                 final BakedModel craftingModel,

diff --git a/...n/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardItem.java b/...n/java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardItem.java
@@ -55,7 +55,7 @@ public InteractionResult useOn(final UseOnContext ctx) {
             stack.set(DataComponents.INSTANCE.getConfigurationCardState(), new ConfigurationCardState(
                 blockEntity.getType(),
                 createConfigTag(target, ctx.getLevel().registryAccess()),
-                target.getUpgradeItems()
+                target.getUpgrades()
             ));
             sendCopiedConfigurationMessage(ctx.getPlayer(), blockEntity.getType());
             return InteractionResult.CONSUME;
@@ -74,19 +74,18 @@ private InteractionResult applyConfiguration(
             return configurationCardIsConfiguredForDifferentType(player, state.blockEntityType());
         }
         target.readConfiguration(state.config(), provider);
-        tryTransferUpgrades(player, target, state.upgradeItems());
+        tryTransferUpgrades(player, target, state.upgrades());
         targetBlockEntity.setChanged();
         player.sendSystemMessage(createTranslation("item", "configuration_card.applied_configuration"));
         return InteractionResult.SUCCESS;
     }
 
     private void tryTransferUpgrades(final Player player,
                                      final ConfigurationCardTarget target,
-                                     final List<Item> upgradeItems) {
-        for (final Item upgradeItem : upgradeItems) {
-            final ItemStack upgradeStack = new ItemStack(upgradeItem);
-            final int upgradeIndexInPlayerInventory = player.getInventory().findSlotMatchingItem(upgradeStack);
-            if (upgradeIndexInPlayerInventory >= 0 && target.addUpgradeItem(upgradeStack)) {
+                                     final List<ItemStack> upgradeItems) {
+        for (final ItemStack upgradeItem : upgradeItems) {
+            final int upgradeIndexInPlayerInventory = player.getInventory().findSlotMatchingItem(upgradeItem);
+            if (upgradeIndexInPlayerInventory >= 0 && target.addUpgrade(upgradeItem)) {
                 player.getInventory().removeItem(upgradeIndexInPlayerInventory, 1);
             }
         }

diff --git a/.../java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardState.java b/.../java/com/refinedmods/refinedstorage/common/configurationcard/ConfigurationCardState.java
@@ -11,27 +11,24 @@
 import net.minecraft.network.RegistryFriendlyByteBuf;
 import net.minecraft.network.codec.ByteBufCodecs;
 import net.minecraft.network.codec.StreamCodec;
-import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 
-public record ConfigurationCardState(BlockEntityType<?> blockEntityType,
-                                     CompoundTag config,
-                                     List<Item> upgradeItems) {
+public record ConfigurationCardState(BlockEntityType<?> blockEntityType, CompoundTag config, List<ItemStack> upgrades) {
     public static final Codec<ConfigurationCardState> CODEC = RecordCodecBuilder.create(instance -> instance.group(
         BuiltInRegistries.BLOCK_ENTITY_TYPE.byNameCodec().fieldOf("blockEntityType")
             .forGetter(ConfigurationCardState::blockEntityType),
         CompoundTag.CODEC.fieldOf("config")
             .forGetter(ConfigurationCardState::config),
-        Codec.list(BuiltInRegistries.ITEM.byNameCodec()).fieldOf("upgradeItems")
-            .forGetter(ConfigurationCardState::upgradeItems)
+        Codec.list(ItemStack.SINGLE_ITEM_CODEC).fieldOf("upgrades")
+            .forGetter(ConfigurationCardState::upgrades)
     ).apply(instance, ConfigurationCardState::new));
 
     public static final StreamCodec<RegistryFriendlyByteBuf, ConfigurationCardState> STREAM_CODEC =
         StreamCodec.composite(
             ByteBufCodecs.registry(Registries.BLOCK_ENTITY_TYPE), ConfigurationCardState::blockEntityType,
             ByteBufCodecs.COMPOUND_TAG, ConfigurationCardState::config,
-            ByteBufCodecs.collection(ArrayList::new, ByteBufCodecs.registry(Registries.ITEM)),
-            ConfigurationCardState::upgradeItems,
+            ByteBufCodecs.collection(ArrayList::new, ItemStack.STREAM_CODEC), ConfigurationCardState::upgrades,
             ConfigurationCardState::new
         );
 }
diff --git a/...finedmods/refinedstorage/common/constructordestructor/AbstractConstructorBlockEntity.java b/...finedmods/refinedstorage/common/constructordestructor/AbstractConstructorBlockEntity.java
@@ -84,12 +84,12 @@ void setFilters(final List<ResourceKey> filters) {
     }
 
     @Override
-    public List<Item> getUpgradeItems() {
+    public List<ItemStack> getUpgrades() {
         return upgradeContainer.getUpgradeItems();
     }
 
     @Override
-    public boolean addUpgradeItem(final ItemStack upgradeStack) {
+    public boolean addUpgrade(final ItemStack upgradeStack) {
         return upgradeContainer.addUpgradeItem(upgradeStack);
     }
 

diff --git a/...efinedmods/refinedstorage/common/constructordestructor/AbstractDestructorBlockEntity.java b/...efinedmods/refinedstorage/common/constructordestructor/AbstractDestructorBlockEntity.java
@@ -35,7 +35,6 @@
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
 
@@ -75,12 +74,12 @@ protected AbstractDestructorBlockEntity(final BlockPos pos, final BlockState sta
     }
 
     @Override
-    public List<Item> getUpgradeItems() {
+    public List<ItemStack> getUpgrades() {
         return upgradeContainer.getUpgradeItems();
     }
 
     @Override
-    public boolean addUpgradeItem(final ItemStack upgradeStack) {
+    public boolean addUpgrade(final ItemStack upgradeStack) {
         return upgradeContainer.addUpgradeItem(upgradeStack);
     }
 

diff --git a/...main/java/com/refinedmods/refinedstorage/common/exporter/AbstractExporterBlockEntity.java b/...main/java/com/refinedmods/refinedstorage/common/exporter/AbstractExporterBlockEntity.java
@@ -87,12 +87,12 @@ private void schedulingModeChanged(final SchedulingMode schedulingMode) {
     }
 
     @Override
-    public List<Item> getUpgradeItems() {
+    public List<ItemStack> getUpgrades() {
         return upgradeContainer.getUpgradeItems();
     }
 
     @Override
-    public boolean addUpgradeItem(final ItemStack upgradeStack) {
+    public boolean addUpgrade(final ItemStack upgradeStack) {
         return upgradeContainer.addUpgradeItem(upgradeStack);
     }
 

diff --git a/...main/java/com/refinedmods/refinedstorage/common/importer/AbstractImporterBlockEntity.java b/...main/java/com/refinedmods/refinedstorage/common/importer/AbstractImporterBlockEntity.java
@@ -81,12 +81,12 @@ protected AbstractImporterBlockEntity(final BlockPos pos, final BlockState state
     }
 
     @Override
-    public List<Item> getUpgradeItems() {
+    public List<ItemStack> getUpgrades() {
         return upgradeContainer.getUpgradeItems();
     }
 
     @Override
-    public boolean addUpgradeItem(final ItemStack upgradeStack) {
+    public boolean addUpgrade(final ItemStack upgradeStack) {
         return upgradeContainer.addUpgradeItem(upgradeStack);
     }
 

diff --git a/...java/com/refinedmods/refinedstorage/common/networking/WirelessTransmitterBlockEntity.java b/...java/com/refinedmods/refinedstorage/common/networking/WirelessTransmitterBlockEntity.java
@@ -74,12 +74,12 @@ public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider pr
     }
 
     @Override
-    public List<Item> getUpgradeItems() {
+    public List<ItemStack> getUpgrades() {
         return upgradeContainer.getUpgradeItems();
     }
 
     @Override
-    public boolean addUpgradeItem(final ItemStack upgradeStack) {
+    public boolean addUpgrade(final ItemStack upgradeStack) {
         return upgradeContainer.addUpgradeItem(upgradeStack);
     }
 

diff --git a/...nedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java b/...nedmods/refinedstorage/common/storage/diskinterface/AbstractDiskInterfaceBlockEntity.java
@@ -109,12 +109,12 @@ public void writeConfiguration(final CompoundTag tag, final HolderLookup.Provide
     }
 
     @Override
-    public List<Item> getUpgradeItems() {
+    public List<ItemStack> getUpgrades() {
         return upgradeContainer.getUpgradeItems();
     }
 
     @Override
-    public boolean addUpgradeItem(final ItemStack upgradeStack) {
+    public boolean addUpgrade(final ItemStack upgradeStack) {
         return upgradeContainer.addUpgradeItem(upgradeStack);
     }
 

diff --git a/...-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java b/...-common/src/main/java/com/refinedmods/refinedstorage/common/upgrade/UpgradeContainer.java
@@ -39,7 +39,7 @@ public class UpgradeContainer extends SimpleContainer implements UpgradeState {
     private final UpgradeContainerListener listener;
     private final int defaultWorkTickRate;
     private final ThrottledNetworkNodeTicker ticker;
-    
+
     public UpgradeContainer(final UpgradeDestination destination) {
         this(destination, null);
     }
@@ -145,20 +145,20 @@ public long getEnergyUsage() {
         return usage;
     }
 
-    public List<Item> getUpgradeItems() {
-        final List<Item> upgradeItems = new ArrayList<>();
+    public List<ItemStack> getUpgradeItems() {
+        final List<ItemStack> upgradeItems = new ArrayList<>();
         for (int i = 0; i < getContainerSize(); ++i) {
             final ItemStack itemStack = getItem(i);
             if (itemStack.isEmpty()) {
                 continue;
             }
-            upgradeItems.add(itemStack.getItem());
+            upgradeItems.add(itemStack.copy());
         }
         return upgradeItems;
     }
 
-    public boolean addUpgradeItem(final ItemStack upgradeStack) {
-        return addItem(upgradeStack).isEmpty();
+    public boolean addUpgradeItem(final ItemStack upgradeItem) {
+        return addItem(upgradeItem).isEmpty();
     }
 
     public NonNullList<ItemStack> getDrops() {

diff --git a/...est/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorTest.java b/...est/java/com/refinedmods/refinedstorage/common/constructordestructor/ConstructorTest.java
@@ -129,7 +129,7 @@ public static void shouldDropItemWithStackUpgrade(final GameTestHelper helper) {
             // Act
             constructor.setDropItems(true);
             constructor.setFilters(List.of(asResource(DIRT)));
-            constructor.addUpgradeItem(RSITEMS.getStackUpgrade().getDefaultInstance());
+            constructor.addUpgrade(RSITEMS.getStackUpgrade().getDefaultInstance());
 
             // Assert
             sequence

diff --git a/...test/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorTest.java b/...test/java/com/refinedmods/refinedstorage/common/constructordestructor/DestructorTest.java
@@ -139,7 +139,7 @@ public static void shouldBreakBlockWithSilkTouchUpgrade(final GameTestHelper hel
 
             // Act
             helper.setBlock(pos.east(), Blocks.DIAMOND_ORE);
-            destructor.addUpgradeItem(RSITEMS.getSilkTouchUpgrade().getDefaultInstance());
+            destructor.addUpgrade(RSITEMS.getSilkTouchUpgrade().getDefaultInstance());
 
             // Assert
             sequence

diff --git a/...e-neoforge/src/test/java/com/refinedmods/refinedstorage/common/exporter/ExporterTest.java b/...e-neoforge/src/test/java/com/refinedmods/refinedstorage/common/exporter/ExporterTest.java
@@ -80,7 +80,7 @@ public static void shouldExportItemWithStackUpgrade(final GameTestHelper helper)
 
             // Act
             exporter.setFilters(List.of(asResource(DIRT)));
-            exporter.addUpgradeItem(RSITEMS.getStackUpgrade().getDefaultInstance());
+            exporter.addUpgrade(RSITEMS.getStackUpgrade().getDefaultInstance());
 
             // Assert
             sequence
@@ -224,7 +224,7 @@ public static void shouldExportFluidWithStackUpgrade(final GameTestHelper helper
 
             // Act
             exporter.setFilters(List.of(asResource(WATER)));
-            exporter.addUpgradeItem(RSITEMS.getStackUpgrade().getDefaultInstance());
+            exporter.addUpgrade(RSITEMS.getStackUpgrade().getDefaultInstance());
 
             // Assert
             sequence

diff --git a/...e-neoforge/src/test/java/com/refinedmods/refinedstorage/common/importer/ImporterTest.java b/...e-neoforge/src/test/java/com/refinedmods/refinedstorage/common/importer/ImporterTest.java
@@ -90,7 +90,7 @@ public static void shouldImportItemWithStackUpgrade(final GameTestHelper helper)
                 DIRT.getDefaultInstance()
             );
 
-            importer.addUpgradeItem(RSITEMS.getStackUpgrade().getDefaultInstance());
+            importer.addUpgrade(RSITEMS.getStackUpgrade().getDefaultInstance());
 
             // Assert
             sequence
@@ -371,7 +371,7 @@ public static void shouldImportFluidWithStackUpgrade(final GameTestHelper helper
                 new ResourceAmount(asResource(WATER), Platform.INSTANCE.getBucketAmount() * 15),
                 new ResourceAmount(asResource(LAVA), Platform.INSTANCE.getBucketAmount())
             );
-            importer.addUpgradeItem(RSITEMS.getStackUpgrade().getDefaultInstance());
+            importer.addUpgrade(RSITEMS.getStackUpgrade().getDefaultInstance());
 
             // Assert
             sequence

diff --git a/...t/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceTest.java b/...t/java/com/refinedmods/refinedstorage/common/storage/diskinterface/DiskInterfaceTest.java
@@ -76,7 +76,7 @@ public static void shouldInsertItemsIntoNetworkWithStackUpgrade(final GameTestHe
 
             // Act
             diskInterface.setTransferMode(StorageTransferMode.INSERT_INTO_NETWORK);
-            diskInterface.addUpgradeItem(RSITEMS.getStackUpgrade().getDefaultInstance());
+            diskInterface.addUpgrade(RSITEMS.getStackUpgrade().getDefaultInstance());
 
             // Assert
             sequence
@@ -217,7 +217,7 @@ public static void shouldExtractItemsFromNetworkWithStackUpgrade(final GameTestH
 
             // Act
             diskInterface.setTransferMode(StorageTransferMode.EXTRACT_FROM_NETWORK);
-            diskInterface.addUpgradeItem(RSITEMS.getStackUpgrade().getDefaultInstance());
+            diskInterface.addUpgrade(RSITEMS.getStackUpgrade().getDefaultInstance());
 
             // Assert
             sequence