Skip to content

Commit 45d00b0

Browse files
committed
set predicate as notnull, defaults to Predicates.alwaysTrue
1 parent 4fc5354 commit 45d00b0

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

src/main/java/meteordevelopment/meteorclient/settings/AbstractRegistryItemSetting.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55

66
package meteordevelopment.meteorclient.settings;
77

8+
import com.google.common.base.Predicates;
89
import net.minecraft.nbt.NbtCompound;
910
import net.minecraft.registry.Registry;
1011
import net.minecraft.util.Identifier;
1112

12-
import javax.annotation.Nullable;
1313
import java.util.function.Consumer;
1414
import java.util.function.Predicate;
1515

1616
public abstract class AbstractRegistryItemSetting<V> extends Setting<V> {
17-
public final @Nullable Predicate<V> filter;
17+
public final Predicate<V> filter;
1818
public final Registry<V> registry;
1919

20-
protected AbstractRegistryItemSetting(String name, String description, V defaultValue, Consumer<V> onChanged, Consumer<Setting<V>> onModuleActivated, IVisible visible, @Nullable Predicate<V> filter, Registry<V> registry) {
20+
protected AbstractRegistryItemSetting(String name, String description, V defaultValue, Consumer<V> onChanged, Consumer<Setting<V>> onModuleActivated, IVisible visible, Predicate<V> filter, Registry<V> registry) {
2121
super(name, description, defaultValue, onChanged, onModuleActivated, visible);
2222

2323
this.filter = filter;
@@ -31,7 +31,7 @@ protected final V parseImpl(String str) {
3131

3232
@Override
3333
protected final boolean isValueValid(V value) {
34-
return filter == null || filter.test(value);
34+
return filter.test(value);
3535
}
3636

3737
@Override
@@ -52,7 +52,7 @@ protected final V load(NbtCompound tag) {
5252

5353
if (value == null) {
5454
resetImpl();
55-
} else if (filter != null && !filter.test(value)) {
55+
} else if (!filter.test(value)) {
5656
resetImpl();
5757
} else {
5858
this.value = value;
@@ -63,7 +63,7 @@ protected final V load(NbtCompound tag) {
6363

6464
@SuppressWarnings("unchecked")
6565
protected static abstract class AbstractBuilder<B extends AbstractBuilder<B, V, S>, V, S extends AbstractRegistryItemSetting<V>> extends SettingBuilder<B, V, S> {
66-
protected Predicate<V> filter;
66+
protected Predicate<V> filter = Predicates.alwaysTrue();
6767

6868
protected AbstractBuilder() {
6969
super(null);

src/main/java/meteordevelopment/meteorclient/settings/AbstractRegistryListSetting.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import net.minecraft.registry.Registry;
1313
import net.minecraft.util.Identifier;
1414
import org.apache.commons.lang3.StringUtils;
15-
import org.jetbrains.annotations.Nullable;
1615

1716
import java.util.ArrayList;
1817
import java.util.Collection;
@@ -21,10 +20,10 @@
2120
import java.util.function.Predicate;
2221

2322
public abstract class AbstractRegistryListSetting<C extends Collection<V>, V> extends Setting<C> {
24-
public final @Nullable Predicate<V> filter;
23+
public final Predicate<V> filter;
2524
public final Registry<V> registry;
2625

27-
protected AbstractRegistryListSetting(String name, String description, C defaultValue, Consumer<C> onChanged, Consumer<Setting<C>> onModuleActivated, IVisible visible, @Nullable Predicate<V> filter, Registry<V> registry) {
26+
protected AbstractRegistryListSetting(String name, String description, C defaultValue, Consumer<C> onChanged, Consumer<Setting<C>> onModuleActivated, IVisible visible, Predicate<V> filter, Registry<V> registry) {
2827
super(name, description, defaultValue, onChanged, onModuleActivated, visible);
2928
this.filter = filter;
3029
this.registry = registry;
@@ -45,7 +44,7 @@ protected final C parseImpl(String str) {
4544
try {
4645
for (String string : values) {
4746
V value = parseId(this.registry, string);
48-
if (value != null && (filter == null || filter.test(value))) items.add(value);
47+
if (value != null && filter.test(value)) items.add(value);
4948
}
5049
} catch (Exception ignored) {}
5150

@@ -82,7 +81,7 @@ protected C load(NbtCompound tag) {
8281
V value = this.registry.get(Identifier.of(tagI.asString().orElse("")));
8382
if (value == null) continue;
8483

85-
if (filter == null || filter.test(value)) get().add(value);
84+
if (filter.test(value)) get().add(value);
8685
}
8786

8887
return get();

src/main/java/meteordevelopment/meteorclient/settings/BlockListSetting.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package meteordevelopment.meteorclient.settings;
77

8+
import com.google.common.base.Predicates;
89
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
910
import net.minecraft.block.Block;
1011
import net.minecraft.registry.Registries;
@@ -26,7 +27,7 @@ protected Set<Block> transferCollection(Collection<Block> from) {
2627
}
2728

2829
public static class Builder extends SettingBuilder<Builder, Set<Block>, BlockListSetting> {
29-
private Predicate<Block> filter;
30+
private Predicate<Block> filter = Predicates.alwaysTrue();
3031

3132
public Builder() {
3233
super(Collections.emptySet());

src/main/java/meteordevelopment/meteorclient/settings/ItemListSetting.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package meteordevelopment.meteorclient.settings;
77

8+
import com.google.common.base.Predicates;
89
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
910
import net.minecraft.item.Item;
1011
import net.minecraft.nbt.NbtCompound;
@@ -57,7 +58,7 @@ public Set<Item> load(NbtCompound tag) {
5758
}
5859

5960
public static class Builder extends SettingBuilder<Builder, Set<Item>, ItemListSetting> {
60-
private Predicate<Item> filter;
61+
private Predicate<Item> filter = Predicates.alwaysTrue();
6162
private boolean bypassFilterWhenSavingAndLoading;
6263

6364
public Builder() {

0 commit comments

Comments
 (0)