From 4af1e27a894fe1aca353d248039ab5580aa2866a Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Fri, 22 Mar 2024 14:04:45 -0400 Subject: [PATCH] Work around NPEs from early queries to ModelManager --- .../dynamic_resources/ModelManagerMixin.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java new file mode 100644 index 00000000..78ae3494 --- /dev/null +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelManagerMixin.java @@ -0,0 +1,26 @@ +package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources; + +import net.minecraft.client.resources.model.BakedModel; +import net.minecraft.client.resources.model.ModelManager; +import net.minecraft.resources.ResourceLocation; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.HashMap; +import java.util.Map; + +@Mixin(ModelManager.class) +public class ModelManagerMixin { + @Shadow private Map bakedRegistry; + + @Inject(method = "", at = @At("RETURN")) + private void injectDummyBakedRegistry(CallbackInfo ci) { + if(this.bakedRegistry == null) { + // Create a dummy baked registry. This prevents NPEs when mods query block models too early + this.bakedRegistry = new HashMap<>(); + } + } +}