diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/diagonalfences/MultipartAppenderMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/diagonalfences/MultipartAppenderMixin.java index fcbc591a..1e77e8b2 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/diagonalfences/MultipartAppenderMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/diagonalfences/MultipartAppenderMixin.java @@ -2,12 +2,15 @@ package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources.diagonalfenc import fuzs.diagonalfences.api.world.level.block.DiagonalBlock; import fuzs.diagonalfences.client.model.MultipartAppender; +import fuzs.diagonalfences.mixin.client.accessor.ModelBakeryAccessor; import net.minecraft.client.renderer.block.model.multipart.MultiPart; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.UnbakedModel; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.FenceBlock; +import net.minecraft.world.level.block.IronBarsBlock; +import org.apache.logging.log4j.util.BiConsumer; import org.embeddedt.modernfix.ModernFixClient; import org.embeddedt.modernfix.annotation.RequiresMod; import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration; @@ -21,7 +24,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @RequiresMod("diagonalfences") public abstract class MultipartAppenderMixin { @Shadow(remap = false) - public static void appendDiagonalSelectors(ModelBakery modelBakery, MultiPart multiPart) { + public static void appendDiagonalSelectors(BiConsumer modelBakery, MultiPart multiPart, boolean rotateCenter) { throw new AssertionError(); } @@ -38,8 +41,8 @@ public abstract class MultipartAppenderMixin { public UnbakedModel onUnbakedModelLoad(ResourceLocation location, UnbakedModel originalModel, ModelBakery bakery) { if(originalModel instanceof MultiPart multipart) { Block block = multipart.definition.getOwner(); - if(block instanceof FenceBlock && block instanceof DiagonalBlock diagonalBlock && diagonalBlock.hasProperties()) { - appendDiagonalSelectors(bakery, multipart); + if((block instanceof FenceBlock || block instanceof IronBarsBlock) && block instanceof DiagonalBlock diagonalBlock && diagonalBlock.hasProperties()) { + appendDiagonalSelectors(((ModelBakeryAccessor)bakery)::diagonalfences$callCacheAndQueueDependencies, multipart, block instanceof IronBarsBlock); } } return originalModel; diff --git a/gradle.properties b/gradle.properties index 270f1d87..3ade520b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ fabric_api_version=0.76.0+1.19.2 modmenu_version=4.1.2 appeng_version=12.9.3 -diagonal_fences_version=4545943 +diagonal_fences_version=4658719 spark_version=4505310