@@ -59,7 +59,6 @@ private void createBakedMissingModelIfNeeded(IExtendedModelBakery extendedBakery
5959 }
6060 }
6161
62- private boolean wasMissingModel = false ;
6362 private ResourceLocation capturedLocation ;
6463 private UnbakedModel capturedModel ;
6564 private ModelState capturedState ;
@@ -99,7 +98,7 @@ private void obtainModel(ResourceLocation arg, CallbackInfoReturnable<UnbakedMod
9998 } else
10099 cir .setReturnValue (this .field_40571 .getModel (arg ));
101100 UnbakedModel toReplace = cir .getReturnValue ();
102- if (! wasMissingModel ) {
101+ if (true ) {
103102 for (ModernFixClientIntegration integration : ModernFixClient .CLIENT_INTEGRATIONS ) {
104103 try {
105104 toReplace = integration .onUnbakedModelPreBake (arg , toReplace , this .field_40571 );
@@ -114,27 +113,11 @@ private void obtainModel(ResourceLocation arg, CallbackInfoReturnable<UnbakedMod
114113 if (cir .getReturnValue () == extendedBakery .mfix$getUnbakedMissingModel ()) {
115114 if (arg != ModelBakery .MISSING_MODEL_LOCATION && debugDynamicModelLoading )
116115 ModernFix .LOGGER .warn ("Model {} not present" , arg );
117- wasMissingModel = true ;
118- } else
119- wasMissingModel = false ; /* sometimes this runs more than once e.g. for recursive model baking */
116+ }
120117 }
121118
122119 @ ModifyVariable (method = "bake" , at = @ At (value = "INVOKE_ASSIGN" , target = "Lnet/minecraft/client/resources/model/UnbakedModel;bake(Lnet/minecraft/client/resources/model/ModelBaker;Ljava/util/function/Function;Lnet/minecraft/client/resources/model/ModelState;Lnet/minecraft/resources/ResourceLocation;)Lnet/minecraft/client/resources/model/BakedModel;" ))
123120 private BakedModel unifyMissingBakedModel (BakedModel model ) {
124- if (wasMissingModel ) {
125- // use a shared baked missing model
126- IExtendedModelBakery extendedBakery = (IExtendedModelBakery )this .field_40571 ;
127- BakedModel missing ;
128- synchronized (this .field_40571 ) {
129- if (extendedBakery .getBakedMissingModel () == null ) {
130- extendedBakery .setBakedMissingModel (model );
131- missing = model ;
132- } else {
133- missing = extendedBakery .getBakedMissingModel ();
134- }
135- }
136- return missing ;
137- }
138121 for (ModernFixClientIntegration integration : ModernFixClient .CLIENT_INTEGRATIONS ) {
139122 model = integration .onBakedModelLoad (capturedLocation , capturedModel , model , capturedState , this .field_40571 );
140123 }
0 commit comments