Fix getOrDefault semantics on dynamic model maps

Fixes embeddedt#672

Author: embeddedt

src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/MixinModelManager.java

@@ -25,6 +25,7 @@
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionStage;
 import java.util.function.Consumer;
@@ -95,6 +96,7 @@ private static Object2IntMap<BlockState> buildModelGroups(BlockColors blockColor
     @Overwrite
     private static Map<BlockState, BlockStateModel> createBlockStateToModelDispatch(Map<BlockState, BlockStateModel> blockStateModels, BlockStateModel missingModel) {
         BlockStateModelMap.resetCache();
+        Objects.requireNonNull(missingModel);
         return new BlockStateModelMap(blockStateModels, missingModel);
     }
 }

src/main/java/org/embeddedt/modernfix/dynresources/BlockStateModelMap.java

@@ -9,6 +9,7 @@
 
 import java.util.Collection;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -18,6 +19,10 @@
 public record BlockStateModelMap(Map<BlockState, BlockStateModel> modelMap,
                                  BlockStateModel fallbackModel) implements Map<BlockState, BlockStateModel> {
 
+    public BlockStateModelMap {
+        Objects.requireNonNull(fallbackModel);
+    }
+
     @Override
     public int size() {
         return Block.BLOCK_STATE_REGISTRY.size();
@@ -55,6 +60,12 @@ public BlockStateModel get(Object o) {
         }
     }
 
+    @Override
+    public BlockStateModel getOrDefault(Object key, BlockStateModel defaultValue) {
+        var value = get(key);
+        return value != fallbackModel ? value : defaultValue;
+    }
+
     @Override
     public @Nullable BlockStateModel put(BlockState blockState, BlockStateModel blockStateModel) {
         var oldModel = modelMap.put(blockState, blockStateModel);

src/main/java/org/embeddedt/modernfix/dynresources/DynamicRegistryMap.java

@@ -9,6 +9,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
@@ -73,6 +74,19 @@ public V get(Object o) {
         }
     }
 
+    @Override
+    public V getOrDefault(Object o, V defaultValue) {
+        Object value = overrides.get(o);
+        if (value == NULL_OVERRIDE) {
+            return null;
+        } else if (value != null) {
+            return (V) value;
+        } else {
+            var fallback = fallbackGetter.apply((K)o);
+            return fallback != null ? fallback : defaultValue;
+        }
+    }
+
     @Override
     public @Nullable V put(K k, V v) {
         if (v == null) {