From 8a48c9403600fdd43163556ae6aacc9efbbb4f65 Mon Sep 17 00:00:00 2001 From: P3pp3rF1y Date: Sun, 29 Sep 2024 00:03:30 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20Fixed=20issue=20where=20t?= =?UTF-8?q?ank=20/=20battery=20upgrades=20could=20be=20swapped=20for=20sta?= =?UTF-8?q?ck=20upgrades=20making=20the=20resulting=20capacity=20less=20th?= =?UTF-8?q?an=20their=20contents=20and=20break=20rendering.=20Trying=20thi?= =?UTF-8?q?s=20will=20now=20show=20an=20error=20message.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 4 ++-- .../upgrades/compression/CompressionUpgradeItem.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 4213d15f..5a1f80c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ org.gradle.daemon=false mod_id=sophisticatedstorage mod_group_id=sophisticatedstorage -mod_version=0.10.38 +mod_version=0.10.39 sonar_project_key=sophisticatedstorage:SophisticatedStorage github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedStorage @@ -30,6 +30,6 @@ jade_cf_file_id=4614153 chipped_cf_file_id=5077656 resourcefullib_cf_file_id=5070629 athena_cf_file_id=4764357 -sc_version=[1.20.1-0.6.17,1.20.4) +sc_version=[1.20.1-0.6.31,1.20.4) sb_version=[1.20.1-3.20.5,1.20.4) parchment_version=1.19.3-2023.03.12-1.20 diff --git a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/upgrades/compression/CompressionUpgradeItem.java b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/upgrades/compression/CompressionUpgradeItem.java index a3054a3c..36c83b6c 100644 --- a/src/main/java/net/p3pp3rf1y/sophisticatedstorage/upgrades/compression/CompressionUpgradeItem.java +++ b/src/main/java/net/p3pp3rf1y/sophisticatedstorage/upgrades/compression/CompressionUpgradeItem.java @@ -10,6 +10,7 @@ import net.p3pp3rf1y.sophisticatedcore.inventory.InventoryPartitioner; import net.p3pp3rf1y.sophisticatedcore.settings.itemdisplay.ItemDisplaySettingsCategory; import net.p3pp3rf1y.sophisticatedcore.settings.memory.MemorySettingsCategory; +import net.p3pp3rf1y.sophisticatedcore.upgrades.IUpgradeItem; import net.p3pp3rf1y.sophisticatedcore.upgrades.UpgradeItemBase; import net.p3pp3rf1y.sophisticatedcore.upgrades.UpgradeType; import net.p3pp3rf1y.sophisticatedcore.upgrades.UpgradeWrapperBase; @@ -19,6 +20,7 @@ import net.p3pp3rf1y.sophisticatedstorage.Config; import net.p3pp3rf1y.sophisticatedstorage.client.gui.StorageTranslationHelper; +import javax.annotation.Nullable; import java.util.*; import java.util.function.Consumer; @@ -45,7 +47,7 @@ private UpgradeSlotChangeResult checkCompressionSpace(IStorageWrapper storageWra } @Override - public UpgradeSlotChangeResult checkExtraInsertConditions(ItemStack upgradeStack, IStorageWrapper storageWrapper, boolean isClientSide) { + public UpgradeSlotChangeResult checkExtraInsertConditions(ItemStack upgradeStack, IStorageWrapper storageWrapper, boolean isClientSide, @Nullable IUpgradeItem upgradeInSlot) { if (isClientSide) { return new UpgradeSlotChangeResult.Success(); }