Merge 1.19.4 into 1.20

embeddedt · embeddedt · commit 5ed2faebc442 · 2023-07-20T10:43:40.000-04:00
diff --git a/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakerImplMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakerImplMixin.java
@@ -102,7 +102,7 @@ private void obtainModel(ResourceLocation arg, CallbackInfoReturnable<UnbakedMod
         if(!wasMissingModel) {
             for(ModernFixClientIntegration integration : ModernFixClient.CLIENT_INTEGRATIONS) {
                 try {
-                    toReplace = integration.onUnbakedModelPreBake(arg, toReplace, (ModelBakery)(Object)this);
+                    toReplace = integration.onUnbakedModelPreBake(arg, toReplace, this.field_40571);
                 } catch(RuntimeException e) {
                     ModernFix.LOGGER.error("Exception firing model pre-bake event for {}", arg, e);
                 }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private void obtainModel(ResourceLocation arg, CallbackInfoReturnable<UnbakedMod`
`102`	`102`	`if(!wasMissingModel) {`
`103`	`103`	`for(ModernFixClientIntegration integration : ModernFixClient.CLIENT_INTEGRATIONS) {`
`104`	`104`	`try {`
`105`		`- toReplace = integration.onUnbakedModelPreBake(arg, toReplace, (ModelBakery)(Object)this);`
	`105`	`+ toReplace = integration.onUnbakedModelPreBake(arg, toReplace, this.field_40571);`
`106`	`106`	`} catch(RuntimeException e) {`
`107`	`107`	`ModernFix.LOGGER.error("Exception firing model pre-bake event for {}", arg, e);`
`108`	`108`	`}`