Merge remote-tracking branch 'origin/1.20' into 1.21.1

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java

@@ -239,6 +239,7 @@ private ModernFixEarlyConfig(File file) {
         disableIfModPresent("mixin.feature.remove_chat_signing", "nochatreports");
         disableIfModPresent("mixin.perf.faster_texture_loading", "stitch", "optifine", "changed");
         disableIfModPresent("mixin.perf.faster_ingredients", "vmp");
+        disableIfModPresent("mixin.perf.smart_ingredient_sync", "crafttweaker");
         if(isFabric) {
             disableIfModPresent("mixin.bugfix.packet_leak", "memoryleakfix");
         }

neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java

@@ -79,13 +79,15 @@ public void commonSetup(FMLCommonSetupEvent event) {
     }
 
     private void registerNetworkChannel(final RegisterPayloadHandlersEvent event) {
-        // Sets the current network version
-        final PayloadRegistrar registrar = event.registrar("1").optional();
-        registrar.playToClient(
-                SmartIngredientSyncPayload.TYPE,
-                SmartIngredientSyncPayload.STREAM_CODEC,
-                (payload, ctx) -> {}
-        );
+        if (ModernFixMixinPlugin.instance.isOptionEnabled("perf.smart_ingredient_sync.Channel")) {
+            // Sets the current network version
+            final PayloadRegistrar registrar = event.registrar("1").optional();
+            registrar.playToClient(
+                    SmartIngredientSyncPayload.TYPE,
+                    SmartIngredientSyncPayload.STREAM_CODEC,
+                    (payload, ctx) -> {}
+            );
+        }
     }
 
     @SubscribeEvent(priority = EventPriority.LOWEST)