fix: 🐛 Fixed void upgrade block-list defaults in limited barrels

Author: P3pp3rF1y

gradle.properties

@@ -13,7 +13,7 @@ loader_version_range=[4,)
 mod_id=sophisticatedcore
 mod_name=Sophisticated Core
 mod_license=All Rights Reserved
-mod_version=1.4.98
+mod_version=1.4.99
 mod_group_id=net.p3pp3rf1y
 mod_authors=P3pp3rF1y
 mod_description=A library / shared functionality mod for Sophisticated Storage and Backpacks

src/main/java/net/p3pp3rf1y/sophisticatedcore/upgrades/FilterLogic.java

@@ -147,6 +147,9 @@ protected void setAttributes(Function<FilterAttributes, FilterAttributes> setter
 
 	public void setAllowByDefault(boolean allowListDefault) {
 		this.allowListDefault = allowListDefault;
+		if (!upgrade.has(filterAttributesComponent)) {
+			emptyAttributes = null;
+		}
 	}
 
 	protected void save() {

src/test/java/net/p3pp3rf1y/sophisticatedcore/upgrades/voiding/VoidUpgradeWrapperTest.java

@@ -129,6 +129,25 @@ void shouldVoidFluidSkipsEmptyContainedFilters() {
 		assertTrue(getVoidUpgradeWrapper().shouldVoidFluid(FluidResource.of(Fluids.WATER), VoidType.ALWAYS));
 	}
 
+	@Test
+	void setAllowByDefaultUpdatesEmptyFilterAttributes() {
+		VoidUpgradeWrapper wrapper = getVoidUpgradeWrapperWithEmptyFilterAttributes();
+
+		wrapper.getFilterLogic().setAllowByDefault(false);
+
+		assertTrue(wrapper.getFilterLogic().matchesFilter(ItemResource.of(Items.DIAMOND)));
+	}
+
+	@Test
+	void setAllowByDefaultDoesNotOverridePersistedFilterAttributes() {
+		VoidUpgradeWrapper wrapper = getVoidUpgradeWrapperWithEmptyFilterAttributes();
+		wrapper.getFilterLogic().setAllowList(true);
+
+		wrapper.getFilterLogic().setAllowByDefault(false);
+
+		assertFalse(wrapper.getFilterLogic().matchesFilter(ItemResource.of(Items.DIAMOND)));
+	}
+
 	private static VoidUpgradeWrapper getVoidUpgradeWrapper(InventoryHandler inventoryHandler) {
 		IStorageWrapper storageWrapper = mock(IStorageWrapper.class);
 		when(storageWrapper.getInventoryHandler()).thenReturn(inventoryHandler);
@@ -144,7 +163,15 @@ private static VoidUpgradeWrapper getVoidUpgradeWrapper() {
 		return getVoidUpgradeWrapper(mock(IStorageWrapper.class), 1);
 	}
 
+	private static VoidUpgradeWrapper getVoidUpgradeWrapperWithEmptyFilterAttributes() {
+		return getVoidUpgradeWrapper(mock(IStorageWrapper.class), 1, false);
+	}
+
 	private static VoidUpgradeWrapper getVoidUpgradeWrapper(IStorageWrapper storageWrapper, int filterSlotCount) {
+		return getVoidUpgradeWrapper(storageWrapper, filterSlotCount, true);
+	}
+
+	private static VoidUpgradeWrapper getVoidUpgradeWrapper(IStorageWrapper storageWrapper, int filterSlotCount, boolean useBlockListFilterAttributesDefault) {
 		VoidUpgradeItem upgradeItem = mock(VoidUpgradeItem.class);
 		when(upgradeItem.getFilterSlotCount()).thenReturn(filterSlotCount);
 		when(upgradeItem.isVoidAlwaysEnabled()).thenReturn(true);
@@ -157,10 +184,11 @@ private static VoidUpgradeWrapper getVoidUpgradeWrapper(IStorageWrapper storageW
 				return true;
 			}
 			if (component == ModCoreDataComponents.FILTER_ATTRIBUTES) {
-				return components.getOrDefault(component, BLOCK_LIST_FILTER_ATTRIBUTES);
+				return components.getOrDefault(component, useBlockListFilterAttributesDefault ? BLOCK_LIST_FILTER_ATTRIBUTES : invocation.getArgument(1));
 			}
 			return components.getOrDefault(component, invocation.getArgument(1));
 		});
+		when(upgrade.has(anyDataComponentSupplier())).thenAnswer(invocation -> components.containsKey(invocation.getArgument(0)));
 		doAnswer(invocation -> components.put(invocation.getArgument(0), invocation.getArgument(1))).when(upgrade).set(anySetDataComponentSupplier(), any());
 
 		return new VoidUpgradeWrapper(storageWrapper, upgrade, stack -> {