Skip to content

Commit 9ece310

Browse files
committed
move updateFilterReader into base filter
don't return null in error filter
1 parent c4df1b5 commit 9ece310

5 files changed

Lines changed: 6 additions & 26 deletions

File tree

src/main/java/gregtech/common/covers/filter/BaseFilter.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ public abstract class BaseFilter implements IItemComponent {
1919

2020
public static final BaseFilter ERROR_FILTER = new BaseFilter() {
2121

22+
private final BaseFilterReader reader = new BaseFilterReader(0);
23+
2224
@Override
2325
public BaseFilterReader getFilterReader() {
24-
return null;
26+
return reader;
2527
}
2628

27-
@Override
28-
public void updateFilterReader(ItemStack stack) {}
29-
3029
@Override
3130
public FilterType getType() {
3231
return FilterType.ERROR;
@@ -35,7 +34,9 @@ public FilterType getType() {
3534

3635
public abstract BaseFilterReader getFilterReader();
3736

38-
public abstract void updateFilterReader(ItemStack stack);
37+
public final void updateFilterReader(ItemStack stack) {
38+
getFilterReader().readStack(stack);
39+
}
3940

4041
public BaseFilterUIManager getUI() {
4142
if (getContainerStack().getItem() instanceof MetaItem<?>metaItem) {

src/main/java/gregtech/common/covers/filter/OreDictionaryItemFilter.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@ public OreDictFilterReader getFilterReader() {
3030
return filterReader;
3131
}
3232

33-
@Override
34-
public void updateFilterReader(ItemStack stack) {
35-
this.filterReader.readStack(stack);
36-
}
37-
3833
@NotNull
3934
public String getExpression() {
4035
return this.filterReader.getExpression();

src/main/java/gregtech/common/covers/filter/SimpleFluidFilter.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import gregtech.common.covers.filter.readers.SimpleFluidFilterReader;
44

5-
import net.minecraft.item.ItemStack;
65
import net.minecraftforge.fluids.FluidStack;
76

87
public class SimpleFluidFilter extends BaseFilter {
@@ -16,11 +15,6 @@ public SimpleFluidFilterReader getFilterReader() {
1615
return filterReader;
1716
}
1817

19-
@Override
20-
public void updateFilterReader(ItemStack stack) {
21-
this.filterReader.readStack(stack);
22-
}
23-
2418
public void configureFilterTanks(int amount) {
2519
this.filterReader.setFluidAmounts(amount);
2620
}

src/main/java/gregtech/common/covers/filter/SimpleItemFilter.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ public SimpleItemFilterReader getFilterReader() {
1515
return filterReader;
1616
}
1717

18-
@Override
19-
public void updateFilterReader(ItemStack stack) {
20-
this.filterReader.readStack(stack);
21-
}
22-
2318
@Override
2419
public MatchResult matchItem(ItemStack itemStack) {
2520
int matchedSlot = itemFilterMatch(filterReader, filterReader.isIgnoreDamage(), filterReader.isIgnoreNBT(),

src/main/java/gregtech/common/covers/filter/SmartItemFilter.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@ public SmartItemFilterReader getFilterReader() {
2424
return filterReader;
2525
}
2626

27-
@Override
28-
public void updateFilterReader(ItemStack stack) {
29-
this.filterReader.readStack(stack);
30-
}
31-
3227
public SmartFilteringMode getFilteringMode() {
3328
return this.filterReader.getFilteringMode();
3429
}

0 commit comments

Comments
 (0)