Merge pull request #487 from P3pp3rF1y/1.20.x-dev

fix: 🐛 Fixed issue where tank / battery upgrades could be swapped for…

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

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();
 		}