From 42298947cc0fe09555591bfdde7881e8420a16d7 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Wed, 19 Jul 2023 22:15:16 -0400 Subject: [PATCH] Backport model loading API change to 1.19.4 --- .../fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java index a17a9fa1..d7fa2bf3 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java +++ b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java @@ -76,9 +76,13 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery { private boolean ignoreModelLoad; + // disable fabric recursion + @SuppressWarnings("unused") + private boolean fabric_enableGetOrLoadModelGuard; @Redirect(method = "", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraft/client/resources/model/ModelBakery;blockColors:Lnet/minecraft/client/color/block/BlockColors;")) private void replaceTopLevelBakedModels(ModelBakery bakery, BlockColors val) { + fabric_enableGetOrLoadModelGuard = false; this.blockColors = val; this.ignoreModelLoad = true; this.loadedBakedModels = CacheBuilder.newBuilder()