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

Avoid lazily baking multiparts and multivariants

Browse Source 
Some mods use instanceof checks and so the correct class needs to
be present.

Fixes #24
This commit is contained in:
embeddedt 2023-02-22 12:34:47 -05:00
parent c258bba5ec
commit 3baace55a8
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/embeddedt/modernfix/mixin/perf/faster_baking/ModelBakeryMixin.java
View File

@ -3,6 +3,8 @@ package org.embeddedt.modernfix.mixin.perf.faster_baking;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.mojang.datafixers.util.Pair; import com.mojang.datafixers.util.Pair;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.MultiVariant;
import net.minecraft.client.renderer.block.model.multipart.MultiPart;
import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.client.renderer.texture.AtlasSet; import net.minecraft.client.renderer.texture.AtlasSet;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@ -107,22 +109,32 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
this.bakeIfPossible(location); this.bakeIfPossible(location);
} }
}); });
List<ResourceLocation> multiparts = new ArrayList<>();
/* Then store them as top-level models if needed, and set up the lazy models */ /* Then store them as top-level models if needed, and set up the lazy models */
this.topLevelModels.forEach((location, value) -> { this.topLevelModels.forEach((location, value) -> {
if (incompatibleLazyBakedModels.contains(location.getNamespace()) || requiresBake(value)) { if (requiresBake(value) || incompatibleLazyBakedModels.contains(location.getNamespace())) {
BakedModel model = this.bakeIfPossible(location); BakedModel model = this.bakeIfPossible(location);
if (model != null) if (model != null)
this.bakedTopLevelModels.put(location, model); this.bakedTopLevelModels.put(location, model);
} else { } else {
this.bakedTopLevelModels.put(location, new LazyBakedModel(() -> { if(value instanceof MultiPart || value instanceof MultiVariant) {
synchronized (this.bakedCache) { multiparts.add(location);
BakedModel ibakedmodel = this.bakeIfPossible(location); } else {
this.bakedTopLevelModels.put(location, new LazyBakedModel(() -> {
synchronized (this.bakedCache) {
BakedModel ibakedmodel = this.bakeIfPossible(location);
return ibakedmodel != null ? ibakedmodel : missingModel; return ibakedmodel != null ? ibakedmodel : missingModel;
} }
})); }));
}
} }
}); });
multiparts.forEach(location -> {
BakedModel model = this.bakeIfPossible(location);
if (model != null)
this.bakedTopLevelModels.put(location, model);
});
} }
/** /**