22
33import fuzs .diagonalfences .api .world .level .block .DiagonalBlock ;
44import fuzs .diagonalfences .client .model .MultipartAppender ;
5+ import fuzs .diagonalfences .mixin .client .accessor .ModelBakeryAccessor ;
56import net .minecraft .client .renderer .block .model .multipart .MultiPart ;
67import net .minecraft .client .resources .model .ModelBakery ;
78import net .minecraft .client .resources .model .UnbakedModel ;
89import net .minecraft .resources .ResourceLocation ;
910import net .minecraft .world .level .block .Block ;
1011import net .minecraft .world .level .block .FenceBlock ;
12+ import net .minecraft .world .level .block .IronBarsBlock ;
13+ import org .apache .logging .log4j .util .BiConsumer ;
1114import org .embeddedt .modernfix .ModernFixClient ;
1215import org .embeddedt .modernfix .annotation .RequiresMod ;
1316import org .embeddedt .modernfix .api .entrypoint .ModernFixClientIntegration ;
2124@ RequiresMod ("diagonalfences" )
2225public abstract class MultipartAppenderMixin {
2326 @ Shadow (remap = false )
24- public static void appendDiagonalSelectors (ModelBakery modelBakery , MultiPart multiPart ) {
27+ public static void appendDiagonalSelectors (BiConsumer < ResourceLocation , UnbakedModel > modelBakery , MultiPart multiPart , boolean rotateCenter ) {
2528 throw new AssertionError ();
2629 }
2730
@@ -38,8 +41,8 @@ private static void setupHelper(CallbackInfo ci) {
3841 public UnbakedModel onUnbakedModelLoad (ResourceLocation location , UnbakedModel originalModel , ModelBakery bakery ) {
3942 if (originalModel instanceof MultiPart multipart ) {
4043 Block block = multipart .definition .getOwner ();
41- if (block instanceof FenceBlock && block instanceof DiagonalBlock diagonalBlock && diagonalBlock .hasProperties ()) {
42- appendDiagonalSelectors (bakery , multipart );
44+ if (( block instanceof FenceBlock || block instanceof IronBarsBlock ) && block instanceof DiagonalBlock diagonalBlock && diagonalBlock .hasProperties ()) {
45+ appendDiagonalSelectors ((( ModelBakeryAccessor ) bakery ):: diagonalfences$callCacheAndQueueDependencies , multipart , block instanceof IronBarsBlock );
4346 }
4447 }
4548 return originalModel ;
0 commit comments