From f4ce7072a661d033d77aa3fcb116c6e6f28f71fe Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:03:16 -0400
Subject: [PATCH 1/2] Enable dynamic sounds now that Guava issue is worked
 around

---
 .../embeddedt/modernfix/core/config/ModernFixEarlyConfig.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
index 7cf6deac..8a6e3942 100644
--- a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
+++ b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
@@ -162,7 +162,6 @@ public class ModernFixEarlyConfig {
     private static final ImmutableMap<String, Boolean> DEFAULT_SETTING_OVERRIDES = new DefaultSettingMapBuilder()
             .put("mixin.perf.dynamic_resources", false)
             .putConditionally(() -> !isFabric, "mixin.perf.async_jei", false)
-            .put("mixin.perf.dynamic_sounds", false)
             .put("mixin.perf.reuse_datapacks", false)
             .put("mixin.perf.dynamic_block_codecs", false)
             .put("mixin.feature.direct_stack_trace", false)

From 89dab5998039181fed3f7ba6c4ca0f6ec982cb3b Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Wed, 25 Oct 2023 17:17:52 -0400
Subject: [PATCH 2/2] Revert "Change permanentOverrides to ConcurrentHashMap"

This reverts commit a5b57339652a29a62fffb074122ad035a04681dd.

We require the ability to store null values in the map for now
---
 .../DynamicBakedModelProvider.java                 | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
index 36215779..456ceea7 100644
--- a/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
+++ b/common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
@@ -2,6 +2,7 @@ package org.embeddedt.modernfix.dynamicresources;
 
 import com.google.common.collect.ImmutableSet;
 import com.mojang.math.Transformation;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.block.model.ItemOverrides;
 import net.minecraft.client.renderer.block.model.ItemTransforms;
@@ -21,7 +22,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.BiFunction;
 import java.util.stream.Collectors;
 
@@ -85,7 +85,7 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
     public DynamicBakedModelProvider(ModelBakery bakery, Map<Triple<ResourceLocation, Transformation, Boolean>, BakedModel> cache) {
         this.bakery = bakery;
         this.bakedCache = cache;
-        this.permanentOverrides = new ConcurrentHashMap<>();
+        this.permanentOverrides = Collections.synchronizedMap(new Object2ObjectOpenHashMap<>());
         if(currentInstance == null)
             currentInstance = this;
     }
@@ -109,12 +109,12 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
 
     @Override
     public boolean containsKey(Object o) {
-        return o != null && permanentOverrides.getOrDefault(o, SENTINEL) != null;
+        return permanentOverrides.getOrDefault(o, SENTINEL) != null;
     }
 
     @Override
     public boolean containsValue(Object o) {
-        return o != null && (permanentOverrides.containsValue(o) || bakedCache.containsValue(o));
+        return permanentOverrides.containsValue(o) || bakedCache.containsValue(o);
     }
     
     private static boolean isVanillaTopLevelModel(ResourceLocation location) {
@@ -164,9 +164,6 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
 
     @Override
     public BakedModel put(ResourceLocation resourceLocation, BakedModel bakedModel) {
-        if(resourceLocation == null)
-            return null;
-
         BakedModel m = permanentOverrides.put(resourceLocation, bakedModel);
         if(m != null)
             return m;
@@ -176,9 +173,6 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
 
     @Override
     public BakedModel remove(Object o) {
-        if(o == null)
-            return null;
-
         BakedModel m = permanentOverrides.remove(o);
         if(m != null)
             return m;