Merge 1.19.4 into 1.20

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,7 +41,7 @@ public abstract class MultipartAppenderMixin {
                 if(originalModel instanceof MultiPart multipart) {
                     Block block = multipart.definition.getOwner();
                     if(block instanceof FenceBlock && block instanceof DiagonalBlock diagonalBlock && diagonalBlock.hasProperties()) {
-                        appendDiagonalSelectors(bakery, multipart);
+                        appendDiagonalSelectors(((ModelBakeryAccessor)bakery)::diagonalfences$callCacheAndQueueDependencies, multipart, block instanceof IronBarsBlock);
                     }
                 }
                 return originalModel;

common/src/main/resources/assets/modernfix/lang/zh_tw.json

@@ -0,0 +1,13 @@
+{
+    "key.modernfix": "ModernFix",
+    "key.modernfix.config": "開啟設定介面",
+    "modernfix.jei_load": "正在載入 JEI，這可能需要一點時間",
+    "modernfix.no_lazydfu": "沒有安裝 LazyDFU。如果 Minecraft 需要從舊版本更新遊戲資料，可能會出現明顯的延遲。",
+    "modernfix.config": "ModernFix 注入設定",
+    "modernfix.config.done_restart": "完成（需要重新啟動遊戲）",
+    "modernfix.option.on": "開啟",
+    "modernfix.option.off": "關閉",
+    "modernfix.config.not_default": "（已修改）",
+    "asynclocator.map.locating": "地圖（定位中...）",
+    "asynclocator.map.none": "地圖（未找到附近的特徵）"
+}

forge/build.gradle

@@ -104,4 +104,4 @@ publishing {
     repositories {
         // Add repositories to publish to here.
     }
-}
+}

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java

@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 
 @Mixin(RecipeManager.class)
 public class RecipeManagerMixin {
-    @Redirect(method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false))
+    @Redirect(method = "apply(Ljava/util/Map;Lnet/minecraft/server/packs/resources/ResourceManager;Lnet/minecraft/util/profiling/ProfilerFiller;)V", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V", remap = false), require = 0)
     private void silenceException(Logger instance, String s, Object location, Object exc) {
         instance.error(s + ": {}", location, exc.toString());
     }

gradle.properties

@@ -20,6 +20,6 @@ fabric_api_version=0.83.1+1.20.1
 continuity_version=3.0.0-beta.2+1.19.3
 
 modmenu_version=7.0.0-beta.2
-diagonal_fences_version=4545943
+diagonal_fences_version=4558828
 
 spark_version=4587310