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

Drop `fix_loop_spin_waiting` option

Related: #595

Author: embeddedt

buildSrc/src/main/groovy/modernfix.common-conventions.gradle

@@ -125,14 +125,4 @@ repositories {
             includeGroup "com.terraformersmc"
         }
     }
-    exclusiveContent {
-        forRepository {
-            maven {
-                url "https://maven.tterrag.com"
-            }
-        }
-        filter {
-            includeGroup "team.chisel.ctm"
-        }
-    }
 }

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/fix_loop_spin_waiting/MinecraftServerMixin.java

@@ -175,6 +175,7 @@ public DefaultSettingMapBuilder put(String key, Boolean value) {
             .put("mixin.perf.dynamic_entity_renderers", false)
             .put("mixin.feature.integrated_server_watchdog", true)
             .put("mixin.perf.faster_item_rendering", false)
+            .put("mixin.perf.ingredient_item_deduplication", false)
             .put("mixin.feature.spam_thread_dump", false)
             .put("mixin.feature.disable_unihex_font", false)
             .put("mixin.feature.remove_chat_signing", false)
@@ -239,6 +240,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");
         }

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

@@ -13,8 +13,7 @@ parchment_mc_version=1.21.8
 refined_storage_version=4392788
 jei_version=19.0.0.9
 rei_version=13.0.678
-ctm_version=5541286
-# ctm_version=1.21-1.2.0+2
+ctm_version=5587515
 ldlib_version=5782845
 kubejs_version=2101.7.1-build.181
 rhino_version=2101.2.7-build.74

gradle.properties

@@ -56,7 +56,7 @@ dependencies {
         transitive = false
     }
     //modRuntimeOnly("curse.maven:ferritecore-429235:4441949")
-    modCompileOnly("curse.maven:CTM-267602:${ctm_version}")
+    modCompileOnly("curse.maven:ctm-267602:${ctm_version}")
     modCompileOnly("curse.maven:ldlib-626676:${ldlib_version}")
 
     modCompileOnly("curse.maven:supermartijncore-454372:4455391")

neoforge/build.gradle

@@ -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)

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

@@ -65,5 +65,5 @@ modId = "jei"
 type = "optional"
 # This version range declares a minimum of the current minecraft version up to but not including the next major version
 versionRange = "[15.8.0.11,)"
-ordering = "BEFORE"
+ordering = "NONE"
 side = "CLIENT"