set predicate as notnull, defaults to Predicates.alwaysTrue

Author: MukjepScarlet

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

@@ -5,19 +5,19 @@
 
 package meteordevelopment.meteorclient.settings;
 
+import com.google.common.base.Predicates;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
 
-import javax.annotation.Nullable;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 public abstract class AbstractRegistryItemSetting<V> extends Setting<V> {
-    public final @Nullable Predicate<V> filter;
+    public final Predicate<V> filter;
     public final Registry<V> registry;
 
-    protected AbstractRegistryItemSetting(String name, String description, V defaultValue, Consumer<V> onChanged, Consumer<Setting<V>> onModuleActivated, IVisible visible, @Nullable Predicate<V> filter, Registry<V> registry) {
+    protected AbstractRegistryItemSetting(String name, String description, V defaultValue, Consumer<V> onChanged, Consumer<Setting<V>> onModuleActivated, IVisible visible, Predicate<V> filter, Registry<V> registry) {
         super(name, description, defaultValue, onChanged, onModuleActivated, visible);
 
         this.filter = filter;
@@ -31,7 +31,7 @@ protected final V parseImpl(String str) {
 
     @Override
     protected final boolean isValueValid(V value) {
-        return filter == null || filter.test(value);
+        return filter.test(value);
     }
 
     @Override
@@ -52,7 +52,7 @@ protected final V load(NbtCompound tag) {
 
         if (value == null) {
             resetImpl();
-        } else if (filter != null && !filter.test(value)) {
+        } else if (!filter.test(value)) {
             resetImpl();
         } else {
             this.value = value;
@@ -63,7 +63,7 @@ protected final V load(NbtCompound tag) {
 
     @SuppressWarnings("unchecked")
     protected static abstract class AbstractBuilder<B extends AbstractBuilder<B, V, S>, V, S extends AbstractRegistryItemSetting<V>> extends SettingBuilder<B, V, S> {
-        protected Predicate<V> filter;
+        protected Predicate<V> filter = Predicates.alwaysTrue();
 
         protected AbstractBuilder() {
             super(null);

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

@@ -12,7 +12,6 @@
 import net.minecraft.registry.Registry;
 import net.minecraft.util.Identifier;
 import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,10 +20,10 @@
 import java.util.function.Predicate;
 
 public abstract class AbstractRegistryListSetting<C extends Collection<V>, V> extends Setting<C> {
-    public final @Nullable Predicate<V> filter;
+    public final Predicate<V> filter;
     public final Registry<V> registry;
 
-    protected AbstractRegistryListSetting(String name, String description, C defaultValue, Consumer<C> onChanged, Consumer<Setting<C>> onModuleActivated, IVisible visible, @Nullable Predicate<V> filter, Registry<V> registry) {
+    protected AbstractRegistryListSetting(String name, String description, C defaultValue, Consumer<C> onChanged, Consumer<Setting<C>> onModuleActivated, IVisible visible, Predicate<V> filter, Registry<V> registry) {
         super(name, description, defaultValue, onChanged, onModuleActivated, visible);
         this.filter = filter;
         this.registry = registry;
@@ -45,7 +44,7 @@ protected final C parseImpl(String str) {
         try {
             for (String string : values) {
                 V value = parseId(this.registry, string);
-                if (value != null && (filter == null || filter.test(value))) items.add(value);
+                if (value != null && filter.test(value)) items.add(value);
             }
         } catch (Exception ignored) {}
 
@@ -82,7 +81,7 @@ protected C load(NbtCompound tag) {
             V value = this.registry.get(Identifier.of(tagI.asString().orElse("")));
             if (value == null) continue;
 
-            if (filter == null || filter.test(value)) get().add(value);
+            if (filter.test(value)) get().add(value);
         }
 
         return get();

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

@@ -5,6 +5,7 @@
 
 package meteordevelopment.meteorclient.settings;
 
+import com.google.common.base.Predicates;
 import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
 import net.minecraft.block.Block;
 import net.minecraft.registry.Registries;
@@ -26,7 +27,7 @@ protected Set<Block> transferCollection(Collection<Block> from) {
     }
 
     public static class Builder extends SettingBuilder<Builder, Set<Block>, BlockListSetting> {
-        private Predicate<Block> filter;
+        private Predicate<Block> filter = Predicates.alwaysTrue();
 
         public Builder() {
             super(Collections.emptySet());

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

@@ -5,6 +5,7 @@
 
 package meteordevelopment.meteorclient.settings;
 
+import com.google.common.base.Predicates;
 import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
 import net.minecraft.item.Item;
 import net.minecraft.nbt.NbtCompound;
@@ -57,7 +58,7 @@ public Set<Item> load(NbtCompound tag) {
     }
 
     public static class Builder extends SettingBuilder<Builder, Set<Item>, ItemListSetting> {
-        private Predicate<Item> filter;
+        private Predicate<Item> filter = Predicates.alwaysTrue();
         private boolean bypassFilterWhenSavingAndLoading;
 
         public Builder() {