Don't waste time parsing UVs when performing initial model load
This commit is contained in:
parent
33d3f0e537
commit
36664cb23a
|
|
@ -0,0 +1,8 @@
|
||||||
|
package org.embeddedt.modernfix.dynamicresources;
|
||||||
|
|
||||||
|
import net.minecraft.client.renderer.block.model.BlockFaceUV;
|
||||||
|
|
||||||
|
public class UVController {
|
||||||
|
public static final ThreadLocal<Boolean> useDummyUv = ThreadLocal.withInitial(() -> Boolean.FALSE);
|
||||||
|
public static final BlockFaceUV dummyUv = new BlockFaceUV(new float[4], 0);
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,21 @@
|
||||||
|
package org.embeddedt.modernfix.mixin.perf.dynamic_resources;
|
||||||
|
|
||||||
|
import com.google.gson.JsonDeserializationContext;
|
||||||
|
import com.google.gson.JsonElement;
|
||||||
|
import net.minecraft.client.renderer.block.model.BlockElementFace;
|
||||||
|
import org.embeddedt.modernfix.dynamicresources.UVController;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
|
|
||||||
|
import java.lang.reflect.Type;
|
||||||
|
|
||||||
|
@Mixin(BlockElementFace.Deserializer.class)
|
||||||
|
public class BlockElementFaceDeserializerMixin {
|
||||||
|
|
||||||
|
@Redirect(method = "deserialize(Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/client/renderer/block/model/BlockElementFace;",
|
||||||
|
at = @At(value = "INVOKE", target = "Lcom/google/gson/JsonDeserializationContext;deserialize(Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;)Ljava/lang/Object;", ordinal = 0))
|
||||||
|
private Object skipUvsForInitialLoad(JsonDeserializationContext context, JsonElement element, Type type) {
|
||||||
|
return UVController.useDummyUv.get() ? UVController.dummyUv : context.deserialize(element, type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -40,10 +40,7 @@ import org.apache.commons.lang3.tuple.Triple;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.embeddedt.modernfix.ModernFix;
|
import org.embeddedt.modernfix.ModernFix;
|
||||||
import org.embeddedt.modernfix.duck.IExtendedModelBakery;
|
import org.embeddedt.modernfix.duck.IExtendedModelBakery;
|
||||||
import org.embeddedt.modernfix.dynamicresources.DynamicBakedModelProvider;
|
import org.embeddedt.modernfix.dynamicresources.*;
|
||||||
import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent;
|
|
||||||
import org.embeddedt.modernfix.dynamicresources.ModelLocationCache;
|
|
||||||
import org.embeddedt.modernfix.dynamicresources.ResourcePackHandler;
|
|
||||||
import org.spongepowered.asm.mixin.*;
|
import org.spongepowered.asm.mixin.*;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Inject;
|
import org.spongepowered.asm.mixin.injection.Inject;
|
||||||
|
|
@ -286,10 +283,12 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
|
||||||
}
|
}
|
||||||
modelFiles.clear();
|
modelFiles.clear();
|
||||||
CompletableFuture.allOf(modelBytes.toArray(new CompletableFuture[0])).join();
|
CompletableFuture.allOf(modelBytes.toArray(new CompletableFuture[0])).join();
|
||||||
|
UVController.useDummyUv.set(Boolean.TRUE);
|
||||||
for(CompletableFuture<Pair<ResourceLocation, JsonElement>> future : modelBytes) {
|
for(CompletableFuture<Pair<ResourceLocation, JsonElement>> future : modelBytes) {
|
||||||
Pair<ResourceLocation, JsonElement> pair = future.join();
|
Pair<ResourceLocation, JsonElement> pair = future.join();
|
||||||
try {
|
try {
|
||||||
if(pair.getSecond() != null) {
|
if(pair.getSecond() != null) {
|
||||||
|
|
||||||
BlockModel model = ModelLoaderRegistry.ExpandedBlockModelDeserializer.INSTANCE.fromJson(pair.getSecond(), BlockModel.class);
|
BlockModel model = ModelLoaderRegistry.ExpandedBlockModelDeserializer.INSTANCE.fromJson(pair.getSecond(), BlockModel.class);
|
||||||
model.name = pair.getFirst().toString();
|
model.name = pair.getFirst().toString();
|
||||||
modelFiles.addAll(model.getDependencies());
|
modelFiles.addAll(model.getDependencies());
|
||||||
|
|
@ -301,6 +300,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
|
||||||
}
|
}
|
||||||
basicModels.put(pair.getFirst(), (BlockModel)missingModel);
|
basicModels.put(pair.getFirst(), (BlockModel)missingModel);
|
||||||
}
|
}
|
||||||
|
UVController.useDummyUv.set(Boolean.FALSE);
|
||||||
}
|
}
|
||||||
modelFiles = null;
|
modelFiles = null;
|
||||||
Function<ResourceLocation, UnbakedModel> modelGetter = loc -> {
|
Function<ResourceLocation, UnbakedModel> modelGetter = loc -> {
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,7 @@
|
||||||
"bugfix.concurrency.RenderTypeMixin",
|
"bugfix.concurrency.RenderTypeMixin",
|
||||||
"bugfix.concurrency.MinecraftMixin",
|
"bugfix.concurrency.MinecraftMixin",
|
||||||
"bugfix.concurrency.StaticTagHelperMixin",
|
"bugfix.concurrency.StaticTagHelperMixin",
|
||||||
|
"perf.dynamic_resources.BlockElementFaceDeserializerMixin",
|
||||||
"perf.dynamic_resources.BlockModelShaperMixin",
|
"perf.dynamic_resources.BlockModelShaperMixin",
|
||||||
"perf.dynamic_resources.ItemModelShaperMixin",
|
"perf.dynamic_resources.ItemModelShaperMixin",
|
||||||
"perf.dynamic_resources.ModelBakeryMixin",
|
"perf.dynamic_resources.ModelBakeryMixin",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user