R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change permanentOverrides to ConcurrentHashMap

Browse Source 
Should help address thread contention noted while profiling
This commit is contained in:
embeddedt 2023-10-14 13:24:26 -04:00
parent b567658318
commit a5b5733965
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicBakedModelProvider.java
View File

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