From 58f79e25e9d5a2a05274958f92142d4c9504b897 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Mon, 30 Oct 2023 09:41:11 -0400
Subject: [PATCH 1/2] Update Diagonal Fences mixin on 1.19

---
 .../diagonalfences/MultipartAppenderMixin.java           | 9 ++++++---
 gradle.properties                                        | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

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<ResourceLocation, UnbakedModel> 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
 

From 32ad8f6df1c1edd7fe86c50e436d7cb140c08af9 Mon Sep 17 00:00:00 2001
From: embeddedt <42941056+embeddedt@users.noreply.github.com>
Date: Mon, 30 Oct 2023 14:48:58 -0400
Subject: [PATCH 2/2] Update RS integration for 1.18+

---
 .../mixin/perf/dynamic_resources/rs/ClientSetupMixin.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java
index 873c0ec7..e7865e4a 100644
--- a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java
+++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java
@@ -22,8 +22,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class ClientSetupMixin {
     @Shadow(remap = false) @Final private static BakedModelOverrideRegistry BAKED_MODEL_OVERRIDE_REGISTRY;
 
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void addDynamicListener(CallbackInfo ci) {
+    @Inject(method = "registerBakedModelOverrides", at = @At("RETURN"), remap = false)
+    private static void addDynamicListener(CallbackInfo ci) {
         ModernFixClient.CLIENT_INTEGRATIONS.add(new ModernFixClientIntegration() {
             @Override
             public BakedModel onBakedModelLoad(ResourceLocation location, UnbakedModel baseModel, BakedModel originalModel, ModelState state, ModelBakery bakery) {