From 38f1370d596b7b16365625ac30de897ad4e3fcc9 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Mon, 16 Jun 2025 19:21:25 -0400 Subject: [PATCH 1/2] Do not register smart ingredient sync channel if option is off Related: #570 --- .../modernfix/forge/packet/PacketHandler.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java b/forge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java index de7ad5a3..3613b7a4 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java @@ -8,13 +8,25 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFixClient; +import org.embeddedt.modernfix.core.ModernFixMixinPlugin; import org.embeddedt.modernfix.packet.EntityIDSyncPacket; import java.util.function.Supplier; public class PacketHandler { public static final SimpleChannel INSTANCE = buildChannel("main", "1"); - public static final SimpleChannel INGREDIENT_SYNC = buildChannel("ingredient_sync", "1"); + public static final SimpleChannel INGREDIENT_SYNC; + + static { + SimpleChannel ingredientChannel; + if (ModernFixMixinPlugin.instance.isOptionEnabled("perf.smart_ingredient_sync.Channel")) { + ingredientChannel = buildChannel("ingredient_sync", "1"); + } else { + ingredientChannel = null; + } + INGREDIENT_SYNC = ingredientChannel; + } + public static final ThreadLocal CLIENT_HAS_SMART_INGREDIENT_SYNC = ThreadLocal.withInitial(() -> false); private static SimpleChannel buildChannel(String name, String version) { From f26ed86973bcbc0f5d5b1cd11f58817471b96cd2 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Mon, 16 Jun 2025 19:49:46 -0400 Subject: [PATCH 2/2] Disable smart ingredient sync with CraftTweaker installed Related: #570 --- .../embeddedt/modernfix/core/config/ModernFixEarlyConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java index 228914ca..c8da8d0e 100644 --- a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java +++ b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java @@ -242,6 +242,7 @@ public class ModernFixEarlyConfig { 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"); }