Merge remote-tracking branch 'origin/main' into 1.18

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/edge_chunk_not_saved/ChunkManagerMixin.java

@@ -59,6 +59,8 @@ public static String sanitize(String mixinClassName) {
     private final Set<String> mixinOptions = new ObjectOpenHashSet<>();
     private final Map<String, String> mixinsMissingMods = new Object2ObjectOpenHashMap<>();
 
+    public static boolean isFabric = false;
+
     public Map<String, String> getPermanentlyDisabledMixins() {
         return mixinsMissingMods;
     }
@@ -71,6 +73,8 @@ private void scanForAndBuildMixinOptions() {
             if(stream == null)
                 continue;
             try(Reader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
+                if(configFile.contains("fabric"))
+                    isFabric = true;
                 JsonObject configObject = (JsonObject)new JsonParser().parse(reader);
                 JsonArray mixinList = configObject.getAsJsonArray("mixins");
                 String packageName = configObject.get("package").getAsString().replace('.', '/');
@@ -178,15 +182,20 @@ private ModernFixEarlyConfig(File file) {
         disableIfModPresent("mixin.perf.thread_priorities", "smoothboot");
         disableIfModPresent("mixin.perf.boost_worker_count", "smoothboot");
         disableIfModPresent("mixin.perf.async_jei", "modernui");
-        disableIfModPresent("mixin.perf.compress_biome_container", "chocolate", "betterendforge");
+        disableIfModPresent("mixin.perf.compress_biome_container", "chocolate", "betterendforge" ,"skyblockbuilder");
         disableIfModPresent("mixin.bugfix.mc218112", "performant");
         disableIfModPresent("mixin.bugfix.remove_block_chunkloading", "performant");
         disableIfModPresent("mixin.bugfix.paper_chunk_patches", "c2me");
+        // DimThread makes changes to the server chunk manager (understandably), C2ME probably does the same
+        disableIfModPresent("mixin.bugfix.chunk_deadlock", "c2me", "dimthread");
         disableIfModPresent("mixin.perf.reuse_datapacks", "tac");
         disableIfModPresent("mixin.launch.class_search_cache", "optifine");
         disableIfModPresent("mixin.perf.faster_texture_stitching", "optifine");
         disableIfModPresent("mixin.perf.datapack_reload_exceptions", "cyanide");
         disableIfModPresent("mixin.perf.faster_texture_loading", "stitch", "optifine", "changed");
+        if(isFabric) {
+            disableIfModPresent("mixin.bugfix.packet_leak", "memoryleakfix");
+        }
     }
 
     private void disableIfModPresent(String configName, String... ids) {

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

@@ -141,14 +141,16 @@ public int hashCode() {
     }
 
     public static <T> CanonizingStringMap<T> deepCopy(CanonizingStringMap<T> inputMap, Function<T, T> deepCopier) {
+        Objects.requireNonNull(deepCopier);
         Object2ObjectMap<String, T> copiedBackingMap;
         int size = inputMap.backingMap.size();
         if(size > GROWTH_THRESHOLD) {
             copiedBackingMap = new Object2ObjectOpenHashMap<>(size);
         } else
             copiedBackingMap = new Object2ObjectArrayMap<>(size);
         inputMap.backingMap.object2ObjectEntrySet().forEach(entry -> {
-            copiedBackingMap.put(entry.getKey(), deepCopier.apply(entry.getValue()));
+            if(entry.getKey() != null && entry.getValue() != null)
+                copiedBackingMap.put(entry.getKey(), deepCopier.apply(entry.getValue()));
         });
         return new CanonizingStringMap<>(copiedBackingMap);
     }