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

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nbt_memory_usage/CompoundTag1Mixin.java

@@ -0,0 +1,20 @@
+package org.embeddedt.modernfix.common.mixin.perf.nbt_memory_usage;
+
+import net.minecraft.nbt.Tag;
+import org.embeddedt.modernfix.util.CanonizingStringMap;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
+
+import java.util.Map;
+
+@Mixin(targets = "net/minecraft/nbt/CompoundTag$1")
+public class CompoundTag1Mixin {
+    @ModifyVariable(method = "load(Ljava/io/DataInput;ILnet/minecraft/nbt/NbtAccounter;)Lnet/minecraft/nbt/CompoundTag;", at = @At(value = "INVOKE_ASSIGN", target = "Lcom/google/common/collect/Maps;newHashMap()Ljava/util/HashMap;", remap = false))
+    private Map<String, Tag> modifyMap(Map<String, Tag> map) {
+        CanonizingStringMap<Tag> newMap =  new CanonizingStringMap<>();
+        if(map != null)
+            newMap.putAll(map);
+        return newMap;
+    }
+}

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nbt_memory_usage/CompoundTagMixin.java

@@ -22,7 +22,8 @@ public class CompoundTagMixin {
     @ModifyArg(method = "<init>()V", at = @At(value = "INVOKE", target = "Lnet/minecraft/nbt/CompoundTag;<init>(Ljava/util/Map;)V"), index = 0)
     private static Map<String, Tag> useCanonizingStringMap(Map<String, Tag> incoming) {
         CanonizingStringMap<Tag> newMap = new CanonizingStringMap<>();
-        newMap.putAll(incoming);
+        if(incoming != null)
+            newMap.putAll(incoming);
         return newMap;
     }
 

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

@@ -186,6 +186,7 @@ private ModernFixEarlyConfig(File file) {
         disableIfModPresent("mixin.bugfix.mc218112", "performant");
         disableIfModPresent("mixin.bugfix.remove_block_chunkloading", "performant");
         disableIfModPresent("mixin.bugfix.paper_chunk_patches", "c2me");
+        disableIfModPresent("mixin.perf.nbt_memory_usage", "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");