registry item value fallback for null

Author: MukjepScarlet

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

@@ -9,14 +9,15 @@
 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 Predicate<V> filter;
+    public final @Nullable 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, Predicate<V> filter, 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) {
         super(name, description, defaultValue, onChanged, onModuleActivated, visible);
 
         this.filter = filter;
@@ -47,15 +48,14 @@ protected final NbtCompound save(NbtCompound tag) {
 
     @Override
     protected final V load(NbtCompound tag) {
-        value = registry.get(Identifier.of(tag.getString("value", "")));
-
-        if (filter != null && !filter.test(value)) {
-            for (V t : registry) {
-                if (filter.test(t)) {
-                    value = t;
-                    break;
-                }
-            }
+        V value = registry.get(Identifier.of(tag.getString("value", "")));
+
+        if (value == null) {
+            resetImpl();
+        } else if (filter != null && !filter.test(value)) {
+            resetImpl();
+        } else {
+            this.value = value;
         }
 
         return get();

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

@@ -12,6 +12,7 @@
 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;
@@ -20,10 +21,10 @@
 import java.util.function.Predicate;
 
 public abstract class AbstractRegistryListSetting<C extends Collection<V>, V> extends Setting<C> {
-    public final Predicate<V> filter;
+    public final @Nullable 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, Predicate<V> filter, 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) {
         super(name, description, defaultValue, onChanged, onModuleActivated, visible);
         this.filter = filter;
         this.registry = registry;