Merge 1.16 into 1.18

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/util/ForwardingInclDefaultsMap.java

@@ -0,0 +1,68 @@
+package org.embeddedt.modernfix.util;
+
+import com.google.common.collect.ForwardingMap;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.BiConsumer;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+public abstract class ForwardingInclDefaultsMap<K, V> extends ForwardingMap<K, V> {
+    @Override
+    public V getOrDefault(Object key, V defaultValue) {
+        return delegate().getOrDefault(key, defaultValue);
+    }
+
+    @Override
+    public void forEach(BiConsumer<? super K, ? super V> action) {
+        delegate().forEach(action);
+    }
+
+    @Override
+    public void replaceAll(BiFunction<? super K, ? super V, ? extends V> function) {
+        delegate().replaceAll(function);
+    }
+
+    @Nullable
+    @Override
+    public V putIfAbsent(K key, V value) {
+        return delegate().putIfAbsent(key, value);
+    }
+
+    @Override
+    public boolean remove(Object key, Object value) {
+        return delegate().remove(key, value);
+    }
+
+    @Override
+    public boolean replace(K key, V oldValue, V newValue) {
+        return delegate().replace(key, oldValue, newValue);
+    }
+
+    @Nullable
+    @Override
+    public V replace(K key, V value) {
+        return delegate().replace(key, value);
+    }
+
+    @Override
+    public V computeIfAbsent(K key, @NotNull Function<? super K, ? extends V> mappingFunction) {
+        return delegate().computeIfAbsent(key, mappingFunction);
+    }
+
+    @Override
+    public V computeIfPresent(K key, @NotNull BiFunction<? super K, ? super V, ? extends V> remappingFunction) {
+        return delegate().computeIfPresent(key, remappingFunction);
+    }
+
+    @Override
+    public V compute(K key, @NotNull BiFunction<? super K, ? super V, ? extends V> remappingFunction) {
+        return delegate().compute(key, remappingFunction);
+    }
+
+    @Override
+    public V merge(K key, @NotNull V value, @NotNull BiFunction<? super V, ? super V, ? extends V> remappingFunction) {
+        return delegate().merge(key, value, remappingFunction);
+    }
+}

forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java

@@ -17,6 +17,7 @@
 import net.minecraftforge.registries.ForgeRegistries;
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.dynamicresources.ModelLocationCache;
+import org.embeddedt.modernfix.util.ForwardingInclDefaultsMap;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -69,7 +70,7 @@ public ModelBakeEventHelper(Map<ResourceLocation, BakedModel> modelRegistry) {
      * @return a wrapper around the model registry
      */
     private Map<ResourceLocation, BakedModel> createWarningRegistry(String modId) {
-        return new ForwardingMap<ResourceLocation, BakedModel>() {
+        return new ForwardingInclDefaultsMap<ResourceLocation, BakedModel>() {
             @Override
             protected Map<ResourceLocation, BakedModel> delegate() {
                 return modelRegistry;