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

Merge 1.20.2 into 1.20.3

Browse Source
This commit is contained in:
embeddedt 2023-10-29 11:37:50 -04:00
commit 87b984bfe9
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 54 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.Object2ObjectMaps;
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.ItemOverrides;
@ -40,7 +41,8 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
public static DynamicBakedModelProvider currentInstance = null;
private final ModelBakery bakery;
private final Map<ModelBakery.BakedCacheKey, BakedModel> bakedCache;
private final Map<ResourceLocation, BakedModel> permanentOverrides;
private volatile Map<ResourceLocation, BakedModel> permanentOverridesView = null;
private final Map<ResourceLocation, BakedModel> permanentOverridesMutable;
private BakedModel missingModel;
private static final BakedModel SENTINEL = new BakedModel() {
@Override
@ -87,7 +89,7 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
public DynamicBakedModelProvider(ModelBakery bakery, Map<ModelBakery.BakedCacheKey, BakedModel> cache) {
this.bakery = bakery;
this.bakedCache = cache;
this.permanentOverrides = Collections.synchronizedMap(new Object2ObjectOpenHashMap<>());
this.permanentOverridesMutable = new Object2ObjectOpenHashMap<>();
if(currentInstance == null)
currentInstance = this;
}
@ -110,14 +112,27 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
return bakedCache.isEmpty();
}
private Map<ResourceLocation, BakedModel> getPermanentOverrides() {
Map<ResourceLocation, BakedModel> map = permanentOverridesView;
if(map == null) {
synchronized (this) {
map = permanentOverridesView;
if(map == null) {
permanentOverridesView = map = Object2ObjectMaps.unmodifiable(new Object2ObjectOpenHashMap<>(permanentOverridesMutable));
}
}
}
return map;
}
@Override
public boolean containsKey(Object o) {
return permanentOverrides.getOrDefault(o, SENTINEL) != null;
return getPermanentOverrides().getOrDefault(o, SENTINEL) != null;
}
@Override
public boolean containsValue(Object o) {
return permanentOverrides.containsValue(o) || bakedCache.containsValue(o);
return getPermanentOverrides().containsValue(o) || bakedCache.containsValue(o);
}
private static boolean isVanillaTopLevelModel(ResourceLocation location) {
@ -143,7 +158,7 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
@Override
public BakedModel get(Object o) {
BakedModel model = permanentOverrides.getOrDefault(o, SENTINEL);
BakedModel model = getPermanentOverrides().getOrDefault(o, SENTINEL);
if(model != SENTINEL)
return model;
else {
@ -159,7 +174,7 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
if(model == missingModel) {
// to correctly emulate the original map, we return null for missing models, unless they are top-level
model = isVanillaTopLevelModel((ResourceLocation)o) ? model : null;
permanentOverrides.put((ResourceLocation) o, model);
this.put((ResourceLocation) o, model);
}
return model;
}
@ -167,7 +182,11 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
@Override
public BakedModel put(ResourceLocation resourceLocation, BakedModel bakedModel) {
BakedModel m = permanentOverrides.put(resourceLocation, bakedModel);
BakedModel m;
synchronized (this) {
m = permanentOverridesMutable.put(resourceLocation, bakedModel);
permanentOverridesView = null;
}
if(m != null)
return m;
else
@ -176,7 +195,11 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
@Override
public BakedModel remove(Object o) {
BakedModel m = permanentOverrides.remove(o);
BakedModel m;
synchronized (this) {
m = permanentOverridesMutable.remove(o);
permanentOverridesView = null;
}
if(m != null)
return m;
return bakedCache.remove(vanillaKey(o));
@ -184,7 +207,10 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
@Override
public void putAll(@NotNull Map<? extends ResourceLocation, ? extends BakedModel> map) {
permanentOverrides.putAll(map);
synchronized (this) {
permanentOverridesMutable.putAll(map);
permanentOverridesView = null;
}
}
@Override
@ -213,23 +239,27 @@ public class DynamicBakedModelProvider implements Map<ResourceLocation, BakedMod
@Nullable
@Override
public BakedModel replace(ResourceLocation key, BakedModel value) {
BakedModel existingOverride = permanentOverrides.get(key);
// as long as no valid override was put in (null can mean unable to load model, so we treat as invalid), replace
// the model
if(existingOverride == null)
return this.put(key, value);
else
return existingOverride;
synchronized (this) {
BakedModel existingOverride = permanentOverridesMutable.get(key);
// as long as no valid override was put in (null can mean unable to load model, so we treat as invalid), replace
// the model
if(existingOverride == null)
return this.put(key, value);
else
return existingOverride;
}
}
@Override
public void replaceAll(BiFunction<? super ResourceLocation, ? super BakedModel, ? extends BakedModel> function) {
Set<ResourceLocation> overridenLocations = permanentOverrides.keySet();
permanentOverrides.replaceAll(function);
synchronized (this) {
permanentOverridesMutable.replaceAll(function);
permanentOverridesView = null;
}
boolean uvLock = BlockModelRotation.X0_Y0.isUvLocked();
Transformation rotation = BlockModelRotation.X0_Y0.getRotation();
bakedCache.replaceAll((loc, oldModel) -> {
if(loc.transformation() != rotation || loc.isUvLocked() != uvLock || overridenLocations.contains(loc.id()))
if(loc.transformation() != rotation || loc.isUvLocked() != uvLock || getPermanentOverrides().containsKey(loc.id()))
return oldModel;
else
return function.apply(loc.id(), oldModel);

7
forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java
View File

@ -183,8 +183,11 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
}
@Redirect(method = "bakeModels", at = @At(value = "INVOKE", target = "Ljava/util/Map;keySet()Ljava/util/Set;"))
private Set skipBakingModels(Map map) {
return Collections.emptySet();
private Set skipBakingModels(Map instance) {
Set<ResourceLocation> modelSet = new HashSet<>(instance.keySet());
if(modelSet.size() > 0)
ModernFix.LOGGER.info("Early baking {} models", modelSet.size());
return modelSet;
}
/**