Skip to content

Commit 58f79e2

Browse files
committed
Update Diagonal Fences mixin on 1.19
1 parent 6a8d63a commit 58f79e2

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/diagonalfences/MultipartAppenderMixin.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
import fuzs.diagonalfences.api.world.level.block.DiagonalBlock;
44
import fuzs.diagonalfences.client.model.MultipartAppender;
5+
import fuzs.diagonalfences.mixin.client.accessor.ModelBakeryAccessor;
56
import net.minecraft.client.renderer.block.model.multipart.MultiPart;
67
import net.minecraft.client.resources.model.ModelBakery;
78
import net.minecraft.client.resources.model.UnbakedModel;
89
import net.minecraft.resources.ResourceLocation;
910
import net.minecraft.world.level.block.Block;
1011
import net.minecraft.world.level.block.FenceBlock;
12+
import net.minecraft.world.level.block.IronBarsBlock;
13+
import org.apache.logging.log4j.util.BiConsumer;
1114
import org.embeddedt.modernfix.ModernFixClient;
1215
import org.embeddedt.modernfix.annotation.RequiresMod;
1316
import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration;
@@ -21,7 +24,7 @@
2124
@RequiresMod("diagonalfences")
2225
public 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;

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ fabric_api_version=0.76.0+1.19.2
2222

2323
modmenu_version=4.1.2
2424
appeng_version=12.9.3
25-
diagonal_fences_version=4545943
25+
diagonal_fences_version=4658719
2626

2727
spark_version=4505310
2828

0 commit comments

Comments
 (0)