R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
embeddedt 2025-07-01 20:36:15 -04:00
commit 5ea3880e80
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

16
neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java
View File

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