Merge 1.16 into 1.18

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/util/CanonizingStringMap.java

@@ -29,6 +29,8 @@ public T put(String key, T value) {
 
     @Override
     public void putAll(Map<? extends String, ? extends T> m) {
+        if(m.isEmpty())
+            return;
         HashMap<String, T> tmp = new HashMap<>();
         m.forEach((k, v) -> tmp.put(intern(k), v));
         super.putAll(tmp);

settings.gradle

@@ -9,7 +9,9 @@ pluginManagement {
 
 include("test_agent")
 include("common")
-include("fabric")
-include("forge")
+
+getProperty("enabled_platforms").tokenize(',').each { it ->
+    include(it.trim())
+}
 
 rootProject.name = 'modernfix'