Skip to content

Commit 3680cbf

Browse files
committed
fix: 🐛 Fixed void upgrade block-list defaults in limited barrels
1 parent 22abbea commit 3680cbf

3 files changed

Lines changed: 23 additions & 1 deletion

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ loader_version_range=[4,)
1515
mod_id=sophisticatedcore
1616
mod_name=Sophisticated Core
1717
mod_license=All Rights Reserved
18-
mod_version=1.4.81
18+
mod_version=1.4.82
1919
mod_group_id=net.p3pp3rf1y
2020
mod_authors=P3pp3rF1y
2121
mod_description=A library / shared functionality mod for Sophisticated Storage and Backpacks

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,9 @@ protected void setAttributes(Function<FilterAttributes, FilterAttributes> setter
132132

133133
public void setAllowByDefault(boolean allowListDefault) {
134134
this.allowListDefault = allowListDefault;
135+
if (!upgrade.has(filterAttributesComponent)) {
136+
emptyAttributes = null;
137+
}
135138
}
136139

137140
protected void save() {

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,25 @@ void denyListDoesNotVoidContainedFilteredFluid() {
5858
assertTrue(wrapper.shouldVoidFluid(new FluidStack(Fluids.WATER, 1_000), VoidType.ALWAYS));
5959
}
6060

61+
@Test
62+
void setAllowByDefaultUpdatesEmptyFilterAttributes() {
63+
VoidUpgradeWrapper wrapper = getVoidUpgradeWrapper();
64+
65+
wrapper.getFilterLogic().setAllowByDefault(false);
66+
67+
assertTrue(wrapper.getFilterLogic().matchesFilter(new ItemStack(Items.DIAMOND)));
68+
}
69+
70+
@Test
71+
void setAllowByDefaultDoesNotOverridePersistedFilterAttributes() {
72+
VoidUpgradeWrapper wrapper = getVoidUpgradeWrapper();
73+
wrapper.getFilterLogic().setAllowList(true);
74+
75+
wrapper.getFilterLogic().setAllowByDefault(false);
76+
77+
assertFalse(wrapper.getFilterLogic().matchesFilter(new ItemStack(Items.DIAMOND)));
78+
}
79+
6180
private static VoidUpgradeWrapper getVoidUpgradeWrapper() {
6281
VoidUpgradeItem upgradeItem = mock(VoidUpgradeItem.class);
6382
when(upgradeItem.getFilterSlotCount()).thenReturn(1);

0 commit comments

Comments
 (0)