Merge 1.20 into 1.21

embeddedt · embeddedt · commit a6e0785252eb · 2024-06-13T18:24:45.000-04:00
diff --git a/buildSrc/src/main/groovy/modernfix.mod-common-conventions.gradle b/buildSrc/src/main/groovy/modernfix.mod-common-conventions.gradle
@@ -7,7 +7,7 @@ loom {
     silentMojangMappingsLicense()
     accessWidenerPath = file("${rootDir}/common/src/main/resources/modernfix.accesswidener")
     mixin {
-        useLegacyMixinAp = false
+        useLegacyMixinAp = true
     }
 }
 
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
@@ -165,6 +165,7 @@ public DefaultSettingMapBuilder put(String key, Boolean value) {
             .put("mixin.feature.stalled_chunk_load_detection", false)
             .put("mixin.perf.blast_search_trees.force", false)
             .put("mixin.bugfix.restore_old_dragon_movement", false)
+            .put("mixin.perf.worldgen_allocation", false) // experimental
             .put("mixin.feature.cause_lag_by_disabling_threads", false)
             .put("mixin.perf.clear_mixin_classinfo", false)
             .put("mixin.perf.deduplicate_climate_parameters", false)

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ loom {`
`7`	`7`	`silentMojangMappingsLicense()`
`8`	`8`	`accessWidenerPath = file("${rootDir}/common/src/main/resources/modernfix.accesswidener")`
`9`	`9`	`mixin {`
`10`		`- useLegacyMixinAp = false`
	`10`	`+ useLegacyMixinAp = true`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`