some nbt work (#612) · QuiltMC/quilt-mappings@40b8dba

github-actions · 2024-08-08T16:16:39Z

With commit 40b8dba, 54 file(s) were updated with 703 line(s) added and 643 removed compared to the latest Quilt Mappings version.

View the diff here (1/3):

diff -bur namedTargetSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java namedSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java	2024-08-08 16:16:37.890714304 +0000
+++ namedSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java	2024-08-08 16:15:29.178426490 +0000
@@ -52,7 +52,7 @@
    protected void readNbtImpl(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
       super.readNbtImpl(nbt, lookupProvider);
       if (nbt.contains("normal_config")) {
-         NbtCompound lv = nbt.getCompound("normal_config").copy();
+         NbtCompound lv = nbt.getCompound("normal_config").shallowCopy();
          nbt.put("ominous_config", lv.copyFrom(nbt.getCompound("ominous_config")));
       }
 
diff -bur namedTargetSrc/net/minecraft/client/option/HotbarStorage.java namedSrc/net/minecraft/client/option/HotbarStorage.java
--- namedTargetSrc/net/minecraft/client/option/HotbarStorage.java	2024-08-08 16:16:37.858714170 +0000
+++ namedSrc/net/minecraft/client/option/HotbarStorage.java	2024-08-08 16:15:29.154426389 +0000
@@ -70,7 +70,7 @@
     */
    private void load() {
       try {
-         NbtCompound lv = NbtIo.m_lwpolkuf(this.file);
+         NbtCompound lv = NbtIo.read(this.file);
          if (lv == null) {
             return;
          }
@@ -103,7 +103,7 @@
             lv.put(String.valueOf(i), dataResult.getOrThrow());
          }
 
-         NbtIo.m_kfuaemox(lv, this.file);
+         NbtIo.write(lv, this.file);
       } catch (Exception var5) {
          LOGGER.error("Failed to save creative mode options", (Throwable)var5);
       }
diff -bur namedTargetSrc/net/minecraft/client/option/ServerList.java namedSrc/net/minecraft/client/option/ServerList.java
--- namedTargetSrc/net/minecraft/client/option/ServerList.java	2024-08-08 16:16:37.846714120 +0000
+++ namedSrc/net/minecraft/client/option/ServerList.java	2024-08-08 16:15:29.138426323 +0000
@@ -71,7 +71,7 @@
       try {
          this.servers.clear();
          this.hiddenServers.clear();
-         NbtCompound lv = NbtIo.m_lwpolkuf(this.client.runDirectory.toPath().resolve("servers.dat"));
+         NbtCompound lv = NbtIo.read(this.client.runDirectory.toPath().resolve("servers.dat"));
          if (lv == null) {
             return;
          }
@@ -116,7 +116,7 @@
          lv6.put("servers", lv);
          Path path = this.client.runDirectory.toPath();
          Path path2 = Files.createTempFile(path, "servers", ".dat");
-         NbtIo.m_kfuaemox(lv6, path2);
+         NbtIo.write(lv6, path2);
          Path path3 = path.resolve("servers.dat_old");
          Path path4 = path.resolve("servers.dat");
          Util.backupAndReplace(path4, path2, path3);
diff -bur namedTargetSrc/net/minecraft/command/argument/NbtPathArgumentType.java namedSrc/net/minecraft/command/argument/NbtPathArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/NbtPathArgumentType.java	2024-08-08 16:16:37.778713835 +0000
+++ namedSrc/net/minecraft/command/argument/NbtPathArgumentType.java	2024-08-08 16:15:29.062426006 +0000
@@ -388,7 +388,7 @@
                mutableBoolean.setTrue();
             });
             if (mutableBoolean.isFalse()) {
-               NbtCompound lv2 = this.filter.copy();
+               NbtCompound lv2 = this.filter.shallowCopy();
                lv.add(lv2);
                results.add(lv2);
             }
@@ -501,7 +501,7 @@
          if (nbt instanceof NbtCompound lv) {
             NbtElement lv2 = lv.get(this.name);
             if (lv2 == null) {
-               NbtElement var6 = this.filter.copy();
+               NbtElement var6 = this.filter.shallowCopy();
                lv.put(this.name, var6);
                results.add(var6);
             } else if (this.predicate.test(lv2)) {
@@ -947,7 +947,7 @@
          if (isTooDeep(replacement, this.estimateDepth())) {
             throw NbtPathArgumentType.TOO_DEEP_EXCEPTION.create();
          } else {
-            NbtElement lv = replacement.copy();
+            NbtElement lv = replacement.shallowCopy();
             List<NbtElement> list = this.getTerminals(original);
             if (list.isEmpty()) {
                return 0;
@@ -959,7 +959,7 @@
                         mutableBoolean.setTrue();
                         return lv;
                      } else {
-                        return lv.copy();
+                        return lv.shallowCopy();
                      }
                   }));
             }
@@ -982,7 +982,7 @@
          List<NbtElement> list2 = new ArrayList(elements.size());
 
          for (NbtElement lv : elements) {
-            NbtElement lv2 = lv.copy();
+            NbtElement lv2 = lv.shallowCopy();
             list2.add(lv2);
             if (isTooDeep(lv2, this.estimateDepth())) {
                throw NbtPathArgumentType.TOO_DEEP_EXCEPTION.create();
@@ -1003,7 +1003,7 @@
 
             for (NbtElement lv5 : list2) {
                try {
-                  if (lv4.addElement(k, bl ? lv5.copy() : lv5)) {
+                  if (lv4.addElement(k, bl ? lv5.shallowCopy() : lv5)) {
                      k++;
                      bl2 = true;
                   }
diff -bur namedTargetSrc/net/minecraft/command/DataCommandStorage.java namedSrc/net/minecraft/command/DataCommandStorage.java
--- namedTargetSrc/net/minecraft/command/DataCommandStorage.java	2024-08-08 16:16:37.762713768 +0000
+++ namedSrc/net/minecraft/command/DataCommandStorage.java	2024-08-08 16:15:29.042425923 +0000
@@ -129,7 +129,7 @@
       @Override
       public NbtCompound writeNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
          NbtCompound lv = new NbtCompound();
-         this.map.forEach((key, nbtx) -> lv.put(key, nbtx.copy()));
+         this.map.forEach((key, nbtx) -> lv.put(key, nbtx.shallowCopy()));
          nbt.put("contents", lv);
          return nbt;
       }
diff -bur namedTargetSrc/net/minecraft/component/type/NbtComponent.java namedSrc/net/minecraft/component/type/NbtComponent.java
--- namedTargetSrc/net/minecraft/component/type/NbtComponent.java	2024-08-08 16:16:37.786713868 +0000
+++ namedSrc/net/minecraft/component/type/NbtComponent.java	2024-08-08 16:15:29.074426056 +0000
@@ -44,7 +44,7 @@
     * @mapping {@literal hashed f_otzdwcon Lnet/minecraft/unmapped/C_incrreuu;f_otzdwcon:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/component/type/NbtComponent;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<NbtComponent> CODEC = Codec.withAlternative(NbtCompound.CODEC, StringNbtReader.f_dphkcylp)
+   public static final Codec<NbtComponent> CODEC = Codec.withAlternative(NbtCompound.CODEC, StringNbtReader.CODEC)
       .xmap(NbtComponent::new, component -> component.nbt);
    /**
     * @mapping {@literal hashed f_xmjncvon Lnet/minecraft/unmapped/C_incrreuu;f_xmjncvon:Lcom/mojang/serialization/Codec;}
@@ -80,7 +80,7 @@
     * @mapping {@literal named of Lnet/minecraft/component/type/NbtComponent;of(Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/component/type/NbtComponent;}
     */
    public static NbtComponent of(NbtCompound compound) {
-      return new NbtComponent(compound.copy());
+      return new NbtComponent(compound.shallowCopy());
    }
 
    /**
@@ -132,7 +132,7 @@
     * @mapping {@literal named apply Lnet/minecraft/component/type/NbtComponent;apply(Ljava/util/function/Consumer;)Lnet/minecraft/component/type/NbtComponent;}
     */
    public NbtComponent apply(Consumer<NbtCompound> nbtConsumer) {
-      NbtCompound lv = this.nbt.copy();
+      NbtCompound lv = this.nbt.shallowCopy();
       nbtConsumer.accept(lv);
       return new NbtComponent(lv);
    }
@@ -155,7 +155,7 @@
     */
    public boolean applyToBlockEntity(BlockEntity entity, HolderLookup.Provider lookupProvider) {
       NbtCompound lv = entity.toComponentlessNbt(lookupProvider);
-      NbtCompound lv2 = lv.copy();
+      NbtCompound lv2 = lv.shallowCopy();
       lv.copyFrom(this.nbt);
       if (!lv.equals(lv2)) {
          try {
@@ -221,7 +221,7 @@
     * @mapping {@literal named copy Lnet/minecraft/component/type/NbtComponent;copy()Lnet/minecraft/nbt/NbtCompound;}
     */
    public NbtCompound copy() {
-      return this.nbt.copy();
+      return this.nbt.shallowCopy();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/data/dev/NbtProvider.java namedSrc/net/minecraft/data/dev/NbtProvider.java
--- namedTargetSrc/net/minecraft/data/dev/NbtProvider.java	2024-08-08 16:16:37.774713818 +0000
+++ namedSrc/net/minecraft/data/dev/NbtProvider.java	2024-08-08 16:15:29.054425974 +0000
@@ -144,7 +144,7 @@
 
             try {
                Path path3 = outputPath.resolve(location + ".snbt");
-               writeTo(writer, path3, NbtHelper.toPrettyPrintedString(NbtIo.m_kyzyffmz(inputStream2, NbtTagSizeTracker.createWithUnlimitedBytes())));
+               writeTo(writer, path3, NbtHelper.toPrettyPrintedString(NbtIo.readCompressed(inputStream2, NbtTagSizeTracker.createWithUnlimitedBytes())));
                LOGGER.info("Converted {} from NBT to SNBT", location);
                var7 = path3;
             } catch (Throwable var10) {
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/WorldGenSettingsDisallowOldCustomWorldsFix.java namedSrc/net/minecraft/datafixer/fix/WorldGenSettingsDisallowOldCustomWorldsFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/WorldGenSettingsDisallowOldCustomWorldsFix.java	2024-08-08 16:16:37.938714505 +0000
+++ namedSrc/net/minecraft/datafixer/fix/WorldGenSettingsDisallowOldCustomWorldsFix.java	2024-08-08 16:15:29.218426655 +0000
@@ -6,7 +6,7 @@
 import com.mojang.datafixers.schemas.Schema;
 import com.mojang.datafixers.types.Type;
 import net.minecraft.datafixer.TypeReferences;
-import net.minecraft.unmapped.C_prxxuhrw;
+import net.minecraft.nbt.NbtFormatException;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_rbxsapke}
@@ -33,7 +33,7 @@
                typedx.write().map(dynamic -> dynamic.getMapValues().map(map -> {
                      map.forEach((dynamicx, dynamic2) -> {
                         if (dynamic2.get("type").asString().result().isEmpty()) {
-                           throw new C_prxxuhrw("Unable load old custom worlds.");
+                           throw new NbtFormatException("Unable load old custom worlds.");
                         }
                      });
                      return map;
diff -bur namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java
--- namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-08-08 16:16:37.794713902 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-08-08 16:15:29.086426107 +0000
@@ -205,7 +205,7 @@
        * @mapping {@literal named copy Lnet/minecraft/entity/data/TrackedDataHandlerRegistry$C_cnrymgcj;copy(Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/nbt/NbtCompound;}
        */
       public NbtCompound copy(NbtCompound arg) {
-         return arg.copy();
+         return arg.shallowCopy();
       }
    };
    /**
diff -bur namedTargetSrc/net/minecraft/entity/FallingBlockEntity.java namedSrc/net/minecraft/entity/FallingBlockEntity.java
--- namedTargetSrc/net/minecraft/entity/FallingBlockEntity.java	2024-08-08 16:16:37.930714471 +0000
+++ namedSrc/net/minecraft/entity/FallingBlockEntity.java	2024-08-08 16:15:29.210426623 +0000
@@ -270,7 +270,7 @@
                                  NbtCompound lv6 = lv5.toNbt(this.getWorld().getRegistryManager());
 
                                  for (String string : this.blockEntityData.getKeys()) {
-                                    lv6.put(string, this.blockEntityData.get(string).copy());
+                                    lv6.put(string, this.blockEntityData.get(string).shallowCopy());
                                  }
 
                                  try {
@@ -392,7 +392,7 @@
       }
 
       if (nbt.contains("TileEntityData", NbtElement.COMPOUND_TYPE)) {
-         this.blockEntityData = nbt.getCompound("TileEntityData").copy();
+         this.blockEntityData = nbt.getCompound("TileEntityData").shallowCopy();
       }
 
       this.destroyedOnLanding = nbt.getBoolean("CancelDrop");
diff -bur namedTargetSrc/net/minecraft/entity/MarkerEntity.java namedSrc/net/minecraft/entity/MarkerEntity.java
--- namedTargetSrc/net/minecraft/entity/MarkerEntity.java	2024-08-08 16:16:37.690713466 +0000
+++ namedSrc/net/minecraft/entity/MarkerEntity.java	2024-08-08 16:15:28.946425524 +0000
@@ -62,7 +62,7 @@
     */
    @Override
    protected void writeCustomDataToNbt(NbtCompound nbt) {
-      nbt.put("data", this.data.copy());
+      nbt.put("data", this.data.shallowCopy());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/OminousItemSpawnerEntity.java namedSrc/net/minecraft/entity/OminousItemSpawnerEntity.java
--- namedTargetSrc/net/minecraft/entity/OminousItemSpawnerEntity.java	2024-08-08 16:16:37.710713550 +0000
+++ namedSrc/net/minecraft/entity/OminousItemSpawnerEntity.java	2024-08-08 16:15:28.974425640 +0000
@@ -170,7 +170,7 @@
    @Override
    protected void writeCustomDataToNbt(NbtCompound nbt) {
       if (!this.getItem().isEmpty()) {
-         nbt.put("item", this.getItem().encode(this.getRegistryManager()).copy());
+         nbt.put("item", this.getItem().encode(this.getRegistryManager()).shallowCopy());
       }
 
       nbt.putLong("spawn_item_after_ticks", this.spawnItemAfterTicks);
diff -bur namedTargetSrc/net/minecraft/loot/function/CopyCustomDataLootFunction.java namedSrc/net/minecraft/loot/function/CopyCustomDataLootFunction.java
--- namedTargetSrc/net/minecraft/loot/function/CopyCustomDataLootFunction.java	2024-08-08 16:16:37.898714337 +0000
+++ namedSrc/net/minecraft/loot/function/CopyCustomDataLootFunction.java	2024-08-08 16:15:29.182426505 +0000
@@ -249,7 +249,7 @@
             List<NbtElement> list2 = arg2.getOrInit(arg, NbtList::new);
             list2.forEach(argx -> {
                if (argx instanceof NbtList) {
-                  list.forEach(arg2x -> ((NbtList)argx).add(arg2x.copy()));
+                  list.forEach(arg2x -> ((NbtList)argx).add(arg2x.shallowCopy()));
                }
             });
          }
diff -bur namedTargetSrc/net/minecraft/loot/function/SetCustomDataLootFunction.java namedSrc/net/minecraft/loot/function/SetCustomDataLootFunction.java
--- namedTargetSrc/net/minecraft/loot/function/SetCustomDataLootFunction.java	2024-08-08 16:16:37.926714455 +0000
+++ namedSrc/net/minecraft/loot/function/SetCustomDataLootFunction.java	2024-08-08 16:15:29.206426606 +0000
@@ -21,7 +21,9 @@
     * @mapping {@literal named CODEC Lnet/minecraft/loot/function/SetCustomDataLootFunction;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<SetCustomDataLootFunction> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> m_hfvcjbcy(instance).and(StringNbtReader.f_hlrulnyw.fieldOf("tag").forGetter(arg -> arg.tag)).apply(instance, SetCustomDataLootFunction::new)
+      instance -> m_hfvcjbcy(instance)
+            .and(StringNbtReader.LENIENT_CODEC.fieldOf("tag").forGetter(arg -> arg.tag))
+            .apply(instance, SetCustomDataLootFunction::new)
    );
    /**
     * @mapping {@literal hashed f_avtjnnla Lnet/minecraft/unmapped/C_sxzxxsuj;f_avtjnnla:Lnet/minecraft/unmapped/C_hhlwcnih;}
diff -bur namedTargetSrc/net/minecraft/nbt/NbtByteArray.java namedSrc/net/minecraft/nbt/NbtByteArray.java
--- namedTargetSrc/net/minecraft/nbt/NbtByteArray.java	2024-08-08 16:16:37.954714572 +0000
+++ namedSrc/net/minecraft/nbt/NbtByteArray.java	2024-08-08 16:15:29.226426689 +0000
@@ -31,7 +31,7 @@
        * @mapping {@literal named read Lnet/minecraft/nbt/NbtByteArray$C_qzarviwo;read(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtByteArray;}
        */
       public NbtByteArray read(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         return new NbtByteArray(m_kndswgtt(dataInput, arg));
+         return new NbtByteArray(readRaw(dataInput, arg));
       }
 
       /**
@@ -39,14 +39,14 @@
        */
       @Override
       public NbtScanner.Result doAccept(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
-         return scanner.visitByteArray(m_kndswgtt(input, tracker));
+         return scanner.visitByteArray(readRaw(input, tracker));
       }
 
       /**
        * @mapping {@literal hashed m_kndswgtt Lnet/minecraft/unmapped/C_umipmxwv$C_qzarviwo;m_kndswgtt(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[B}
-       * @mapping {@literal named m_kndswgtt Lnet/minecraft/nbt/NbtByteArray$C_qzarviwo;m_kndswgtt(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)[B}
+       * @mapping {@literal named readRaw Lnet/minecraft/nbt/NbtByteArray$C_qzarviwo;readRaw(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)[B}
        */
-      private static byte[] m_kndswgtt(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      private static byte[] readRaw(DataInput input, NbtTagSizeTracker tracker) throws IOException {
          tracker.addBytes(24L);
          int i = input.readInt();
          tracker.addBytes(1L, (long)i);
@@ -161,7 +161,7 @@
     * Mapping not found
     */
    @Override
-   public NbtElement copy() {
+   public NbtElement shallowCopy() {
       byte[] bs = new byte[this.value.length];
       System.arraycopy(this.value, 0, bs, 0, this.value.length);
       return new NbtByteArray(bs);
@@ -199,7 +199,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed size Lnet/minecraft/unmapped/C_umipmxwv;size()I}
+    * @mapping {@literal named size Lnet/minecraft/nbt/NbtByteArray;size()I}
     */
    public int size() {
       return this.value.length;
@@ -276,7 +277,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed clear Lnet/minecraft/unmapped/C_umipmxwv;clear()V}
+    * @mapping {@literal named clear Lnet/minecraft/nbt/NbtByteArray;clear()V}
     */
    public void clear() {
       this.value = new byte[0];
diff -bur namedTargetSrc/net/minecraft/nbt/NbtByte.java namedSrc/net/minecraft/nbt/NbtByte.java
--- namedTargetSrc/net/minecraft/nbt/NbtByte.java	2024-08-08 16:16:37.862714187 +0000
+++ namedSrc/net/minecraft/nbt/NbtByte.java	2024-08-08 16:15:29.158426406 +0000
@@ -154,9 +154,9 @@
 
    /**
     * @mapping {@literal hashed m_hiabqufx Lnet/minecraft/unmapped/C_pwgutliu;m_hiabqufx()Lnet/minecraft/unmapped/C_pwgutliu;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtByte;copy()Lnet/minecraft/nbt/NbtByte;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtByte;shallowCopy()Lnet/minecraft/nbt/NbtByte;}
     */
-   public NbtByte copy() {
+   public NbtByte shallowCopy() {
       return this;
    }
 
diff -bur namedTargetSrc/net/minecraft/nbt/NbtCompound.java namedSrc/net/minecraft/nbt/NbtCompound.java
--- namedTargetSrc/net/minecraft/nbt/NbtCompound.java	2024-08-08 16:16:37.814713986 +0000
+++ namedSrc/net/minecraft/nbt/NbtCompound.java	2024-08-08 16:15:29.110426206 +0000
@@ -38,19 +38,21 @@
          dynamic -> {
             NbtElement lv = dynamic.convert(NbtOps.INSTANCE).getValue();
             return lv instanceof NbtCompound lv2
-               ? DataResult.success(lv2 == dynamic.getValue() ? lv2.copy() : lv2)
+               ? DataResult.success(lv2 == dynamic.getValue() ? lv2.shallowCopy() : lv2)
                : DataResult.error(() -> "Not a compound tag: " + lv);
          },
-         arg -> new Dynamic<>(NbtOps.INSTANCE, arg.copy())
+         arg -> new Dynamic<>(NbtOps.INSTANCE, arg.shallowCopy())
       );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qucoyxms Lnet/minecraft/unmapped/C_hhlwcnih;f_qucoyxms:I}
+    * @mapping {@literal named SIZE Lnet/minecraft/nbt/NbtCompound;SIZE:I}
     */
-   private static final int f_qucoyxms = 48;
+   private static final int SIZE = 48;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_aetpjbog Lnet/minecraft/unmapped/C_hhlwcnih;f_aetpjbog:I}
+    * @mapping {@literal named ENTRY_SIZE Lnet/minecraft/nbt/NbtCompound;ENTRY_SIZE:I}
     */
-   private static final int f_aetpjbog = 32;
+   private static final int ENTRY_SIZE = 32;
    /**
     * @mapping {@literal hashed f_ghusyxdr Lnet/minecraft/unmapped/C_hhlwcnih;f_ghusyxdr:Lnet/minecraft/unmapped/C_ueidorcc;}
     * @mapping {@literal named TYPE Lnet/minecraft/nbt/NbtCompound;TYPE:Lnet/minecraft/nbt/NbtType;}
@@ -65,7 +67,7 @@
 
          NbtCompound var3;
          try {
-            var3 = m_qbdkgvms(dataInput, arg);
+            var3 = readCompound(dataInput, arg);
          } finally {
             arg.popDepth();
          }
@@ -75,15 +77,15 @@
 
       /**
        * @mapping {@literal hashed m_qbdkgvms Lnet/minecraft/unmapped/C_hhlwcnih$C_krlbszwn;m_qbdkgvms(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih;}
-       * @mapping {@literal named m_qbdkgvms Lnet/minecraft/nbt/NbtCompound$C_krlbszwn;m_qbdkgvms(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtCompound;}
+       * @mapping {@literal named readCompound Lnet/minecraft/nbt/NbtCompound$C_krlbszwn;readCompound(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtCompound;}
        */
-      private static NbtCompound m_qbdkgvms(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      private static NbtCompound readCompound(DataInput input, NbtTagSizeTracker tracker) throws IOException {
          tracker.addBytes(48L);
          Map<String, NbtElement> map = Maps.<String, NbtElement>newHashMap();
 
          byte b;
          while ((b = input.readByte()) != 0) {
-            String string = m_mlnxbtqt(input, tracker);
+            String string = readString(input, tracker);
             NbtElement lv = NbtCompound.read(NbtTypes.byId(b), string, input, tracker);
             if (map.put(string, lv) == null) {
                tracker.addBytes(36L);
@@ -102,7 +104,7 @@
 
          NbtScanner.Result var4;
          try {
-            var4 = m_heopwcei(input, scanner, tracker);
+            var4 = parseCompound(input, scanner, tracker);
          } finally {
             tracker.popDepth();
          }
@@ -112,9 +114,9 @@
 
       /**
        * @mapping {@literal hashed m_heopwcei Lnet/minecraft/unmapped/C_hhlwcnih$C_krlbszwn;m_heopwcei(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;}
-       * @mapping {@literal named m_heopwcei Lnet/minecraft/nbt/NbtCompound$C_krlbszwn;m_heopwcei(Ljava/io/DataInput;Lnet/minecraft/nbt/scanner/NbtScanner;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/scanner/NbtScanner$Result;}
+       * @mapping {@literal named parseCompound Lnet/minecraft/nbt/NbtCompound$C_krlbszwn;parseCompound(Ljava/io/DataInput;Lnet/minecraft/nbt/scanner/NbtScanner;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/scanner/NbtScanner$Result;}
        */
-      private static NbtScanner.Result m_heopwcei(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
+      private static NbtScanner.Result parseCompound(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
          tracker.addBytes(48L);
 
          byte b;
@@ -122,33 +124,33 @@
          while ((b = input.readByte()) != 0) {
             NbtType<?> lv = NbtTypes.byId(b);
             switch (scanner.visitSubNbtType(lv)) {
-               case f_pkgsxrgf:
-                  return NbtScanner.Result.f_kpjgfhsy;
-               case f_qhflrpze:
+               case HALT:
+                  return NbtScanner.Result.HALT;
+               case BREAK:
                   NbtString.skipString(input);
                   lv.skip(input, tracker);
                   break label35;
-               case f_lpjmwtad:
+               case SKIP:
                   NbtString.skipString(input);
                   lv.skip(input, tracker);
                   break;
                default:
-                  String string = m_mlnxbtqt(input, tracker);
+                  String string = readString(input, tracker);
                   switch (scanner.startSubNbt(lv, string)) {
-                     case f_pkgsxrgf:
-                        return NbtScanner.Result.f_kpjgfhsy;
-                     case f_qhflrpze:
+                     case HALT:
+                        return NbtScanner.Result.HALT;
+                     case BREAK:
                         lv.skip(input, tracker);
                         break label35;
-                     case f_lpjmwtad:
+                     case SKIP:
                         lv.skip(input, tracker);
                         break;
                      default:
                         tracker.addBytes(36L);
                         switch (lv.doAccept(input, scanner, tracker)) {
-                           case f_kpjgfhsy:
-                              return NbtScanner.Result.f_kpjgfhsy;
-                           case f_irsnidyo:
+                           case HALT:
+                              return NbtScanner.Result.HALT;
+                           case BREAK:
                         }
                   }
             }
@@ -166,9 +168,9 @@
 
       /**
        * @mapping {@literal hashed m_mlnxbtqt Lnet/minecraft/unmapped/C_hhlwcnih$C_krlbszwn;m_mlnxbtqt(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String;}
-       * @mapping {@literal named m_mlnxbtqt Lnet/minecraft/nbt/NbtCompound$C_krlbszwn;m_mlnxbtqt(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Ljava/lang/String;}
+       * @mapping {@literal named readString Lnet/minecraft/nbt/NbtCompound$C_krlbszwn;readString(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Ljava/lang/String;}
        */
-      private static String m_mlnxbtqt(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      private static String readString(DataInput input, NbtTagSizeTracker tracker) throws IOException {
          String string = input.readUTF();
          tracker.addBytes(28L);
          tracker.addBytes(2L, (long)string.length());
@@ -740,18 +742,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_poylyjba Lnet/minecraft/unmapped/C_hhlwcnih;m_poylyjba()Lnet/minecraft/unmapped/C_hhlwcnih;}
+    * @mapping {@literal named createNbt Lnet/minecraft/nbt/NbtCompound;createNbt()Lnet/minecraft/nbt/NbtCompound;}
     */
-   protected NbtCompound m_poylyjba() {
+   protected NbtCompound createNbt() {
       return new NbtCompound(new HashMap(this.entries));
    }
 
    /**
     * @mapping {@literal hashed m_zncfzony Lnet/minecraft/unmapped/C_hhlwcnih;m_zncfzony()Lnet/minecraft/unmapped/C_hhlwcnih;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtCompound;copy()Lnet/minecraft/nbt/NbtCompound;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtCompound;shallowCopy()Lnet/minecraft/nbt/NbtCompound;}
     */
-   public NbtCompound copy() {
-      Map<String, NbtElement> map = Maps.<String, NbtElement>newHashMap(Maps.transformValues(this.entries, NbtElement::copy));
+   public NbtCompound shallowCopy() {
+      Map<String, NbtElement> map = Maps.<String, NbtElement>newHashMap(Maps.transformValues(this.entries, NbtElement::shallowCopy));
       return new NbtCompound(map);
    }
 
@@ -810,10 +813,10 @@
                NbtCompound lv2 = this.getCompound(string);
                lv2.copyFrom((NbtCompound)lv);
             } else {
-               this.put(string, lv.copy());
+               this.put(string, lv.shallowCopy());
             }
          } else {
-            this.put(string, lv.copy());
+            this.put(string, lv.shallowCopy());
          }
       }
 
@@ -829,9 +832,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_smzpndim Lnet/minecraft/unmapped/C_hhlwcnih;m_smzpndim()Ljava/util/Set;}
+    * @mapping {@literal named getEntries Lnet/minecraft/nbt/NbtCompound;getEntries()Ljava/util/Set;}
     */
-   protected Set<Entry<String, NbtElement>> m_smzpndim() {
+   protected Set<Entry<String, NbtElement>> getEntries() {
       return this.entries.entrySet();
    }
 
@@ -845,27 +849,27 @@
          NbtType<?> lv2 = lv.getNbtType();
          NbtScanner.NestedResult lv3 = scanner.visitSubNbtType(lv2);
          switch (lv3) {
-            case f_pkgsxrgf:
-               return NbtScanner.Result.f_kpjgfhsy;
-            case f_qhflrpze:
+            case HALT:
+               return NbtScanner.Result.HALT;
+            case BREAK:
                return scanner.endNested();
-            case f_lpjmwtad:
+            case SKIP:
                break;
             default:
                lv3 = scanner.startSubNbt(lv2, (String)entry.getKey());
                switch (lv3) {
-                  case f_pkgsxrgf:
-                     return NbtScanner.Result.f_kpjgfhsy;
-                  case f_qhflrpze:
+                  case HALT:
+                     return NbtScanner.Result.HALT;
+                  case BREAK:
                      return scanner.endNested();
-                  case f_lpjmwtad:
+                  case SKIP:
                      break;
                   default:
                      NbtScanner.Result lv4 = lv.scan(scanner);
                      switch (lv4) {
-                        case f_kpjgfhsy:
-                           return NbtScanner.Result.f_kpjgfhsy;
-                        case f_irsnidyo:
+                        case HALT:
+                           return NbtScanner.Result.HALT;
+                        case BREAK:
                            return scanner.endNested();
                      }
                }
diff -bur namedTargetSrc/net/minecraft/nbt/NbtDouble.java namedSrc/net/minecraft/nbt/NbtDouble.java
--- namedTargetSrc/net/minecraft/nbt/NbtDouble.java	2024-08-08 16:16:37.802713935 +0000
+++ namedSrc/net/minecraft/nbt/NbtDouble.java	2024-08-08 16:15:29.094426139 +0000
@@ -34,7 +34,7 @@
        * @mapping {@literal named read Lnet/minecraft/nbt/NbtDouble$C_iubarszc;read(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtDouble;}
        */
       public NbtDouble read(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         return NbtDouble.of(m_frmxzypg(dataInput, arg));
+         return NbtDouble.of(readRaw(dataInput, arg));
       }
 
       /**
@@ -42,14 +42,14 @@
        */
       @Override
       public NbtScanner.Result doAccept(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
-         return scanner.visitDouble(m_frmxzypg(input, tracker));
+         return scanner.visitDouble(readRaw(input, tracker));
       }
 
       /**
        * @mapping {@literal hashed m_frmxzypg Lnet/minecraft/unmapped/C_xiyjytpd$C_iubarszc;m_frmxzypg(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)D}
-       * @mapping {@literal named m_frmxzypg Lnet/minecraft/nbt/NbtDouble$C_iubarszc;m_frmxzypg(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)D}
+       * @mapping {@literal named readRaw Lnet/minecraft/nbt/NbtDouble$C_iubarszc;readRaw(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)D}
        */
-      private static double m_frmxzypg(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      private static double readRaw(DataInput input, NbtTagSizeTracker tracker) throws IOException {
          tracker.addBytes(16L);
          return input.readDouble();
       }
@@ -142,9 +142,9 @@
 
    /**
     * @mapping {@literal hashed m_gtyrjzgo Lnet/minecraft/unmapped/C_xiyjytpd;m_gtyrjzgo()Lnet/minecraft/unmapped/C_xiyjytpd;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtDouble;copy()Lnet/minecraft/nbt/NbtDouble;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtDouble;shallowCopy()Lnet/minecraft/nbt/NbtDouble;}
     */
-   public NbtDouble copy() {
+   public NbtDouble shallowCopy() {
       return this;
    }
 
diff -bur namedTargetSrc/net/minecraft/nbt/NbtElement.java namedSrc/net/minecraft/nbt/NbtElement.java
--- namedTargetSrc/net/minecraft/nbt/NbtElement.java	2024-08-08 16:16:37.670713383 +0000
+++ namedSrc/net/minecraft/nbt/NbtElement.java	2024-08-08 16:15:28.918425407 +0000
@@ -198,14 +198,10 @@
    NbtType<?> getNbtType();
 
    /**
-    * Copies this NBT element.
-    * 
-    * @return the copied element
-    * 
     * @mapping {@literal hashed m_ehqkdijp Lnet/minecraft/unmapped/C_oivssbvb;m_ehqkdijp()Lnet/minecraft/unmapped/C_oivssbvb;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtElement;copy()Lnet/minecraft/nbt/NbtElement;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtElement;shallowCopy()Lnet/minecraft/nbt/NbtElement;}
     */
-   NbtElement copy();
+   NbtElement shallowCopy();
 
    /**
     * @mapping {@literal hashed m_hbuflhqa Lnet/minecraft/unmapped/C_oivssbvb;m_hbuflhqa()I}
@@ -239,7 +235,7 @@
     */
    default void scanAsRoot(NbtScanner scanner) {
       NbtScanner.Result lv = scanner.start(this.getNbtType());
-      if (lv == NbtScanner.Result.f_drwmzuin) {
+      if (lv == NbtScanner.Result.CONTINUE) {
          this.scan(scanner);
       }
    }
diff -bur namedTargetSrc/net/minecraft/nbt/NbtFloat.java namedSrc/net/minecraft/nbt/NbtFloat.java
--- namedTargetSrc/net/minecraft/nbt/NbtFloat.java	2024-08-08 16:16:37.942714522 +0000
+++ namedSrc/net/minecraft/nbt/NbtFloat.java	2024-08-08 16:15:29.218426655 +0000
@@ -34,7 +34,7 @@
        * @mapping {@literal named read Lnet/minecraft/nbt/NbtFloat$C_rfwycmsf;read(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtFloat;}
        */
       public NbtFloat read(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         return NbtFloat.of(m_vpkdnupw(dataInput, arg));
+         return NbtFloat.of(readFloat(dataInput, arg));
       }
 
       /**
@@ -42,14 +42,14 @@
        */
       @Override
       public NbtScanner.Result doAccept(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
-         return scanner.visitFloat(m_vpkdnupw(input, tracker));
+         return scanner.visitFloat(readFloat(input, tracker));
       }
 
       /**
        * @mapping {@literal hashed m_vpkdnupw Lnet/minecraft/unmapped/C_nmjwsnmy$C_rfwycmsf;m_vpkdnupw(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)F}
-       * @mapping {@literal named m_vpkdnupw Lnet/minecraft/nbt/NbtFloat$C_rfwycmsf;m_vpkdnupw(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)F}
+       * @mapping {@literal named readFloat Lnet/minecraft/nbt/NbtFloat$C_rfwycmsf;readFloat(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)F}
        */
-      private static float m_vpkdnupw(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      private static float readFloat(DataInput input, NbtTagSizeTracker tracker) throws IOException {
          tracker.addBytes(12L);
          return input.readFloat();
       }
@@ -142,9 +142,9 @@
 
    /**
     * @mapping {@literal hashed m_kshcnvks Lnet/minecraft/unmapped/C_nmjwsnmy;m_kshcnvks()Lnet/minecraft/unmapped/C_nmjwsnmy;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtFloat;copy()Lnet/minecraft/nbt/NbtFloat;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtFloat;shallowCopy()Lnet/minecraft/nbt/NbtFloat;}
     */
-   public NbtFloat copy() {
+   public NbtFloat shallowCopy() {
       return this;
    }
 
Only in namedSrc/net/minecraft/nbt: NbtFormatException.java
diff -bur namedTargetSrc/net/minecraft/nbt/NbtIntArray.java namedSrc/net/minecraft/nbt/NbtIntArray.java
--- namedTargetSrc/net/minecraft/nbt/NbtIntArray.java	2024-08-08 16:16:37.802713935 +0000
+++ namedSrc/net/minecraft/nbt/NbtIntArray.java	2024-08-08 16:15:29.094426139 +0000
@@ -31,7 +31,7 @@
        * @mapping {@literal named read Lnet/minecraft/nbt/NbtIntArray$C_ytzlewdv;read(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtIntArray;}
        */
       public NbtIntArray read(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         return new NbtIntArray(m_rmdqbzlz(dataInput, arg));
+         return new NbtIntArray(readArray(dataInput, arg));
       }
 
       /**
@@ -39,14 +39,14 @@
        */
       @Override
       public NbtScanner.Result doAccept(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
-         return scanner.visitIntArray(m_rmdqbzlz(input, tracker));
+         return scanner.visitIntArray(readArray(input, tracker));
       }
 
       /**
        * @mapping {@literal hashed m_rmdqbzlz Lnet/minecraft/unmapped/C_qkxiqejc$C_ytzlewdv;m_rmdqbzlz(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[I}
-       * @mapping {@literal named m_rmdqbzlz Lnet/minecraft/nbt/NbtIntArray$C_ytzlewdv;m_rmdqbzlz(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)[I}
+       * @mapping {@literal named readArray Lnet/minecraft/nbt/NbtIntArray$C_ytzlewdv;readArray(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)[I}
        */
-      private static int[] m_rmdqbzlz(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      private static int[] readArray(DataInput input, NbtTagSizeTracker tracker) throws IOException {
          tracker.addBytes(24L);
          int i = input.readInt();
          tracker.addBytes(4L, (long)i);
@@ -166,9 +166,9 @@
 
    /**
     * @mapping {@literal hashed m_bfdqfgnu Lnet/minecraft/unmapped/C_qkxiqejc;m_bfdqfgnu()Lnet/minecraft/unmapped/C_qkxiqejc;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtIntArray;copy()Lnet/minecraft/nbt/NbtIntArray;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtIntArray;shallowCopy()Lnet/minecraft/nbt/NbtIntArray;}
     */
-   public NbtIntArray copy() {
+   public NbtIntArray shallowCopy() {
       int[] is = new int[this.value.length];
       System.arraycopy(this.value, 0, is, 0, this.value.length);
       return new NbtIntArray(is);
@@ -206,7 +206,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed size Lnet/minecraft/unmapped/C_qkxiqejc;size()I}
+    * @mapping {@literal named size Lnet/minecraft/nbt/NbtIntArray;size()I}
     */
    public int size() {
       return this.value.length;
@@ -283,7 +284,8 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed clear Lnet/minecraft/unmapped/C_qkxiqejc;clear()V}
+    * @mapping {@literal named clear Lnet/minecraft/nbt/NbtIntArray;clear()V}
     */
    public void clear() {
       this.value = new int[0];
diff -bur namedTargetSrc/net/minecraft/nbt/NbtInt.java namedSrc/net/minecraft/nbt/NbtInt.java
--- namedTargetSrc/net/minecraft/nbt/NbtInt.java	2024-08-08 16:16:37.834714070 +0000
+++ namedSrc/net/minecraft/nbt/NbtInt.java	2024-08-08 16:15:29.126426274 +0000
@@ -28,7 +28,7 @@
        * @mapping {@literal named read Lnet/minecraft/nbt/NbtInt$C_kbxvfdkb;read(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtInt;}
        */
       public NbtInt read(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         return NbtInt.of(m_wqbmlueb(dataInput, arg));
+         return NbtInt.of(readInt(dataInput, arg));
       }
 
       /**
@@ -36,15 +36,16 @@
        */
       @Override
       public NbtScanner.Result doAccept(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
-         return scanner.visitInt(m_wqbmlueb(input, tracker));
+         return scanner.visitInt(readInt(input, tracker));
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_wqbmlueb Lnet/minecraft/unmapped/C_mtwrptzz$C_kbxvfdkb;m_wqbmlueb(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)I}
+       * @mapping {@literal named readInt Lnet/minecraft/nbt/NbtInt$C_kbxvfdkb;readInt(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)I}
        */
-      private static int m_wqbmlueb(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         arg.addBytes(12L);
-         return dataInput.readInt();
+      private static int readInt(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+         tracker.addBytes(12L);
+         return input.readInt();
       }
 
       /**
@@ -135,9 +136,9 @@
 
    /**
     * @mapping {@literal hashed m_xdzocrpj Lnet/minecraft/unmapped/C_mtwrptzz;m_xdzocrpj()Lnet/minecraft/unmapped/C_mtwrptzz;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtInt;copy()Lnet/minecraft/nbt/NbtInt;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtInt;shallowCopy()Lnet/minecraft/nbt/NbtInt;}
     */
-   public NbtInt copy() {
+   public NbtInt shallowCopy() {
       return this;
    }
 
diff -bur namedTargetSrc/net/minecraft/nbt/NbtIo.java namedSrc/net/minecraft/nbt/NbtIo.java
--- namedTargetSrc/net/minecraft/nbt/NbtIo.java	2024-08-08 16:16:37.690713466 +0000
+++ namedSrc/net/minecraft/nbt/NbtIo.java	2024-08-08 16:15:28.946425524 +0000
@@ -17,7 +17,7 @@
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 import net.minecraft.nbt.scanner.NbtScanner;
-import net.minecraft.unmapped.C_hydfible;
+import net.minecraft.util.DelegatingDataOutput;
 import net.minecraft.util.FastBufferedInputStream;
 import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashReport;
@@ -30,17 +30,18 @@
  */
 public class NbtIo {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zwmbytoi Lnet/minecraft/unmapped/C_plrkqquc;f_zwmbytoi:[Ljava/nio/file/OpenOption;}
+    * @mapping {@literal named OPEN_OPTIONS Lnet/minecraft/nbt/NbtIo;OPEN_OPTIONS:[Ljava/nio/file/OpenOption;}
     */
-   private static final OpenOption[] f_zwmbytoi = new OpenOption[]{
+   private static final OpenOption[] OPEN_OPTIONS = new OpenOption[]{
       StandardOpenOption.SYNC, StandardOpenOption.WRITE, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING
    };
 
    /**
     * @mapping {@literal hashed m_jsabavmz Lnet/minecraft/unmapped/C_plrkqquc;m_jsabavmz(Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih;}
-    * @mapping {@literal named m_jsabavmz Lnet/minecraft/nbt/NbtIo;m_jsabavmz(Ljava/nio/file/Path;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtCompound;}
+    * @mapping {@literal named readCompressed Lnet/minecraft/nbt/NbtIo;readCompressed(Ljava/nio/file/Path;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtCompound;}
     */
-   public static NbtCompound m_jsabavmz(Path path, NbtTagSizeTracker tracker) throws IOException {
+   public static NbtCompound readCompressed(Path path, NbtTagSizeTracker tracker) throws IOException {
       InputStream inputStream = Files.newInputStream(path);
 
       NbtCompound var4;
@@ -48,7 +49,7 @@
          InputStream inputStream2 = new FastBufferedInputStream(inputStream);
 
          try {
-            var4 = m_kyzyffmz(inputStream2, tracker);
+            var4 = readCompressed(inputStream2, tracker);
          } catch (Throwable var8) {
             try {
                inputStream2.close();
@@ -81,26 +82,26 @@
 
    /**
     * @mapping {@literal hashed m_hjflxsyo Lnet/minecraft/unmapped/C_plrkqquc;m_hjflxsyo(Ljava/io/InputStream;)Ljava/io/DataInputStream;}
-    * @mapping {@literal named m_hjflxsyo Lnet/minecraft/nbt/NbtIo;m_hjflxsyo(Ljava/io/InputStream;)Ljava/io/DataInputStream;}
+    * @mapping {@literal named decompress Lnet/minecraft/nbt/NbtIo;decompress(Ljava/io/InputStream;)Ljava/io/DataInputStream;}
     */
-   private static DataInputStream m_hjflxsyo(InputStream in) throws IOException {
+   private static DataInputStream decompress(InputStream in) throws IOException {
       return new DataInputStream(new FastBufferedInputStream(new GZIPInputStream(in)));
    }
 
    /**
     * @mapping {@literal hashed m_cvfqsgxo Lnet/minecraft/unmapped/C_plrkqquc;m_cvfqsgxo(Ljava/io/OutputStream;)Ljava/io/DataOutputStream;}
-    * @mapping {@literal named m_cvfqsgxo Lnet/minecraft/nbt/NbtIo;m_cvfqsgxo(Ljava/io/OutputStream;)Ljava/io/DataOutputStream;}
+    * @mapping {@literal named compress Lnet/minecraft/nbt/NbtIo;compress(Ljava/io/OutputStream;)Ljava/io/DataOutputStream;}
     */
-   private static DataOutputStream m_cvfqsgxo(OutputStream out) throws IOException {
+   private static DataOutputStream compress(OutputStream out) throws IOException {
       return new DataOutputStream(new BufferedOutputStream(new GZIPOutputStream(out)));
    }
 
    /**
     * @mapping {@literal hashed m_kyzyffmz Lnet/minecraft/unmapped/C_plrkqquc;m_kyzyffmz(Ljava/io/InputStream;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih;}
-    * @mapping {@literal named m_kyzyffmz Lnet/minecraft/nbt/NbtIo;m_kyzyffmz(Ljava/io/InputStream;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtCompound;}
+    * @mapping {@literal named readCompressed Lnet/minecraft/nbt/NbtIo;readCompressed(Ljava/io/InputStream;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtCompound;}
     */
-   public static NbtCompound m_kyzyffmz(InputStream in, NbtTagSizeTracker tracker) throws IOException {
-      DataInputStream dataInputStream = m_hjflxsyo(in);
+   public static NbtCompound readCompressed(InputStream in, NbtTagSizeTracker tracker) throws IOException {
+      DataInputStream dataInputStream = decompress(in);
 
       NbtCompound var3;
       try {
@@ -126,16 +127,16 @@
 
    /**
     * @mapping {@literal hashed m_mrabewpj Lnet/minecraft/unmapped/C_plrkqquc;m_mrabewpj(Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)V}
-    * @mapping {@literal named m_mrabewpj Lnet/minecraft/nbt/NbtIo;m_mrabewpj(Ljava/nio/file/Path;Lnet/minecraft/nbt/scanner/NbtScanner;Lnet/minecraft/nbt/NbtTagSizeTracker;)V}
+    * @mapping {@literal named parseCompressed Lnet/minecraft/nbt/NbtIo;parseCompressed(Ljava/nio/file/Path;Lnet/minecraft/nbt/scanner/NbtScanner;Lnet/minecraft/nbt/NbtTagSizeTracker;)V}
     */
-   public static void m_mrabewpj(Path path, NbtScanner visitor, NbtTagSizeTracker arg2) throws IOException {
+   public static void parseCompressed(Path path, NbtScanner visitor, NbtTagSizeTracker tracker) throws IOException {
       InputStream inputStream = Files.newInputStream(path);
 
       try {
          InputStream inputStream2 = new FastBufferedInputStream(inputStream);
 
          try {
-            m_voryzjqe(inputStream2, visitor, arg2);
+            parseCompressed(inputStream2, visitor, tracker);
          } catch (Throwable var9) {
             try {
                inputStream2.close();
@@ -166,13 +167,13 @@
 
    /**
     * @mapping {@literal hashed m_voryzjqe Lnet/minecraft/unmapped/C_plrkqquc;m_voryzjqe(Ljava/io/InputStream;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)V}
-    * @mapping {@literal named m_voryzjqe Lnet/minecraft/nbt/NbtIo;m_voryzjqe(Ljava/io/InputStream;Lnet/minecraft/nbt/scanner/NbtScanner;Lnet/minecraft/nbt/NbtTagSizeTracker;)V}
+    * @mapping {@literal named parseCompressed Lnet/minecraft/nbt/NbtIo;parseCompressed(Ljava/io/InputStream;Lnet/minecraft/nbt/scanner/NbtScanner;Lnet/minecraft/nbt/NbtTagSizeTracker;)V}
     */
-   public static void m_voryzjqe(InputStream in, NbtScanner visitor, NbtTagSizeTracker arg2) throws IOException {
-      DataInputStream dataInputStream = m_hjflxsyo(in);
+   public static void parseCompressed(InputStream in, NbtScanner visitor, NbtTagSizeTracker tracker) throws IOException {
+      DataInputStream dataInputStream = decompress(in);
 
       try {
-         read(dataInputStream, visitor, arg2);
+         read(dataInputStream, visitor, tracker);
       } catch (Throwable var7) {
          if (dataInputStream != null) {
             try {
@@ -195,7 +196,7 @@
     * @mapping {@literal named writeCompressed Lnet/minecraft/nbt/NbtIo;writeCompressed(Lnet/minecraft/nbt/NbtCompound;Ljava/nio/file/Path;)V}
     */
    public static void writeCompressed(NbtCompound compound, Path path) throws IOException {
-      OutputStream outputStream = Files.newOutputStream(path, f_zwmbytoi);
+      OutputStream outputStream = Files.newOutputStream(path, OPEN_OPTIONS);
 
       try {
          OutputStream outputStream2 = new BufferedOutputStream(outputStream);
@@ -235,7 +236,7 @@
     * @mapping {@literal named writeCompressed Lnet/minecraft/nbt/NbtIo;writeCompressed(Lnet/minecraft/nbt/NbtCompound;Ljava/io/OutputStream;)V}
     */
    public static void writeCompressed(NbtCompound compound, OutputStream stream) throws IOException {
-      DataOutputStream dataOutputStream = m_cvfqsgxo(stream);
+      DataOutputStream dataOutputStream = compress(stream);
 
       try {
          write(compound, dataOutputStream);
@@ -258,10 +259,10 @@
 
    /**
     * @mapping {@literal hashed m_kfuaemox Lnet/minecraft/unmapped/C_plrkqquc;m_kfuaemox(Lnet/minecraft/unmapped/C_hhlwcnih;Ljava/nio/file/Path;)V}
-    * @mapping {@literal named m_kfuaemox Lnet/minecraft/nbt/NbtIo;m_kfuaemox(Lnet/minecraft/nbt/NbtCompound;Ljava/nio/file/Path;)V}
+    * @mapping {@literal named write Lnet/minecraft/nbt/NbtIo;write(Lnet/minecraft/nbt/NbtCompound;Ljava/nio/file/Path;)V}
     */
-   public static void m_kfuaemox(NbtCompound compound, Path path) throws IOException {
-      OutputStream outputStream = Files.newOutputStream(path, f_zwmbytoi);
+   public static void write(NbtCompound compound, Path path) throws IOException {
+      OutputStream outputStream = Files.newOutputStream(path, OPEN_OPTIONS);
 
       try {
          OutputStream outputStream2 = new BufferedOutputStream(outputStream);
@@ -311,10 +312,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_lwpolkuf Lnet/minecraft/unmapped/C_plrkqquc;m_lwpolkuf(Ljava/nio/file/Path;)Lnet/minecraft/unmapped/C_hhlwcnih;}
+    * @mapping {@literal named read Lnet/minecraft/nbt/NbtIo;read(Ljava/nio/file/Path;)Lnet/minecraft/nbt/NbtCompound;}
     */
    @Nullable
-   public static NbtCompound m_lwpolkuf(Path path) throws IOException {
+   public static NbtCompound read(Path path) throws IOException {
       if (!Files.exists(path, new LinkOption[0])) {
          return null;
       } else {
@@ -370,7 +372,7 @@
     * @mapping {@literal named read Lnet/minecraft/nbt/NbtIo;read(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtCompound;}
     */
    public static NbtCompound read(DataInput input, NbtTagSizeTracker tracker) throws IOException {
-      NbtElement lv = m_lvarbmqk(input, tracker);
+      NbtElement lv = readElement(input, tracker);
       if (lv instanceof NbtCompound) {
          return (NbtCompound)lv;
       } else {
@@ -383,52 +385,52 @@
     * @mapping {@literal named write Lnet/minecraft/nbt/NbtIo;write(Lnet/minecraft/nbt/NbtCompound;Ljava/io/DataOutput;)V}
     */
    public static void write(NbtCompound compound, DataOutput output) throws IOException {
-      m_yicwdxov(compound, output);
+      writeWithFallback(compound, output);
    }
 
    /**
     * @mapping {@literal hashed m_rqnlssft Lnet/minecraft/unmapped/C_plrkqquc;m_rqnlssft(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)V}
     * @mapping {@literal named read Lnet/minecraft/nbt/NbtIo;read(Ljava/io/DataInput;Lnet/minecraft/nbt/scanner/NbtScanner;Lnet/minecraft/nbt/NbtTagSizeTracker;)V}
     */
-   public static void read(DataInput input, NbtScanner visitor, NbtTagSizeTracker arg2) throws IOException {
+   public static void read(DataInput input, NbtScanner visitor, NbtTagSizeTracker tracker) throws IOException {
       NbtType<?> lv = NbtTypes.byId(input.readByte());
       if (lv == NbtNull.TYPE) {
-         if (visitor.start(NbtNull.TYPE) == NbtScanner.Result.f_drwmzuin) {
+         if (visitor.start(NbtNull.TYPE) == NbtScanner.Result.CONTINUE) {
             visitor.visitNull();
          }
       } else {
          switch (visitor.start(lv)) {
-            case f_kpjgfhsy:
+            case HALT:
             default:
                break;
-            case f_irsnidyo:
+            case BREAK:
                NbtString.skipString(input);
-               lv.skip(input, arg2);
+               lv.skip(input, tracker);
                break;
-            case f_drwmzuin:
+            case CONTINUE:
                NbtString.skipString(input);
-               lv.doAccept(input, visitor, arg2);
+               lv.doAccept(input, visitor, tracker);
          }
       }
    }
 
    /**
     * @mapping {@literal hashed m_qmknfifn Lnet/minecraft/unmapped/C_plrkqquc;m_qmknfifn(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb;}
-    * @mapping {@literal named m_qmknfifn Lnet/minecraft/nbt/NbtIo;m_qmknfifn(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtElement;}
+    * @mapping {@literal named readAnyElement Lnet/minecraft/nbt/NbtIo;readAnyElement(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtElement;}
     */
-   public static NbtElement m_qmknfifn(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+   public static NbtElement readAnyElement(DataInput input, NbtTagSizeTracker tracker) throws IOException {
       byte b = input.readByte();
-      return (NbtElement)(b == 0 ? NbtNull.INSTANCE : m_jguziyiy(input, tracker, b));
+      return (NbtElement)(b == 0 ? NbtNull.INSTANCE : readElement(input, tracker, b));
    }
 
    /**
     * @mapping {@literal hashed m_dxxrvgvk Lnet/minecraft/unmapped/C_plrkqquc;m_dxxrvgvk(Lnet/minecraft/unmapped/C_oivssbvb;Ljava/io/DataOutput;)V}
-    * @mapping {@literal named m_dxxrvgvk Lnet/minecraft/nbt/NbtIo;m_dxxrvgvk(Lnet/minecraft/nbt/NbtElement;Ljava/io/DataOutput;)V}
+    * @mapping {@literal named writeAnyElement Lnet/minecraft/nbt/NbtIo;writeAnyElement(Lnet/minecraft/nbt/NbtElement;Ljava/io/DataOutput;)V}
     */
-   public static void m_dxxrvgvk(NbtElement arg, DataOutput output) throws IOException {
-      output.writeByte(arg.getType());
-      if (arg.getType() != 0) {
-         arg.write(output);
+   public static void writeAnyElement(NbtElement element, DataOutput output) throws IOException {
+      output.writeByte(element.getType());
+      if (element.getType() != 0) {
+         element.write(output);
       }
    }
 
@@ -446,31 +448,31 @@
 
    /**
     * @mapping {@literal hashed m_yicwdxov Lnet/minecraft/unmapped/C_plrkqquc;m_yicwdxov(Lnet/minecraft/unmapped/C_oivssbvb;Ljava/io/DataOutput;)V}
-    * @mapping {@literal named m_yicwdxov Lnet/minecraft/nbt/NbtIo;m_yicwdxov(Lnet/minecraft/nbt/NbtElement;Ljava/io/DataOutput;)V}
+    * @mapping {@literal named writeWithFallback Lnet/minecraft/nbt/NbtIo;writeWithFallback(Lnet/minecraft/nbt/NbtElement;Ljava/io/DataOutput;)V}
     */
-   public static void m_yicwdxov(NbtElement nbt, DataOutput dataOutput) throws IOException {
-      write(nbt, new NbtIo.C_wbbhdkdn(dataOutput));
+   public static void writeWithFallback(NbtElement nbt, DataOutput output) throws IOException {
+      write(nbt, new NbtIo.StringFallbackDataOutput(output));
    }
 
    /**
     * @mapping {@literal hashed m_lvarbmqk Lnet/minecraft/unmapped/C_plrkqquc;m_lvarbmqk(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_oivssbvb;}
-    * @mapping {@literal named m_lvarbmqk Lnet/minecraft/nbt/NbtIo;m_lvarbmqk(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtElement;}
+    * @mapping {@literal named readElement Lnet/minecraft/nbt/NbtIo;readElement(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtElement;}
     */
-   private static NbtElement m_lvarbmqk(DataInput dataInput, NbtTagSizeTracker tracker) throws IOException {
-      byte b = dataInput.readByte();
+   private static NbtElement readElement(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      byte b = input.readByte();
       if (b == 0) {
          return NbtNull.INSTANCE;
       } else {
-         NbtString.skipString(dataInput);
-         return m_jguziyiy(dataInput, tracker, b);
+         NbtString.skipString(input);
+         return readElement(input, tracker, b);
       }
    }
 
    /**
     * @mapping {@literal hashed m_jguziyiy Lnet/minecraft/unmapped/C_plrkqquc;m_jguziyiy(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;B)Lnet/minecraft/unmapped/C_oivssbvb;}
-    * @mapping {@literal named m_jguziyiy Lnet/minecraft/nbt/NbtIo;m_jguziyiy(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;B)Lnet/minecraft/nbt/NbtElement;}
+    * @mapping {@literal named readElement Lnet/minecraft/nbt/NbtIo;readElement(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;B)Lnet/minecraft/nbt/NbtElement;}
     */
-   private static NbtElement m_jguziyiy(DataInput input, NbtTagSizeTracker tracker, byte id) {
+   private static NbtElement readElement(DataInput input, NbtTagSizeTracker tracker, byte id) {
       try {
          return NbtTypes.byId(id).read(input, tracker);
       } catch (IOException var6) {
@@ -483,13 +485,13 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_plrkqquc$C_wbbhdkdn}
-    * @mapping {@literal named net/minecraft/nbt/NbtIo$C_wbbhdkdn}
+    * @mapping {@literal named net/minecraft/nbt/NbtIo$StringFallbackDataOutput}
     */
-   public static class C_wbbhdkdn extends C_hydfible {
+   public static class StringFallbackDataOutput extends DelegatingDataOutput {
       /**
        * Mapping not found
        */
-      public C_wbbhdkdn(DataOutput dataOutput) {
+      public StringFallbackDataOutput(DataOutput dataOutput) {
          super(dataOutput);
       }

github-actions · 2024-08-08T16:16:40Z

View the diff here (2/3):

diff -bur namedTargetSrc/net/minecraft/nbt/NbtList.java namedSrc/net/minecraft/nbt/NbtList.java
--- namedTargetSrc/net/minecraft/nbt/NbtList.java	2024-08-08 16:16:37.782713852 +0000
+++ namedSrc/net/minecraft/nbt/NbtList.java	2024-08-08 16:15:29.070426040 +0000
@@ -10,7 +10,6 @@
 import java.util.Objects;
 import net.minecraft.nbt.scanner.NbtScanner;
 import net.minecraft.nbt.visitor.NbtElementVisitor;
-import net.minecraft.unmapped.C_prxxuhrw;
 
 /**
  * Represents an NBT list.
@@ -24,9 +23,10 @@
  */
 public class NbtList extends AbstractNbtList<NbtElement> {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_carzcmxv Lnet/minecraft/unmapped/C_hqhtfwlr;f_carzcmxv:I}
+    * @mapping {@literal named SIZE Lnet/minecraft/nbt/NbtList;SIZE:I}
     */
-   private static final int f_carzcmxv = 37;
+   private static final int SIZE = 37;
    /**
     * @mapping {@literal hashed f_zntedfnn Lnet/minecraft/unmapped/C_hqhtfwlr;f_zntedfnn:Lnet/minecraft/unmapped/C_ueidorcc;}
     * @mapping {@literal named TYPE Lnet/minecraft/nbt/NbtList;TYPE:Lnet/minecraft/nbt/NbtType;}
@@ -41,7 +41,7 @@
 
          NbtList var3;
          try {
-            var3 = m_ticywlad(dataInput, arg);
+            var3 = parseList(dataInput, arg);
          } finally {
             arg.popDepth();
          }
@@ -50,21 +50,22 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_ticywlad Lnet/minecraft/unmapped/C_hqhtfwlr$C_bicgwqxa;m_ticywlad(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hqhtfwlr;}
+       * @mapping {@literal named parseList Lnet/minecraft/nbt/NbtList$C_bicgwqxa;parseList(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtList;}
        */
-      private static NbtList m_ticywlad(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         arg.addBytes(37L);
-         byte b = dataInput.readByte();
-         int i = dataInput.readInt();
+      private static NbtList parseList(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+         tracker.addBytes(37L);
+         byte b = input.readByte();
+         int i = input.readInt();
          if (b == 0 && i > 0) {
-            throw new C_prxxuhrw("Missing type on ListTag");
+            throw new NbtFormatException("Missing type on ListTag");
          } else {
-            arg.addBytes(4L, (long)i);
+            tracker.addBytes(4L, (long)i);
             NbtType<?> lv = NbtTypes.byId(b);
             List<NbtElement> list = Lists.<NbtElement>newArrayListWithCapacity(i);
 
             for (int j = 0; j < i; j++) {
-               list.add(lv.read(dataInput, arg));
+               list.add(lv.read(input, tracker));
             }
 
             return new NbtList(list, b);
@@ -80,7 +81,7 @@
 
          NbtScanner.Result var4;
          try {
-            var4 = m_abkyninv(input, scanner, tracker);
+            var4 = parseList(input, scanner, tracker);
          } finally {
             tracker.popDepth();
          }
@@ -89,39 +90,40 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_abkyninv Lnet/minecraft/unmapped/C_hqhtfwlr$C_bicgwqxa;m_abkyninv(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;}
+       * @mapping {@literal named parseList Lnet/minecraft/nbt/NbtList$C_bicgwqxa;parseList(Ljava/io/DataInput;Lnet/minecraft/nbt/scanner/NbtScanner;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/scanner/NbtScanner$Result;}
        */
-      private static NbtScanner.Result m_abkyninv(DataInput dataInput, NbtScanner arg, NbtTagSizeTracker arg2) throws IOException {
-         arg2.addBytes(37L);
-         NbtType<?> lv = NbtTypes.byId(dataInput.readByte());
-         int i = dataInput.readInt();
-         switch (arg.visitListMeta(lv, i)) {
-            case f_kpjgfhsy:
-               return NbtScanner.Result.f_kpjgfhsy;
-            case f_irsnidyo:
-               lv.m_lcnankcv(dataInput, i, arg2);
-               return arg.endNested();
+      private static NbtScanner.Result parseList(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
+         tracker.addBytes(37L);
+         NbtType<?> lv = NbtTypes.byId(input.readByte());
+         int i = input.readInt();
+         switch (scanner.visitListMeta(lv, i)) {
+            case HALT:
+               return NbtScanner.Result.HALT;
+            case BREAK:
+               lv.skip(input, i, tracker);
+               return scanner.endNested();
             default:
-               arg2.addBytes(4L, (long)i);
+               tracker.addBytes(4L, (long)i);
                int j = 0;
 
                while (true) {
                   label41: {
                      if (j < i) {
-                        switch (arg.startListItem(lv, j)) {
-                           case f_pkgsxrgf:
-                              return NbtScanner.Result.f_kpjgfhsy;
-                           case f_qhflrpze:
-                              lv.skip(dataInput, arg2);
+                        switch (scanner.startListItem(lv, j)) {
+                           case HALT:
+                              return NbtScanner.Result.HALT;
+                           case BREAK:
+                              lv.skip(input, tracker);
                               break;
-                           case f_lpjmwtad:
-                              lv.skip(dataInput, arg2);
+                           case SKIP:
+                              lv.skip(input, tracker);
                               break label41;
                            default:
-                              switch (lv.doAccept(dataInput, arg, arg2)) {
-                                 case f_kpjgfhsy:
-                                    return NbtScanner.Result.f_kpjgfhsy;
-                                 case f_irsnidyo:
+                              switch (lv.doAccept(input, scanner, tracker)) {
+                                 case HALT:
+                                    return NbtScanner.Result.HALT;
+                                 case BREAK:
                                     break;
                                  default:
                                     break label41;
@@ -131,10 +133,10 @@
 
                      int k = i - 1 - j;
                      if (k > 0) {
-                        lv.m_lcnankcv(dataInput, k, arg2);
+                        lv.skip(input, k, tracker);
                      }
 
-                     return arg.endNested();
+                     return scanner.endNested();
                   }
 
                   j++;
@@ -152,7 +154,7 @@
          try {
             NbtType<?> lv = NbtTypes.byId(input.readByte());
             int i = input.readInt();
-            lv.m_lcnankcv(input, i, tracker);
+            lv.skip(input, i, tracker);
          } finally {
             tracker.popDepth();
          }
@@ -505,12 +507,12 @@
 
    /**
     * @mapping {@literal hashed m_szelysgh Lnet/minecraft/unmapped/C_hqhtfwlr;m_szelysgh()Lnet/minecraft/unmapped/C_hqhtfwlr;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtList;copy()Lnet/minecraft/nbt/NbtList;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtList;shallowCopy()Lnet/minecraft/nbt/NbtList;}
     */
-   public NbtList copy() {
+   public NbtList shallowCopy() {
       Iterable<NbtElement> iterable = (Iterable<NbtElement>)(NbtTypes.byId(this.type).isImmutable()
          ? this.value
-         : Iterables.transform(this.value, NbtElement::copy));
+         : Iterables.transform(this.value, NbtElement::shallowCopy));
       List<NbtElement> list = Lists.<NbtElement>newArrayList(iterable);
       return new NbtList(list, this.type);
    }
@@ -561,9 +563,9 @@
    @Override
    public NbtScanner.Result scan(NbtScanner scanner) {
       switch (scanner.visitListMeta(NbtTypes.byId(this.type), this.value.size())) {
-         case f_kpjgfhsy:
-            return NbtScanner.Result.f_kpjgfhsy;
-         case f_irsnidyo:
+         case HALT:
+            return NbtScanner.Result.HALT;
+         case BREAK:
             return scanner.endNested();
          default:
             int i = 0;
@@ -571,18 +573,18 @@
             while (i < this.value.size()) {
                NbtElement lv = (NbtElement)this.value.get(i);
                switch (scanner.startListItem(lv.getNbtType(), i)) {
-                  case f_pkgsxrgf:
-                     return NbtScanner.Result.f_kpjgfhsy;
-                  case f_qhflrpze:
+                  case HALT:
+                     return NbtScanner.Result.HALT;
+                  case BREAK:
                      return scanner.endNested();
                   default:
                      switch (lv.scan(scanner)) {
-                        case f_kpjgfhsy:
-                           return NbtScanner.Result.f_kpjgfhsy;
-                        case f_irsnidyo:
+                        case HALT:
+                           return NbtScanner.Result.HALT;
+                        case BREAK:
                            return scanner.endNested();
                      }
-                  case f_lpjmwtad:
+                  case SKIP:
                      i++;
                }
             }
diff -bur namedTargetSrc/net/minecraft/nbt/NbtLongArray.java namedSrc/net/minecraft/nbt/NbtLongArray.java
--- namedTargetSrc/net/minecraft/nbt/NbtLongArray.java	2024-08-08 16:16:37.698713500 +0000
+++ namedSrc/net/minecraft/nbt/NbtLongArray.java	2024-08-08 16:15:28.954425557 +0000
@@ -32,7 +32,7 @@
        * @mapping {@literal named read Lnet/minecraft/nbt/NbtLongArray$C_rrrssqiv;read(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtLongArray;}
        */
       public NbtLongArray read(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         return new NbtLongArray(m_bsmidfhx(dataInput, arg));
+         return new NbtLongArray(readArray(dataInput, arg));
       }
 
       /**
@@ -40,14 +40,14 @@
        */
       @Override
       public NbtScanner.Result doAccept(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
-         return scanner.visitLongArray(m_bsmidfhx(input, tracker));
+         return scanner.visitLongArray(readArray(input, tracker));
       }
 
       /**
        * @mapping {@literal hashed m_bsmidfhx Lnet/minecraft/unmapped/C_ojdqftoi$C_rrrssqiv;m_bsmidfhx(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[J}
-       * @mapping {@literal named m_bsmidfhx Lnet/minecraft/nbt/NbtLongArray$C_rrrssqiv;m_bsmidfhx(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)[J}
+       * @mapping {@literal named readArray Lnet/minecraft/nbt/NbtLongArray$C_rrrssqiv;readArray(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)[J}
        */
-      private static long[] m_bsmidfhx(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      private static long[] readArray(DataInput input, NbtTagSizeTracker tracker) throws IOException {
          tracker.addBytes(24L);
          int i = input.readInt();
          tracker.addBytes(8L, (long)i);
@@ -175,9 +175,9 @@
 
    /**
     * @mapping {@literal hashed m_epguossd Lnet/minecraft/unmapped/C_ojdqftoi;m_epguossd()Lnet/minecraft/unmapped/C_ojdqftoi;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtLongArray;copy()Lnet/minecraft/nbt/NbtLongArray;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtLongArray;shallowCopy()Lnet/minecraft/nbt/NbtLongArray;}
     */
-   public NbtLongArray copy() {
+   public NbtLongArray shallowCopy() {
       long[] ls = new long[this.value.length];
       System.arraycopy(this.value, 0, ls, 0, this.value.length);
       return new NbtLongArray(ls);
diff -bur namedTargetSrc/net/minecraft/nbt/NbtLong.java namedSrc/net/minecraft/nbt/NbtLong.java
--- namedTargetSrc/net/minecraft/nbt/NbtLong.java	2024-08-08 16:16:37.770713801 +0000
+++ namedSrc/net/minecraft/nbt/NbtLong.java	2024-08-08 16:15:29.054425974 +0000
@@ -28,7 +28,7 @@
        * @mapping {@literal named read Lnet/minecraft/nbt/NbtLong$C_jxppaniz;read(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtLong;}
        */
       public NbtLong read(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         return NbtLong.of(m_tkntekub(dataInput, arg));
+         return NbtLong.of(readLong(dataInput, arg));
       }
 
       /**
@@ -36,14 +36,14 @@
        */
       @Override
       public NbtScanner.Result doAccept(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
-         return scanner.visitLong(m_tkntekub(input, tracker));
+         return scanner.visitLong(readLong(input, tracker));
       }
 
       /**
        * @mapping {@literal hashed m_tkntekub Lnet/minecraft/unmapped/C_mbybaqku$C_jxppaniz;m_tkntekub(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)J}
-       * @mapping {@literal named m_tkntekub Lnet/minecraft/nbt/NbtLong$C_jxppaniz;m_tkntekub(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)J}
+       * @mapping {@literal named readLong Lnet/minecraft/nbt/NbtLong$C_jxppaniz;readLong(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)J}
        */
-      private static long m_tkntekub(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      private static long readLong(DataInput input, NbtTagSizeTracker tracker) throws IOException {
          tracker.addBytes(16L);
          return input.readLong();
       }
@@ -136,9 +136,9 @@
 
    /**
     * @mapping {@literal hashed m_rrdrtvul Lnet/minecraft/unmapped/C_mbybaqku;m_rrdrtvul()Lnet/minecraft/unmapped/C_mbybaqku;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtLong;copy()Lnet/minecraft/nbt/NbtLong;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtLong;shallowCopy()Lnet/minecraft/nbt/NbtLong;}
     */
-   public NbtLong copy() {
+   public NbtLong shallowCopy() {
       return this;
    }
 
diff -bur namedTargetSrc/net/minecraft/nbt/NbtNull.java namedSrc/net/minecraft/nbt/NbtNull.java
--- namedTargetSrc/net/minecraft/nbt/NbtNull.java	2024-08-08 16:16:37.946714539 +0000
+++ namedSrc/net/minecraft/nbt/NbtNull.java	2024-08-08 16:15:29.222426672 +0000
@@ -48,7 +48,7 @@
        * Mapping not found
        */
       @Override
-      public void m_lcnankcv(DataInput dataInput, int i, NbtTagSizeTracker arg) {
+      public void skip(DataInput input, int count, NbtTagSizeTracker tracker) {
       }
 
       /**
@@ -135,9 +135,9 @@
 
    /**
     * @mapping {@literal hashed m_txxohsdr Lnet/minecraft/unmapped/C_einrauol;m_txxohsdr()Lnet/minecraft/unmapped/C_einrauol;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtNull;copy()Lnet/minecraft/nbt/NbtNull;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtNull;shallowCopy()Lnet/minecraft/nbt/NbtNull;}
     */
-   public NbtNull copy() {
+   public NbtNull shallowCopy() {
       return this;
    }
 
diff -bur namedTargetSrc/net/minecraft/nbt/NbtOps.java namedSrc/net/minecraft/nbt/NbtOps.java
--- namedTargetSrc/net/minecraft/nbt/NbtOps.java	2024-08-08 16:16:37.698713500 +0000
+++ namedSrc/net/minecraft/nbt/NbtOps.java	2024-08-08 16:15:28.954425557 +0000
@@ -55,9 +55,10 @@
     */
    public static final NbtOps INSTANCE = new NbtOps();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zjvitncb Lnet/minecraft/unmapped/C_fybaywjo;f_zjvitncb:Ljava/lang/String;}
+    * @mapping {@literal named MARKER_KEY Lnet/minecraft/nbt/NbtOps;MARKER_KEY:Ljava/lang/String;}
     */
-   private static final String f_zjvitncb = "";
+   private static final String MARKER_KEY = "";
 
    /**
     * Mapping not found
@@ -189,8 +190,8 @@
     * @mapping {@literal named mergeToList Lnet/minecraft/nbt/NbtOps;mergeToList(Lnet/minecraft/nbt/NbtElement;Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;}
     */
    public DataResult<NbtElement> mergeToList(NbtElement arg, NbtElement arg2) {
-      return (DataResult<NbtElement>)m_vpbkfzmz(arg)
-         .map(arg2x -> DataResult.success(arg2x.m_berihwml(arg2).m_mlztdcvi()))
+      return (DataResult<NbtElement>)createCollector(arg)
+         .map(arg2x -> DataResult.success(arg2x.accept(arg2).getResult()))
          .orElseGet(() -> DataResult.error(() -> "mergeToList called with not a list: " + arg, arg));
    }
 
@@ -199,8 +200,8 @@
     * @mapping {@literal named mergeToList Lnet/minecraft/nbt/NbtOps;mergeToList(Lnet/minecraft/nbt/NbtElement;Ljava/util/List;)Lcom/mojang/serialization/DataResult;}
     */
    public DataResult<NbtElement> mergeToList(NbtElement arg, List<NbtElement> list) {
-      return (DataResult<NbtElement>)m_vpbkfzmz(arg)
-         .map(argx -> DataResult.success(argx.m_fjtdnzmx(list).m_mlztdcvi()))
+      return (DataResult<NbtElement>)createCollector(arg)
+         .map(argx -> DataResult.success(argx.accept(list).getResult()))
          .orElseGet(() -> DataResult.error(() -> "mergeToList called with not a list: " + arg, arg));
    }
 
@@ -214,7 +215,7 @@
       } else if (!(arg2 instanceof NbtString)) {
          return DataResult.error(() -> "key is not a string: " + arg2, arg);
       } else {
-         NbtCompound lv2 = arg instanceof NbtCompound lv ? lv.m_poylyjba() : new NbtCompound();
+         NbtCompound lv2 = arg instanceof NbtCompound lv ? lv.createNbt() : new NbtCompound();
          lv2.put(arg2.asString(), arg3);
          return DataResult.success(lv2);
       }
@@ -228,7 +229,7 @@
       if (!(arg instanceof NbtCompound) && !(arg instanceof NbtNull)) {
          return DataResult.error(() -> "mergeToMap called with not a map: " + arg, arg);
       } else {
-         NbtCompound lv2 = arg instanceof NbtCompound lv ? lv.m_poylyjba() : new NbtCompound();
+         NbtCompound lv2 = arg instanceof NbtCompound lv ? lv.createNbt() : new NbtCompound();
          List<NbtElement> list = new ArrayList();
          mapLike.entries().forEach(pair -> {
             NbtElement lvx = (NbtElement)pair.getFirst();
@@ -250,7 +251,7 @@
       if (!(arg instanceof NbtCompound) && !(arg instanceof NbtNull)) {
          return DataResult.error(() -> "mergeToMap called with not a map: " + arg, arg);
       } else {
-         NbtCompound lv2 = arg instanceof NbtCompound lv ? lv.m_poylyjba() : new NbtCompound();
+         NbtCompound lv2 = arg instanceof NbtCompound lv ? lv.createNbt() : new NbtCompound();
          List<NbtElement> list = new ArrayList();
 
          for (Entry<NbtElement, NbtElement> entry : map.entrySet()) {
@@ -272,7 +273,7 @@
     */
    public DataResult<Stream<Pair<NbtElement, NbtElement>>> getMapValues(NbtElement arg) {
       return arg instanceof NbtCompound lv
-         ? DataResult.success(lv.m_smzpndim().stream().map(entry -> Pair.of(this.createString((String)entry.getKey()), (NbtElement)entry.getValue())))
+         ? DataResult.success(lv.getEntries().stream().map(entry -> Pair.of(this.createString((String)entry.getKey()), (NbtElement)entry.getValue())))
          : DataResult.error(() -> "Not a map: " + arg);
    }
 
@@ -282,7 +283,7 @@
     */
    public DataResult<Consumer<BiConsumer<NbtElement, NbtElement>>> getMapEntries(NbtElement arg) {
       return arg instanceof NbtCompound lv ? DataResult.success(biConsumer -> {
-         for (Entry<String, NbtElement> entry : lv.m_smzpndim()) {
+         for (Entry<String, NbtElement> entry : lv.getEntries()) {
             biConsumer.accept(this.createString((String)entry.getKey()), (NbtElement)entry.getValue());
          }
       }) : DataResult.error(() -> "Not a map: " + arg);
@@ -315,11 +316,12 @@
                }
 
                /**
-                * Mapping not found
+                * @mapping {@literal hashed entries Lnet/minecraft/unmapped/C_fybaywjo$C_yartmlgv;entries()Ljava/util/stream/Stream;}
+                * @mapping {@literal named entries Lnet/minecraft/nbt/NbtOps$C_yartmlgv;entries()Ljava/util/stream/Stream;}
                 */
                @Override
                public Stream<Pair<NbtElement, NbtElement>> entries() {
-                  return lv.m_smzpndim().stream().map(entry -> Pair.of(NbtOps.this.createString((String)entry.getKey()), (NbtElement)entry.getValue()));
+                  return lv.getEntries().stream().map(entry -> Pair.of(NbtOps.this.createString((String)entry.getKey()), (NbtElement)entry.getValue()));
                }
 
                /**
@@ -344,17 +346,18 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kvzwcnej Lnet/minecraft/unmapped/C_fybaywjo;m_kvzwcnej(Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_oivssbvb;}
+    * @mapping {@literal named tryUnwrap Lnet/minecraft/nbt/NbtOps;tryUnwrap(Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/nbt/NbtElement;}
     */
-   private static NbtElement m_kvzwcnej(NbtCompound arg) {
-      if (arg.getSize() == 1) {
-         NbtElement lv = arg.get("");
+   private static NbtElement tryUnwrap(NbtCompound nbt) {
+      if (nbt.getSize() == 1) {
+         NbtElement lv = nbt.get("");
          if (lv != null) {
             return lv;
          }
       }
 
-      return arg;
+      return nbt;
    }
 
    /**
@@ -364,7 +367,7 @@
    public DataResult<Stream<NbtElement>> getStream(NbtElement arg) {
       if (arg instanceof NbtList lv) {
          return lv.getHeldType() == NbtElement.COMPOUND_TYPE
-            ? DataResult.success(lv.stream().map(argx -> m_kvzwcnej((NbtCompound)argx)))
+            ? DataResult.success(lv.stream().map(argx -> tryUnwrap((NbtCompound)argx)))
             : DataResult.success(lv.stream());
       } else {
          return arg instanceof AbstractNbtList<?> lv2 ? DataResult.success(lv2.stream().map(argx -> argx)) : DataResult.error(() -> "Not a list");
@@ -379,7 +382,7 @@
       if (arg instanceof NbtList lv) {
          return lv.getHeldType() == NbtElement.COMPOUND_TYPE ? DataResult.success(consumer -> {
             for (NbtElement lvx : lv) {
-               consumer.accept(m_kvzwcnej((NbtCompound)lvx));
+               consumer.accept(tryUnwrap((NbtCompound)lvx));
             }
          }) : DataResult.success(lv::forEach);
       } else {
@@ -443,7 +446,7 @@
     * @mapping {@literal named createList Lnet/minecraft/nbt/NbtOps;createList(Ljava/util/stream/Stream;)Lnet/minecraft/nbt/NbtElement;}
     */
    public NbtElement createList(Stream<NbtElement> stream) {
-      return NbtOps.C_lrggpudd.f_oknzgzfq.m_gxpktbdp(stream).m_mlztdcvi();
+      return NbtOps.DelegatingListCollector.INSTANCE.accept(stream).getResult();
    }
 
    /**
@@ -452,7 +455,7 @@
     */
    public NbtElement remove(NbtElement arg, String string) {
       if (arg instanceof NbtCompound lv) {
-         NbtCompound lv2 = lv.m_poylyjba();
+         NbtCompound lv2 = lv.createNbt();
          lv2.remove(string);
          return lv2;
       } else {
@@ -477,35 +480,36 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vpbkfzmz Lnet/minecraft/unmapped/C_fybaywjo;m_vpbkfzmz(Lnet/minecraft/unmapped/C_oivssbvb;)Ljava/util/Optional;}
+    * @mapping {@literal named createCollector Lnet/minecraft/nbt/NbtOps;createCollector(Lnet/minecraft/nbt/NbtElement;)Ljava/util/Optional;}
     */
-   private static Optional<NbtOps.C_nehsnwyp> m_vpbkfzmz(NbtElement arg) {
-      if (arg instanceof NbtNull) {
-         return Optional.of(NbtOps.C_lrggpudd.f_oknzgzfq);
+   private static Optional<NbtOps.ListCollector> createCollector(NbtElement element) {
+      if (element instanceof NbtNull) {
+         return Optional.of(NbtOps.DelegatingListCollector.INSTANCE);
       } else {
-         if (arg instanceof AbstractNbtList<?> lv) {
+         if (element instanceof AbstractNbtList<?> lv) {
             if (lv.isEmpty()) {
-               return Optional.of(NbtOps.C_lrggpudd.f_oknzgzfq);
+               return Optional.of(NbtOps.DelegatingListCollector.INSTANCE);
             }
 
             if (lv instanceof NbtList lv2) {
                return switch (lv2.getHeldType()) {
-                  case 0 -> Optional.of(NbtOps.C_lrggpudd.f_oknzgzfq);
-                  case 10 -> Optional.of(new NbtOps.C_zcsovcmj(lv2));
-                  default -> Optional.of(new NbtOps.C_cfjsyyyh(lv2));
+                  case 0 -> Optional.of(NbtOps.DelegatingListCollector.INSTANCE);
+                  case 10 -> Optional.of(new NbtOps.WrappingListCollector(lv2));
+                  default -> Optional.of(new NbtOps.SimpleListCollector(lv2));
                };
             }
 
             if (lv instanceof NbtByteArray lv3) {
-               return Optional.of(new NbtOps.C_cpsqmvih(lv3.getByteArray()));
+               return Optional.of(new NbtOps.ByteListCollector(lv3.getByteArray()));
             }
 
             if (lv instanceof NbtIntArray lv4) {
-               return Optional.of(new NbtOps.C_rkolbfzv(lv4.getIntArray()));
+               return Optional.of(new NbtOps.IntListCollector(lv4.getIntArray()));
             }
 
             if (lv instanceof NbtLongArray lv5) {
-               return Optional.of(new NbtOps.C_dwkvaauw(lv5.getLongArray()));
+               return Optional.of(new NbtOps.LongListCollector(lv5.getLongArray()));
             }
          }
 
@@ -514,39 +518,42 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_cfjsyyyh}
-    * @mapping {@literal named net/minecraft/nbt/NbtOps$C_cfjsyyyh}
+    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_cpsqmvih}
+    * @mapping {@literal named net/minecraft/nbt/NbtOps$ByteListCollector}
     */
-   static class C_cfjsyyyh implements NbtOps.C_nehsnwyp {
+   static class ByteListCollector implements NbtOps.ListCollector {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ijtscyyp Lnet/minecraft/unmapped/C_fybaywjo$C_cpsqmvih;f_ijtscyyp:Lit/unimi/dsi/fastutil/bytes/ByteArrayList;}
+       * @mapping {@literal named values Lnet/minecraft/nbt/NbtOps$ByteListCollector;values:Lit/unimi/dsi/fastutil/bytes/ByteArrayList;}
        */
-      private final NbtList f_zdfsryne = new NbtList();
+      private final ByteArrayList values = new ByteArrayList();
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_cpsqmvih;<init>(B)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$ByteListCollector;<init>(B)V}
        */
-      C_cfjsyyyh(NbtElement arg) {
-         this.f_zdfsryne.add(arg);
+      public ByteListCollector(byte value) {
+         this.values.add(value);
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_cpsqmvih;<init>([B)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$ByteListCollector;<init>([B)V}
        */
-      C_cfjsyyyh(NbtList arg) {
-         this.f_zdfsryne.addAll(arg);
+      public ByteListCollector(byte[] values) {
+         this.values.addElements(0, values);
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public NbtOps.C_nehsnwyp m_berihwml(NbtElement arg) {
-         if (arg.getType() != this.f_zdfsryne.getHeldType()) {
-            return new NbtOps.C_zcsovcmj().m_fjtdnzmx(this.f_zdfsryne).m_berihwml(arg);
-         } else {
-            this.f_zdfsryne.add(arg);
+      public NbtOps.ListCollector accept(NbtElement element) {
+         if (element instanceof NbtByte lv) {
+            this.values.add(lv.byteValue());
             return this;
+         } else {
+            return new NbtOps.WrappingListCollector(this.values).accept(element);
          }
       }
 
@@ -554,45 +561,43 @@
        * Mapping not found
        */
       @Override
-      public NbtElement m_mlztdcvi() {
-         return this.f_zdfsryne;
+      public NbtElement getResult() {
+         return new NbtByteArray(this.values.toByteArray());
       }
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_cpsqmvih}
-    * @mapping {@literal named net/minecraft/nbt/NbtOps$C_cpsqmvih}
-    */
-   static class C_cpsqmvih implements NbtOps.C_nehsnwyp {
-      /**
-       * Mapping not found
+    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_lrggpudd}
+    * @mapping {@literal named net/minecraft/nbt/NbtOps$DelegatingListCollector}
        */
-      private final ByteArrayList f_ijtscyyp = new ByteArrayList();
-
+   static class DelegatingListCollector implements NbtOps.ListCollector {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_oknzgzfq Lnet/minecraft/unmapped/C_fybaywjo$C_lrggpudd;f_oknzgzfq:Lnet/minecraft/unmapped/C_fybaywjo$C_lrggpudd;}
+       * @mapping {@literal named INSTANCE Lnet/minecraft/nbt/NbtOps$DelegatingListCollector;INSTANCE:Lnet/minecraft/nbt/NbtOps$DelegatingListCollector;}
        */
-      public C_cpsqmvih(byte b) {
-         this.f_ijtscyyp.add(b);
-      }
+      public static final NbtOps.DelegatingListCollector INSTANCE = new NbtOps.DelegatingListCollector();
 
       /**
        * Mapping not found
        */
-      public C_cpsqmvih(byte[] bs) {
-         this.f_ijtscyyp.addElements(0, bs);
+      private DelegatingListCollector() {
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public NbtOps.C_nehsnwyp m_berihwml(NbtElement arg) {
-         if (arg instanceof NbtByte lv) {
-            this.f_ijtscyyp.add(lv.byteValue());
-            return this;
+      public NbtOps.ListCollector accept(NbtElement element) {
+         if (element instanceof NbtCompound lv) {
+            return new NbtOps.WrappingListCollector().accept(lv);
+         } else if (element instanceof NbtByte lv2) {
+            return new NbtOps.ByteListCollector(lv2.byteValue());
+         } else if (element instanceof NbtInt lv3) {
+            return new NbtOps.IntListCollector(lv3.intValue());
          } else {
-            return new NbtOps.C_zcsovcmj(this.f_ijtscyyp).m_berihwml(arg);
+            return (NbtOps.ListCollector)(element instanceof NbtLong lv4
+               ? new NbtOps.LongListCollector(lv4.longValue())
+               : new NbtOps.SimpleListCollector(element));
          }
       }
 
@@ -600,45 +605,48 @@
        * Mapping not found
        */
       @Override
-      public NbtElement m_mlztdcvi() {
-         return new NbtByteArray(this.f_ijtscyyp.toByteArray());
+      public NbtElement getResult() {
+         return new NbtList();
       }
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_dwkvaauw}
-    * @mapping {@literal named net/minecraft/nbt/NbtOps$C_dwkvaauw}
+    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_rkolbfzv}
+    * @mapping {@literal named net/minecraft/nbt/NbtOps$IntListCollector}
     */
-   static class C_dwkvaauw implements NbtOps.C_nehsnwyp {
+   static class IntListCollector implements NbtOps.ListCollector {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_pvqmoapp Lnet/minecraft/unmapped/C_fybaywjo$C_rkolbfzv;f_pvqmoapp:Lit/unimi/dsi/fastutil/ints/IntArrayList;}
+       * @mapping {@literal named values Lnet/minecraft/nbt/NbtOps$IntListCollector;values:Lit/unimi/dsi/fastutil/ints/IntArrayList;}
        */
-      private final LongArrayList f_rjyiwlrj = new LongArrayList();
+      private final IntArrayList values = new IntArrayList();
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_rkolbfzv;<init>(I)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$IntListCollector;<init>(I)V}
        */
-      public C_dwkvaauw(long l) {
-         this.f_rjyiwlrj.add(l);
+      public IntListCollector(int value) {
+         this.values.add(value);
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_rkolbfzv;<init>([I)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$IntListCollector;<init>([I)V}
        */
-      public C_dwkvaauw(long[] ls) {
-         this.f_rjyiwlrj.addElements(0, ls);
+      public IntListCollector(int[] values) {
+         this.values.addElements(0, values);
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public NbtOps.C_nehsnwyp m_berihwml(NbtElement arg) {
-         if (arg instanceof NbtLong lv) {
-            this.f_rjyiwlrj.add(lv.longValue());
+      public NbtOps.ListCollector accept(NbtElement element) {
+         if (element instanceof NbtInt lv) {
+            this.values.add(lv.intValue());
             return this;
          } else {
-            return new NbtOps.C_zcsovcmj(this.f_rjyiwlrj).m_berihwml(arg);
+            return new NbtOps.WrappingListCollector(this.values).accept(element);
          }
       }
 
@@ -646,40 +654,88 @@
        * Mapping not found
        */
       @Override
-      public NbtElement m_mlztdcvi() {
-         return new NbtLongArray(this.f_rjyiwlrj.toLongArray());
+      public NbtElement getResult() {
+         return new NbtIntArray(this.values.toIntArray());
       }
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_lrggpudd}
-    * @mapping {@literal named net/minecraft/nbt/NbtOps$C_lrggpudd}
+    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_nehsnwyp}
+    * @mapping {@literal named net/minecraft/nbt/NbtOps$ListCollector}
     */
-   static class C_lrggpudd implements NbtOps.C_nehsnwyp {
+   interface ListCollector {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_berihwml Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;m_berihwml(Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;}
+       * @mapping {@literal named accept Lnet/minecraft/nbt/NbtOps$ListCollector;accept(Lnet/minecraft/nbt/NbtElement;)Lnet/minecraft/nbt/NbtOps$ListCollector;}
        */
-      public static final NbtOps.C_lrggpudd f_oknzgzfq = new NbtOps.C_lrggpudd();
+      NbtOps.ListCollector accept(NbtElement element);
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_fjtdnzmx Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;m_fjtdnzmx(Ljava/lang/Iterable;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;}
+       * @mapping {@literal named accept Lnet/minecraft/nbt/NbtOps$ListCollector;accept(Ljava/lang/Iterable;)Lnet/minecraft/nbt/NbtOps$ListCollector;}
        */
-      private C_lrggpudd() {
+      default NbtOps.ListCollector accept(Iterable<NbtElement> elements) {
+         NbtOps.ListCollector lv = this;
+
+         for (NbtElement lv2 : elements) {
+            lv = lv.accept(lv2);
+         }
+
+         return lv;
+      }
+
+      /**
+       * @mapping {@literal hashed m_gxpktbdp Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;m_gxpktbdp(Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;}
+       * @mapping {@literal named accept Lnet/minecraft/nbt/NbtOps$ListCollector;accept(Ljava/util/stream/Stream;)Lnet/minecraft/nbt/NbtOps$ListCollector;}
+       */
+      default NbtOps.ListCollector accept(Stream<NbtElement> elements) {
+         return this.accept(elements::iterator);
+      }
+
+      /**
+       * @mapping {@literal hashed m_mlztdcvi Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;m_mlztdcvi()Lnet/minecraft/unmapped/C_oivssbvb;}
+       * @mapping {@literal named getResult Lnet/minecraft/nbt/NbtOps$ListCollector;getResult()Lnet/minecraft/nbt/NbtElement;}
+       */
+      NbtElement getResult();
+   }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_dwkvaauw}
+    * @mapping {@literal named net/minecraft/nbt/NbtOps$LongListCollector}
+    */
+   static class LongListCollector implements NbtOps.ListCollector {
+      /**
+       * @mapping {@literal hashed f_rjyiwlrj Lnet/minecraft/unmapped/C_fybaywjo$C_dwkvaauw;f_rjyiwlrj:Lit/unimi/dsi/fastutil/longs/LongArrayList;}
+       * @mapping {@literal named values Lnet/minecraft/nbt/NbtOps$LongListCollector;values:Lit/unimi/dsi/fastutil/longs/LongArrayList;}
+       */
+      private final LongArrayList values = new LongArrayList();
+
+      /**
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_dwkvaauw;<init>(J)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$LongListCollector;<init>(J)V}
+       */
+      public LongListCollector(long value) {
+         this.values.add(value);
+      }
+
+      /**
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_dwkvaauw;<init>([J)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$LongListCollector;<init>([J)V}
+       */
+      public LongListCollector(long[] values) {
+         this.values.addElements(0, values);
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public NbtOps.C_nehsnwyp m_berihwml(NbtElement arg) {
-         if (arg instanceof NbtCompound lv) {
-            return new NbtOps.C_zcsovcmj().m_berihwml(lv);
-         } else if (arg instanceof NbtByte lv2) {
-            return new NbtOps.C_cpsqmvih(lv2.byteValue());
-         } else if (arg instanceof NbtInt lv3) {
-            return new NbtOps.C_rkolbfzv(lv3.intValue());
+      public NbtOps.ListCollector accept(NbtElement element) {
+         if (element instanceof NbtLong lv) {
+            this.values.add(lv.longValue());
+            return this;
          } else {
-            return (NbtOps.C_nehsnwyp)(arg instanceof NbtLong lv4 ? new NbtOps.C_dwkvaauw(lv4.longValue()) : new NbtOps.C_cfjsyyyh(arg));
+            return new NbtOps.WrappingListCollector(this.values).accept(element);
          }
       }
 
@@ -687,82 +743,98 @@
        * Mapping not found
        */
       @Override
-      public NbtElement m_mlztdcvi() {
-         return new NbtList();
+      public NbtElement getResult() {
+         return new NbtLongArray(this.values.toLongArray());
       }
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_nehsnwyp}
-    * @mapping {@literal named net/minecraft/nbt/NbtOps$C_nehsnwyp}
+    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_cmafvjrt}
+    * @mapping {@literal named net/minecraft/nbt/NbtOps$MapBuilder}
     */
-   interface C_nehsnwyp {
+   class MapBuilder extends AbstractStringBuilder<NbtElement, NbtCompound> {
       /**
        * Mapping not found
        */
-      NbtOps.C_nehsnwyp m_berihwml(NbtElement arg);
+      protected MapBuilder() {
+         super(NbtOps.this);
+      }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed initBuilder Lnet/minecraft/unmapped/C_fybaywjo$C_cmafvjrt;initBuilder()Lnet/minecraft/unmapped/C_hhlwcnih;}
+       * @mapping {@literal named initBuilder Lnet/minecraft/nbt/NbtOps$MapBuilder;initBuilder()Lnet/minecraft/nbt/NbtCompound;}
        */
-      default NbtOps.C_nehsnwyp m_fjtdnzmx(Iterable<NbtElement> iterable) {
-         NbtOps.C_nehsnwyp lv = this;
-
-         for (NbtElement lv2 : iterable) {
-            lv = lv.m_berihwml(lv2);
-         }
-
-         return lv;
+      protected NbtCompound initBuilder() {
+         return new NbtCompound();
       }
 
       /**
-       * @mapping {@literal hashed m_gxpktbdp Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;m_gxpktbdp(Ljava/util/stream/Stream;)Lnet/minecraft/unmapped/C_fybaywjo$C_nehsnwyp;}
-       * @mapping {@literal named m_gxpktbdp Lnet/minecraft/nbt/NbtOps$C_nehsnwyp;m_gxpktbdp(Ljava/util/stream/Stream;)Lnet/minecraft/nbt/NbtOps$C_nehsnwyp;}
+       * @mapping {@literal hashed append Lnet/minecraft/unmapped/C_fybaywjo$C_cmafvjrt;append(Ljava/lang/String;Lnet/minecraft/unmapped/C_oivssbvb;Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hhlwcnih;}
+       * @mapping {@literal named append Lnet/minecraft/nbt/NbtOps$MapBuilder;append(Ljava/lang/String;Lnet/minecraft/nbt/NbtElement;Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/nbt/NbtCompound;}
        */
-      default NbtOps.C_nehsnwyp m_gxpktbdp(Stream<NbtElement> obj) {
-         return this.m_fjtdnzmx(obj::iterator);
+      protected NbtCompound append(String string, NbtElement arg, NbtCompound arg2) {
+         arg2.put(string, arg);
+         return arg2;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed build Lnet/minecraft/unmapped/C_fybaywjo$C_cmafvjrt;build(Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)Lcom/mojang/serialization/DataResult;}
+       * @mapping {@literal named build Lnet/minecraft/nbt/NbtOps$MapBuilder;build(Lnet/minecraft/nbt/NbtCompound;Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;}
        */
-      NbtElement m_mlztdcvi();
+      protected DataResult<NbtElement> build(NbtCompound arg, NbtElement arg2) {
+         if (arg2 == null || arg2 == NbtNull.INSTANCE) {
+            return DataResult.success(arg);
+         } else if (!(arg2 instanceof NbtCompound lv)) {
+            return DataResult.error(() -> "mergeToMap called with not a map: " + arg2, arg2);
+         } else {
+            NbtCompound lv2 = lv.createNbt();
+
+            for (Entry<String, NbtElement> entry : arg.getEntries()) {
+               lv2.put((String)entry.getKey(), (NbtElement)entry.getValue());
+            }
+
+            return DataResult.success(lv2);
+         }
+      }
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_rkolbfzv}
-    * @mapping {@literal named net/minecraft/nbt/NbtOps$C_rkolbfzv}
+    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_cfjsyyyh}
+    * @mapping {@literal named net/minecraft/nbt/NbtOps$SimpleListCollector}
     */
-   static class C_rkolbfzv implements NbtOps.C_nehsnwyp {
+   static class SimpleListCollector implements NbtOps.ListCollector {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_zdfsryne Lnet/minecraft/unmapped/C_fybaywjo$C_cfjsyyyh;f_zdfsryne:Lnet/minecraft/unmapped/C_hqhtfwlr;}
+       * @mapping {@literal named result Lnet/minecraft/nbt/NbtOps$SimpleListCollector;result:Lnet/minecraft/nbt/NbtList;}
        */
-      private final IntArrayList f_pvqmoapp = new IntArrayList();
+      private final NbtList result = new NbtList();
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_cfjsyyyh;<init>(Lnet/minecraft/unmapped/C_oivssbvb;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$SimpleListCollector;<init>(Lnet/minecraft/nbt/NbtElement;)V}
        */
-      public C_rkolbfzv(int i) {
-         this.f_pvqmoapp.add(i);
+      SimpleListCollector(NbtElement element) {
+         this.result.add(element);
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_cfjsyyyh;<init>(Lnet/minecraft/unmapped/C_hqhtfwlr;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$SimpleListCollector;<init>(Lnet/minecraft/nbt/NbtList;)V}
        */
-      public C_rkolbfzv(int[] is) {
-         this.f_pvqmoapp.addElements(0, is);
+      SimpleListCollector(NbtList nbt) {
+         this.result.addAll(nbt);
       }
 
       /**
        * Mapping not found
        */
       @Override
-      public NbtOps.C_nehsnwyp m_berihwml(NbtElement arg) {
-         if (arg instanceof NbtInt lv) {
-            this.f_pvqmoapp.add(lv.intValue());
-            return this;
+      public NbtOps.ListCollector accept(NbtElement element) {
+         if (element.getType() != this.result.getHeldType()) {
+            return new NbtOps.WrappingListCollector().accept(this.result).accept(element);
          } else {
-            return new NbtOps.C_zcsovcmj(this.f_pvqmoapp).m_berihwml(arg);
+            this.result.add(element);
+            return this;
          }
       }
 
@@ -770,78 +842,85 @@
        * Mapping not found
        */
       @Override
-      public NbtElement m_mlztdcvi() {
-         return new NbtIntArray(this.f_pvqmoapp.toIntArray());
+      public NbtElement getResult() {
+         return this.result;
       }
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_zcsovcmj}
-    * @mapping {@literal named net/minecraft/nbt/NbtOps$C_zcsovcmj}
+    * @mapping {@literal named net/minecraft/nbt/NbtOps$WrappingListCollector}
     */
-   static class C_zcsovcmj implements NbtOps.C_nehsnwyp {
+   static class WrappingListCollector implements NbtOps.ListCollector {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_kuucpbgx Lnet/minecraft/unmapped/C_fybaywjo$C_zcsovcmj;f_kuucpbgx:Lnet/minecraft/unmapped/C_hqhtfwlr;}
+       * @mapping {@literal named result Lnet/minecraft/nbt/NbtOps$WrappingListCollector;result:Lnet/minecraft/nbt/NbtList;}
        */
-      private final NbtList f_kuucpbgx = new NbtList();
+      private final NbtList result = new NbtList();
 
       /**
        * Mapping not found
        */
-      public C_zcsovcmj() {
+      public WrappingListCollector() {
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_zcsovcmj;<init>(Ljava/util/Collection;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$WrappingListCollector;<init>(Ljava/util/Collection;)V}
        */
-      public C_zcsovcmj(Collection<NbtElement> collection) {
-         this.f_kuucpbgx.addAll(collection);
+      public WrappingListCollector(Collection<NbtElement> elements) {
+         this.result.addAll(elements);
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_zcsovcmj;<init>(Lit/unimi/dsi/fastutil/ints/IntArrayList;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$WrappingListCollector;<init>(Lit/unimi/dsi/fastutil/ints/IntArrayList;)V}
        */
-      public C_zcsovcmj(IntArrayList intArrayList) {
-         intArrayList.forEach(i -> this.f_kuucpbgx.add(m_ntfjawdo(NbtInt.of(i))));
+      public WrappingListCollector(IntArrayList list) {
+         list.forEach(i -> this.result.add(wrapElement(NbtInt.of(i))));
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_zcsovcmj;<init>(Lit/unimi/dsi/fastutil/bytes/ByteArrayList;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$WrappingListCollector;<init>(Lit/unimi/dsi/fastutil/bytes/ByteArrayList;)V}
        */
-      public C_zcsovcmj(ByteArrayList byteArrayList) {
-         byteArrayList.forEach(b -> this.f_kuucpbgx.add(m_ntfjawdo(NbtByte.of(b))));
+      public WrappingListCollector(ByteArrayList list) {
+         list.forEach(b -> this.result.add(wrapElement(NbtByte.of(b))));
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fybaywjo$C_zcsovcmj;<init>(Lit/unimi/dsi/fastutil/longs/LongArrayList;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/nbt/NbtOps$WrappingListCollector;<init>(Lit/unimi/dsi/fastutil/longs/LongArrayList;)V}
        */
-      public C_zcsovcmj(LongArrayList longArrayList) {
-         longArrayList.forEach(l -> this.f_kuucpbgx.add(m_ntfjawdo(NbtLong.of(l))));
+      public WrappingListCollector(LongArrayList list) {
+         list.forEach(l -> this.result.add(wrapElement(NbtLong.of(l))));
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_fhjbuhyx Lnet/minecraft/unmapped/C_fybaywjo$C_zcsovcmj;m_fhjbuhyx(Lnet/minecraft/unmapped/C_hhlwcnih;)Z}
+       * @mapping {@literal named isWrapper Lnet/minecraft/nbt/NbtOps$WrappingListCollector;isWrapper(Lnet/minecraft/nbt/NbtCompound;)Z}
        */
-      private static boolean m_fhjbuhyx(NbtCompound arg) {
-         return arg.getSize() == 1 && arg.contains("");
+      private static boolean isWrapper(NbtCompound nbt) {
+         return nbt.getSize() == 1 && nbt.contains("");
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_vxfjomvi Lnet/minecraft/unmapped/C_fybaywjo$C_zcsovcmj;m_vxfjomvi(Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_oivssbvb;}
+       * @mapping {@literal named wrapIfNeeded Lnet/minecraft/nbt/NbtOps$WrappingListCollector;wrapIfNeeded(Lnet/minecraft/nbt/NbtElement;)Lnet/minecraft/nbt/NbtElement;}
        */
-      private static NbtElement m_vxfjomvi(NbtElement arg) {
-         if (arg instanceof NbtCompound lv && !m_fhjbuhyx(lv)) {
+      private static NbtElement wrapIfNeeded(NbtElement element) {
+         if (element instanceof NbtCompound lv && !isWrapper(lv)) {
             return lv;
          }
 
-         return m_ntfjawdo(arg);
+         return wrapElement(element);
       }
 
       /**
        * @mapping {@literal hashed m_ntfjawdo Lnet/minecraft/unmapped/C_fybaywjo$C_zcsovcmj;m_ntfjawdo(Lnet/minecraft/unmapped/C_oivssbvb;)Lnet/minecraft/unmapped/C_hhlwcnih;}
-       * @mapping {@literal named m_ntfjawdo Lnet/minecraft/nbt/NbtOps$C_zcsovcmj;m_ntfjawdo(Lnet/minecraft/nbt/NbtElement;)Lnet/minecraft/nbt/NbtCompound;}
+       * @mapping {@literal named wrapElement Lnet/minecraft/nbt/NbtOps$WrappingListCollector;wrapElement(Lnet/minecraft/nbt/NbtElement;)Lnet/minecraft/nbt/NbtCompound;}
        */
-      private static NbtCompound m_ntfjawdo(NbtElement nbt) {
+      private static NbtCompound wrapElement(NbtElement nbt) {
          NbtCompound lv = new NbtCompound();
          lv.put("", nbt);
          return lv;
@@ -851,8 +930,8 @@
        * Mapping not found
        */
       @Override
-      public NbtOps.C_nehsnwyp m_berihwml(NbtElement arg) {
-         this.f_kuucpbgx.add(m_vxfjomvi(arg));
+      public NbtOps.ListCollector accept(NbtElement element) {
+         this.result.add(wrapIfNeeded(element));
          return this;
       }
 
@@ -860,58 +939,8 @@
        * Mapping not found
        */
       @Override
-      public NbtElement m_mlztdcvi() {
-         return this.f_kuucpbgx;
-      }
-   }
-
-   /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_fybaywjo$C_cmafvjrt}
-    * @mapping {@literal named net/minecraft/nbt/NbtOps$MapBuilder}
-    */
-   class MapBuilder extends AbstractStringBuilder<NbtElement, NbtCompound> {
-      /**
-       * Mapping not found
-       */
-      protected MapBuilder() {
-         super(NbtOps.this);
-      }
-
-      /**
-       * @mapping {@literal hashed initBuilder Lnet/minecraft/unmapped/C_fybaywjo$C_cmafvjrt;initBuilder()Lnet/minecraft/unmapped/C_hhlwcnih;}
-       * @mapping {@literal named initBuilder Lnet/minecraft/nbt/NbtOps$MapBuilder;initBuilder()Lnet/minecraft/nbt/NbtCompound;}
-       */
-      protected NbtCompound initBuilder() {
-         return new NbtCompound();
-      }
-
-      /**
-       * @mapping {@literal hashed append Lnet/minecraft/unmapped/C_fybaywjo$C_cmafvjrt;append(Ljava/lang/String;Lnet/minecraft/unmapped/C_oivssbvb;Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hhlwcnih;}
-       * @mapping {@literal named append Lnet/minecraft/nbt/NbtOps$MapBuilder;append(Ljava/lang/String;Lnet/minecraft/nbt/NbtElement;Lnet/minecraft/nbt/NbtCompound;)Lnet/minecraft/nbt/NbtCompound;}
-       */
-      protected NbtCompound append(String string, NbtElement arg, NbtCompound arg2) {
-         arg2.put(string, arg);
-         return arg2;
-      }
-
-      /**
-       * @mapping {@literal hashed build Lnet/minecraft/unmapped/C_fybaywjo$C_cmafvjrt;build(Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_oivssbvb;)Lcom/mojang/serialization/DataResult;}
-       * @mapping {@literal named build Lnet/minecraft/nbt/NbtOps$MapBuilder;build(Lnet/minecraft/nbt/NbtCompound;Lnet/minecraft/nbt/NbtElement;)Lcom/mojang/serialization/DataResult;}
-       */
-      protected DataResult<NbtElement> build(NbtCompound arg, NbtElement arg2) {
-         if (arg2 == null || arg2 == NbtNull.INSTANCE) {
-            return DataResult.success(arg);
-         } else if (!(arg2 instanceof NbtCompound lv)) {
-            return DataResult.error(() -> "mergeToMap called with not a map: " + arg2, arg2);
-         } else {
-            NbtCompound lv2 = lv.m_poylyjba();
-
-            for (Entry<String, NbtElement> entry : arg.m_smzpndim()) {
-               lv2.put((String)entry.getKey(), (NbtElement)entry.getValue());
-            }
-
-            return DataResult.success(lv2);
-         }
+      public NbtElement getResult() {
+         return this.result;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/nbt/NbtShort.java namedSrc/net/minecraft/nbt/NbtShort.java
--- namedTargetSrc/net/minecraft/nbt/NbtShort.java	2024-08-08 16:16:37.882714271 +0000
+++ namedSrc/net/minecraft/nbt/NbtShort.java	2024-08-08 16:15:29.170426456 +0000
@@ -28,7 +28,7 @@
        * @mapping {@literal named read Lnet/minecraft/nbt/NbtShort$C_cpjbekql;read(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtShort;}
        */
       public NbtShort read(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         return NbtShort.of(m_jvvhjgeo(dataInput, arg));
+         return NbtShort.of(readRaw(dataInput, arg));
       }
 
       /**
@@ -36,14 +36,14 @@
        */
       @Override
       public NbtScanner.Result doAccept(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
-         return scanner.visitShort(m_jvvhjgeo(input, tracker));
+         return scanner.visitShort(readRaw(input, tracker));
       }
 
       /**
        * @mapping {@literal hashed m_jvvhjgeo Lnet/minecraft/unmapped/C_mospmwws$C_cpjbekql;m_jvvhjgeo(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)S}
-       * @mapping {@literal named m_jvvhjgeo Lnet/minecraft/nbt/NbtShort$C_cpjbekql;m_jvvhjgeo(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)S}
+       * @mapping {@literal named readRaw Lnet/minecraft/nbt/NbtShort$C_cpjbekql;readRaw(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)S}
        */
-      private static short m_jvvhjgeo(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      private static short readRaw(DataInput input, NbtTagSizeTracker tracker) throws IOException {
          tracker.addBytes(10L);
          return input.readShort();
       }
@@ -136,9 +136,9 @@
 
    /**
     * @mapping {@literal hashed m_cypcegew Lnet/minecraft/unmapped/C_mospmwws;m_cypcegew()Lnet/minecraft/unmapped/C_mospmwws;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtShort;copy()Lnet/minecraft/nbt/NbtShort;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtShort;shallowCopy()Lnet/minecraft/nbt/NbtShort;}
     */
-   public NbtShort copy() {
+   public NbtShort shallowCopy() {
       return this;
    }
 
diff -bur namedTargetSrc/net/minecraft/nbt/NbtString.java namedSrc/net/minecraft/nbt/NbtString.java
--- namedTargetSrc/net/minecraft/nbt/NbtString.java	2024-08-08 16:16:37.786713868 +0000
+++ namedSrc/net/minecraft/nbt/NbtString.java	2024-08-08 16:15:29.070426040 +0000
@@ -15,9 +15,10 @@
  */
 public class NbtString implements NbtElement {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_pyxvntyi Lnet/minecraft/unmapped/C_bzopmfms;f_pyxvntyi:I}
+    * @mapping {@literal named SIZE Lnet/minecraft/nbt/NbtString;SIZE:I}
     */
-   private static final int f_pyxvntyi = 36;
+   private static final int SIZE = 36;
    /**
     * @mapping {@literal hashed f_epaixlxd Lnet/minecraft/unmapped/C_bzopmfms;f_epaixlxd:Lnet/minecraft/unmapped/C_ueidorcc;}
     * @mapping {@literal named TYPE Lnet/minecraft/nbt/NbtString;TYPE:Lnet/minecraft/nbt/NbtType;}
@@ -28,7 +29,7 @@
        * @mapping {@literal named read Lnet/minecraft/nbt/NbtString$C_khgdkwrh;read(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Lnet/minecraft/nbt/NbtString;}
        */
       public NbtString read(DataInput dataInput, NbtTagSizeTracker arg) throws IOException {
-         return NbtString.of(m_evrerdyg(dataInput, arg));
+         return NbtString.of(readRaw(dataInput, arg));
       }
 
       /**
@@ -36,14 +37,14 @@
        */
       @Override
       public NbtScanner.Result doAccept(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
-         return scanner.visitString(m_evrerdyg(input, tracker));
+         return scanner.visitString(readRaw(input, tracker));
       }
 
       /**
        * @mapping {@literal hashed m_evrerdyg Lnet/minecraft/unmapped/C_bzopmfms$C_khgdkwrh;m_evrerdyg(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String;}
-       * @mapping {@literal named m_evrerdyg Lnet/minecraft/nbt/NbtString$C_khgdkwrh;m_evrerdyg(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Ljava/lang/String;}
+       * @mapping {@literal named readRaw Lnet/minecraft/nbt/NbtString$C_khgdkwrh;readRaw(Ljava/io/DataInput;Lnet/minecraft/nbt/NbtTagSizeTracker;)Ljava/lang/String;}
        */
-      private static String m_evrerdyg(DataInput input, NbtTagSizeTracker tracker) throws IOException {
+      private static String readRaw(DataInput input, NbtTagSizeTracker tracker) throws IOException {
          tracker.addBytes(36L);
          String string = input.readUTF();
          tracker.addBytes(2L, (long)string.length());
@@ -180,9 +181,9 @@
 
    /**
     * @mapping {@literal hashed m_rtjdokst Lnet/minecraft/unmapped/C_bzopmfms;m_rtjdokst()Lnet/minecraft/unmapped/C_bzopmfms;}
-    * @mapping {@literal named copy Lnet/minecraft/nbt/NbtString;copy()Lnet/minecraft/nbt/NbtString;}
+    * @mapping {@literal named shallowCopy Lnet/minecraft/nbt/NbtString;shallowCopy()Lnet/minecraft/nbt/NbtString;}
     */
-   public NbtString copy() {
+   public NbtString shallowCopy() {
       return this;
    }
 
diff -bur namedTargetSrc/net/minecraft/nbt/NbtType.java namedSrc/net/minecraft/nbt/NbtType.java
--- namedTargetSrc/net/minecraft/nbt/NbtType.java	2024-08-08 16:16:37.874714237 +0000
+++ namedSrc/net/minecraft/nbt/NbtType.java	2024-08-08 16:15:29.166426439 +0000
@@ -29,21 +29,21 @@
     */
    default void accept(DataInput input, NbtScanner scanner, NbtTagSizeTracker tracker) throws IOException {
       switch (scanner.start(this)) {
-         case f_drwmzuin:
+         case CONTINUE:
             this.doAccept(input, scanner, tracker);
-         case f_kpjgfhsy:
+         case HALT:
          default:
             break;
-         case f_irsnidyo:
+         case BREAK:
             this.skip(input, tracker);
       }
    }
 
    /**
     * @mapping {@literal hashed m_lcnankcv Lnet/minecraft/unmapped/C_ueidorcc;m_lcnankcv(Ljava/io/DataInput;ILnet/minecraft/unmapped/C_fozrrtcx;)V}
-    * @mapping {@literal named m_lcnankcv Lnet/minecraft/nbt/NbtType;m_lcnankcv(Ljava/io/DataInput;ILnet/minecraft/nbt/NbtTagSizeTracker;)V}
+    * @mapping {@literal named skip Lnet/minecraft/nbt/NbtType;skip(Ljava/io/DataInput;ILnet/minecraft/nbt/NbtTagSizeTracker;)V}
     */
-   void m_lcnankcv(DataInput input, int i, NbtTagSizeTracker tracker) throws IOException;
+   void skip(DataInput input, int count, NbtTagSizeTracker tracker) throws IOException;
 
    /**
     * @mapping {@literal hashed m_uezipxuy Lnet/minecraft/unmapped/C_ueidorcc;m_uezipxuy(Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)V}
@@ -112,7 +112,7 @@
           * Mapping not found
           */
          @Override
-         public void m_lcnankcv(DataInput dataInput, int i, NbtTagSizeTracker arg) throws IOException {
+         public void skip(DataInput input, int count, NbtTagSizeTracker tracker) throws IOException {
             throw this.createException();
          }
 
@@ -159,8 +159,8 @@
        * Mapping not found
        */
       @Override
-      default void m_lcnankcv(DataInput dataInput, int i, NbtTagSizeTracker arg) throws IOException {
-         dataInput.skipBytes(this.size() * i);
+      default void skip(DataInput input, int count, NbtTagSizeTracker tracker) throws IOException {
+         input.skipBytes(this.size() * count);
       }
 
       /**
@@ -179,9 +179,9 @@
        * Mapping not found
        */
       @Override
-      default void m_lcnankcv(DataInput dataInput, int i, NbtTagSizeTracker arg) throws IOException {
-         for (int j = 0; j < i; j++) {
-            this.skip(dataInput, arg);
+      default void skip(DataInput input, int count, NbtTagSizeTracker tracker) throws IOException {
+         for (int j = 0; j < count; j++) {
+            this.skip(input, tracker);
          }
       }
    }

github-actions · 2024-08-08T16:16:41Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/nbt/scanner/NbtCollector.java namedSrc/net/minecraft/nbt/scanner/NbtCollector.java
--- namedTargetSrc/net/minecraft/nbt/scanner/NbtCollector.java	2024-08-08 16:16:37.934714488 +0000
+++ namedSrc/net/minecraft/nbt/scanner/NbtCollector.java	2024-08-08 16:15:29.214426638 +0000
@@ -76,7 +76,7 @@
    @Override
    public NbtScanner.Result visitNull() {
       this.append(NbtNull.INSTANCE);
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -85,7 +85,7 @@
    @Override
    public NbtScanner.Result visitString(String value) {
       this.append(NbtString.of(value));
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -94,7 +94,7 @@
    @Override
    public NbtScanner.Result visitByte(byte value) {
       this.append(NbtByte.of(value));
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -103,7 +103,7 @@
    @Override
    public NbtScanner.Result visitShort(short value) {
       this.append(NbtShort.of(value));
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -112,7 +112,7 @@
    @Override
    public NbtScanner.Result visitInt(int value) {
       this.append(NbtInt.of(value));
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -121,7 +121,7 @@
    @Override
    public NbtScanner.Result visitLong(long value) {
       this.append(NbtLong.of(value));
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -130,7 +130,7 @@
    @Override
    public NbtScanner.Result visitFloat(float value) {
       this.append(NbtFloat.of(value));
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -139,7 +139,7 @@
    @Override
    public NbtScanner.Result visitDouble(double value) {
       this.append(NbtDouble.of(value));
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -148,7 +148,7 @@
    @Override
    public NbtScanner.Result visitByteArray(byte[] value) {
       this.append(new NbtByteArray(value));
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -157,7 +157,7 @@
    @Override
    public NbtScanner.Result visitIntArray(int[] value) {
       this.append(new NbtIntArray(value));
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -166,7 +166,7 @@
    @Override
    public NbtScanner.Result visitLongArray(long[] value) {
       this.append(new NbtLongArray(value));
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -174,7 +174,7 @@
     */
    @Override
    public NbtScanner.Result visitListMeta(NbtType<?> entryType, int length) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -183,7 +183,7 @@
    @Override
    public NbtScanner.NestedResult startListItem(NbtType<?> type, int index) {
       this.pushStack(type);
-      return NbtScanner.NestedResult.f_dolvioxu;
+      return NbtScanner.NestedResult.ENTER;
    }
 
    /**
@@ -191,7 +191,7 @@
     */
    @Override
    public NbtScanner.NestedResult visitSubNbtType(NbtType<?> type) {
-      return NbtScanner.NestedResult.f_dolvioxu;
+      return NbtScanner.NestedResult.ENTER;
    }
 
    /**
@@ -201,7 +201,7 @@
    public NbtScanner.NestedResult startSubNbt(NbtType<?> type, String key) {
       this.currentKey = key;
       this.pushStack(type);
-      return NbtScanner.NestedResult.f_dolvioxu;
+      return NbtScanner.NestedResult.ENTER;
    }
 
    /**
@@ -226,7 +226,7 @@
    @Override
    public NbtScanner.Result endNested() {
       this.stack.removeLast();
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -246,6 +246,6 @@
          this.stack.addLast((Consumer)nbt -> this.root = nbt);
       }
 
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 }
diff -bur namedTargetSrc/net/minecraft/nbt/scanner/NbtScanner.java namedSrc/net/minecraft/nbt/scanner/NbtScanner.java
--- namedTargetSrc/net/minecraft/nbt/scanner/NbtScanner.java	2024-08-08 16:16:37.770713801 +0000
+++ namedSrc/net/minecraft/nbt/scanner/NbtScanner.java	2024-08-08 16:15:29.050425957 +0000
@@ -155,31 +155,31 @@
        * This element is either a list element or a sub NBT.
        * 
        * @mapping {@literal hashed f_dolvioxu Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok;f_dolvioxu:Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok;}
-       * @mapping {@literal named f_dolvioxu Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;f_dolvioxu:Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;}
+       * @mapping {@literal named ENTER Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;ENTER:Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;}
        */
-      f_dolvioxu,
+      ENTER,
       /**
        * Skips this element and visit the next list element or sub NBT.
        * 
        * @mapping {@literal hashed f_lpjmwtad Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok;f_lpjmwtad:Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok;}
-       * @mapping {@literal named f_lpjmwtad Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;f_lpjmwtad:Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;}
+       * @mapping {@literal named SKIP Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;SKIP:Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;}
        */
-      f_lpjmwtad,
+      SKIP,
       /**
        * Skips the whole list or compound NBT currently under scan.
        * Will make a call to {@link NbtScanner#endNested()}.
        * 
        * @mapping {@literal hashed f_qhflrpze Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok;f_qhflrpze:Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok;}
-       * @mapping {@literal named f_qhflrpze Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;f_qhflrpze:Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;}
+       * @mapping {@literal named BREAK Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;BREAK:Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;}
        */
-      f_qhflrpze,
+      BREAK,
       /**
        * Halts the whole scanning completely.
        * 
        * @mapping {@literal hashed f_pkgsxrgf Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok;f_pkgsxrgf:Lnet/minecraft/unmapped/C_avcaqucb$C_bucfodok;}
-       * @mapping {@literal named f_pkgsxrgf Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;f_pkgsxrgf:Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;}
+       * @mapping {@literal named HALT Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;HALT:Lnet/minecraft/nbt/scanner/NbtScanner$NestedResult;}
        */
-      f_pkgsxrgf;
+      HALT;
    }
 
    /**
@@ -191,22 +191,22 @@
        * Proceed to visit more data of this element.
        * 
        * @mapping {@literal hashed f_drwmzuin Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;f_drwmzuin:Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;}
-       * @mapping {@literal named f_drwmzuin Lnet/minecraft/nbt/scanner/NbtScanner$Result;f_drwmzuin:Lnet/minecraft/nbt/scanner/NbtScanner$Result;}
+       * @mapping {@literal named CONTINUE Lnet/minecraft/nbt/scanner/NbtScanner$Result;CONTINUE:Lnet/minecraft/nbt/scanner/NbtScanner$Result;}
        */
-      f_drwmzuin,
+      CONTINUE,
       /**
        * Skips the current element under scan.
        * 
        * @mapping {@literal hashed f_irsnidyo Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;f_irsnidyo:Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;}
-       * @mapping {@literal named f_irsnidyo Lnet/minecraft/nbt/scanner/NbtScanner$Result;f_irsnidyo:Lnet/minecraft/nbt/scanner/NbtScanner$Result;}
+       * @mapping {@literal named BREAK Lnet/minecraft/nbt/scanner/NbtScanner$Result;BREAK:Lnet/minecraft/nbt/scanner/NbtScanner$Result;}
        */
-      f_irsnidyo,
+      BREAK,
       /**
        * Halts the whole scanning completely.
        * 
        * @mapping {@literal hashed f_kpjgfhsy Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;f_kpjgfhsy:Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;}
-       * @mapping {@literal named f_kpjgfhsy Lnet/minecraft/nbt/scanner/NbtScanner$Result;f_kpjgfhsy:Lnet/minecraft/nbt/scanner/NbtScanner$Result;}
+       * @mapping {@literal named HALT Lnet/minecraft/nbt/scanner/NbtScanner$Result;HALT:Lnet/minecraft/nbt/scanner/NbtScanner$Result;}
        */
-      f_kpjgfhsy;
+      HALT;
    }
 }
diff -bur namedTargetSrc/net/minecraft/nbt/scanner/SelectiveNbtCollector.java namedSrc/net/minecraft/nbt/scanner/SelectiveNbtCollector.java
--- namedTargetSrc/net/minecraft/nbt/scanner/SelectiveNbtCollector.java	2024-08-08 16:16:37.778713835 +0000
+++ namedSrc/net/minecraft/nbt/scanner/SelectiveNbtCollector.java	2024-08-08 16:15:29.062426006 +0000
@@ -35,14 +35,15 @@
    private final Deque<FieldTree> selectionStack = new ArrayDeque();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_whoksxux;<init>([Lnet/minecraft/unmapped/C_lxuqtocl;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/nbt/scanner/SelectiveNbtCollector;<init>([Lnet/minecraft/nbt/visitor/FieldSelector;)V}
     */
-   public SelectiveNbtCollector(FieldSelector... args) {
-      this.queriesLeft = args.length;
+   public SelectiveNbtCollector(FieldSelector... selectors) {
+      this.queriesLeft = selectors.length;
       Builder<NbtType<?>> builder = ImmutableSet.builder();
       FieldTree lv = FieldTree.createRoot();
 
-      for (FieldSelector lv2 : args) {
+      for (FieldSelector lv2 : selectors) {
          lv.addEntry(lv2);
          builder.add(lv2.type());
       }
@@ -57,7 +58,7 @@
     */
    @Override
    public NbtScanner.Result start(NbtType<?> type) {
-      return type != NbtCompound.TYPE ? NbtScanner.Result.f_kpjgfhsy : super.start(type);
+      return type != NbtCompound.TYPE ? NbtScanner.Result.HALT : super.start(type);
    }
 
    /**
@@ -69,9 +70,9 @@
       if (this.getDepth() > lv.depth()) {
          return super.visitSubNbtType(type);
       } else if (this.queriesLeft <= 0) {
-         return NbtScanner.NestedResult.f_pkgsxrgf;
+         return NbtScanner.NestedResult.HALT;
       } else {
-         return !this.allPossibleTypes.contains(type) ? NbtScanner.NestedResult.f_lpjmwtad : super.visitSubNbtType(type);
+         return !this.allPossibleTypes.contains(type) ? NbtScanner.NestedResult.SKIP : super.visitSubNbtType(type);
       }
    }
 
@@ -95,7 +96,7 @@
             }
          }
 
-         return NbtScanner.NestedResult.f_lpjmwtad;
+         return NbtScanner.NestedResult.SKIP;
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/nbt/scanner/SimpleNbtScanner.java namedSrc/net/minecraft/nbt/scanner/SimpleNbtScanner.java
--- namedTargetSrc/net/minecraft/nbt/scanner/SimpleNbtScanner.java	2024-08-08 16:16:37.822714019 +0000
+++ namedSrc/net/minecraft/nbt/scanner/SimpleNbtScanner.java	2024-08-08 16:15:29.118426240 +0000
@@ -22,7 +22,7 @@
     */
    @Override
    default NbtScanner.Result visitNull() {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -30,7 +30,7 @@
     */
    @Override
    default NbtScanner.Result visitString(String value) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -38,7 +38,7 @@
     */
    @Override
    default NbtScanner.Result visitByte(byte value) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -46,7 +46,7 @@
     */
    @Override
    default NbtScanner.Result visitShort(short value) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -54,7 +54,7 @@
     */
    @Override
    default NbtScanner.Result visitInt(int value) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -62,7 +62,7 @@
     */
    @Override
    default NbtScanner.Result visitLong(long value) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -70,7 +70,7 @@
     */
    @Override
    default NbtScanner.Result visitFloat(float value) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -78,7 +78,7 @@
     */
    @Override
    default NbtScanner.Result visitDouble(double value) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -86,7 +86,7 @@
     */
    @Override
    default NbtScanner.Result visitByteArray(byte[] value) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -94,7 +94,7 @@
     */
    @Override
    default NbtScanner.Result visitIntArray(int[] value) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -102,7 +102,7 @@
     */
    @Override
    default NbtScanner.Result visitLongArray(long[] value) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -110,7 +110,7 @@
     */
    @Override
    default NbtScanner.Result visitListMeta(NbtType<?> entryType, int length) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -118,7 +118,7 @@
     */
    @Override
    default NbtScanner.NestedResult startListItem(NbtType<?> type, int index) {
-      return NbtScanner.NestedResult.f_lpjmwtad;
+      return NbtScanner.NestedResult.SKIP;
    }
 
    /**
@@ -126,7 +126,7 @@
     */
    @Override
    default NbtScanner.NestedResult visitSubNbtType(NbtType<?> type) {
-      return NbtScanner.NestedResult.f_lpjmwtad;
+      return NbtScanner.NestedResult.SKIP;
    }
 
    /**
@@ -134,7 +134,7 @@
     */
    @Override
    default NbtScanner.NestedResult startSubNbt(NbtType<?> type, String key) {
-      return NbtScanner.NestedResult.f_lpjmwtad;
+      return NbtScanner.NestedResult.SKIP;
    }
 
    /**
@@ -142,7 +142,7 @@
     */
    @Override
    default NbtScanner.Result endNested() {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 
    /**
@@ -150,6 +150,6 @@
     */
    @Override
    default NbtScanner.Result start(NbtType<?> type) {
-      return NbtScanner.Result.f_drwmzuin;
+      return NbtScanner.Result.CONTINUE;
    }
 }
diff -bur namedTargetSrc/net/minecraft/nbt/StringNbtReader.java namedSrc/net/minecraft/nbt/StringNbtReader.java
--- namedTargetSrc/net/minecraft/nbt/StringNbtReader.java	2024-08-08 16:16:37.754713734 +0000
+++ namedSrc/net/minecraft/nbt/StringNbtReader.java	2024-08-08 16:15:29.034425890 +0000
@@ -121,9 +121,10 @@
     */
    private static final Pattern INT_PATTERN = Pattern.compile("[-+]?(?:0|[1-9][0-9]*)");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dphkcylp Lnet/minecraft/unmapped/C_jjafokvs;f_dphkcylp:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/nbt/StringNbtReader;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<NbtCompound> f_dphkcylp = Codec.STRING.comapFlatMap(string -> {
+   public static final Codec<NbtCompound> CODEC = Codec.STRING.comapFlatMap(string -> {
       try {
          return DataResult.success(new StringNbtReader(new StringReader(string)).readCompound(), Lifecycle.stable());
       } catch (CommandSyntaxException var2) {
@@ -131,9 +132,10 @@
       }
    }, NbtCompound::toString);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hlrulnyw Lnet/minecraft/unmapped/C_jjafokvs;f_hlrulnyw:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named LENIENT_CODEC Lnet/minecraft/nbt/StringNbtReader;LENIENT_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<NbtCompound> f_hlrulnyw = Codec.withAlternative(f_dphkcylp, NbtCompound.CODEC);
+   public static final Codec<NbtCompound> LENIENT_CODEC = Codec.withAlternative(CODEC, NbtCompound.CODEC);
    /**
     * @mapping {@literal hashed f_wtdymgxg Lnet/minecraft/unmapped/C_jjafokvs;f_wtdymgxg:Lcom/mojang/brigadier/StringReader;}
     * @mapping {@literal named reader Lnet/minecraft/nbt/StringNbtReader;reader:Lcom/mojang/brigadier/StringReader;}
diff -bur namedTargetSrc/net/minecraft/nbt/visitor/FieldTree.java namedSrc/net/minecraft/nbt/visitor/FieldTree.java
--- namedTargetSrc/net/minecraft/nbt/visitor/FieldTree.java	2024-08-08 16:16:37.814713986 +0000
+++ namedSrc/net/minecraft/nbt/visitor/FieldTree.java	2024-08-08 16:15:29.106426190 +0000
@@ -29,11 +29,12 @@
     * @mapping {@literal hashed m_bdqndaht Lnet/minecraft/unmapped/C_rkwhogtj;m_bdqndaht(Lnet/minecraft/unmapped/C_lxuqtocl;)V}
     * @mapping {@literal named addEntry Lnet/minecraft/nbt/visitor/FieldTree;addEntry(Lnet/minecraft/nbt/visitor/FieldSelector;)V}
     */
-   public void addEntry(FieldSelector arg) {
-      if (this.depth <= arg.path().size()) {
-         ((FieldTree)this.fieldsToRecurse.computeIfAbsent((String)arg.path().get(this.depth - 1), string -> new FieldTree(this.depth + 1))).addEntry(arg);
+   public void addEntry(FieldSelector selector) {
+      if (this.depth <= selector.path().size()) {
+         ((FieldTree)this.fieldsToRecurse.computeIfAbsent((String)selector.path().get(this.depth - 1), string -> new FieldTree(this.depth + 1)))
+            .addEntry(selector);
       } else {
-         this.selectedFields.put(arg.name(), arg.type());
+         this.selectedFields.put(selector.name(), selector.type());
       }
    }
 
@@ -41,7 +42,7 @@
     * @mapping {@literal hashed m_nlvtwohc Lnet/minecraft/unmapped/C_rkwhogtj;m_nlvtwohc(Lnet/minecraft/unmapped/C_ueidorcc;Ljava/lang/String;)Z}
     * @mapping {@literal named isSelected Lnet/minecraft/nbt/visitor/FieldTree;isSelected(Lnet/minecraft/nbt/NbtType;Ljava/lang/String;)Z}
     */
-   public boolean isSelected(NbtType<?> arg, String string) {
-      return arg.equals(this.selectedFields().get(string));
+   public boolean isSelected(NbtType<?> type, String key) {
+      return type.equals(this.selectedFields().get(key));
    }
 }
diff -bur namedTargetSrc/net/minecraft/nbt/visitor/NbtTextFormatter.java namedSrc/net/minecraft/nbt/visitor/NbtTextFormatter.java
--- namedTargetSrc/net/minecraft/nbt/visitor/NbtTextFormatter.java	2024-08-08 16:16:37.806713952 +0000
+++ namedSrc/net/minecraft/nbt/visitor/NbtTextFormatter.java	2024-08-08 16:15:29.098426156 +0000
@@ -49,13 +49,15 @@
     */
    private static final int INLINE_LIST_THRESHOLD = 8;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ieeyicwd Lnet/minecraft/unmapped/C_cbswsmdy;f_ieeyicwd:I}
+    * @mapping {@literal named MAX_DEPTH Lnet/minecraft/nbt/visitor/NbtTextFormatter;MAX_DEPTH:I}
     */
-   private static final int f_ieeyicwd = 64;
+   private static final int MAX_DEPTH = 64;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cfoaqogq Lnet/minecraft/unmapped/C_cbswsmdy;f_cfoaqogq:I}
+    * @mapping {@literal named MAX_LENGTH Lnet/minecraft/nbt/visitor/NbtTextFormatter;MAX_LENGTH:I}
     */
-   private static final int f_cfoaqogq = 128;
+   private static final int MAX_LENGTH = 128;
    /**
     * @mapping {@literal hashed f_audxoytl Lnet/minecraft/unmapped/C_cbswsmdy;f_audxoytl:Lit/unimi/dsi/fastutil/bytes/ByteCollection;}
     * @mapping {@literal named SINGLE_LINE_ELEMENT_TYPES Lnet/minecraft/nbt/visitor/NbtTextFormatter;SINGLE_LINE_ELEMENT_TYPES:Lit/unimi/dsi/fastutil/bytes/ByteCollection;}
@@ -132,54 +134,65 @@
     */
    private static final String ENTRY_SEPARATOR = String.valueOf(',');
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_tdczxvfc Lnet/minecraft/unmapped/C_cbswsmdy;f_tdczxvfc:Ljava/lang/String;}
+    * @mapping {@literal named WRAPPED_ENTRY_SEPARATOR Lnet/minecraft/nbt/visitor/NbtTextFormatter;WRAPPED_ENTRY_SEPARATOR:Ljava/lang/String;}
     */
-   private static final String f_tdczxvfc = ENTRY_SEPARATOR + "\n";
+   private static final String WRAPPED_ENTRY_SEPARATOR = ENTRY_SEPARATOR + "\n";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_elcnsvnq Lnet/minecraft/unmapped/C_cbswsmdy;f_elcnsvnq:Ljava/lang/String;}
+    * @mapping {@literal named SPACED_ENTRY_SEPARATOR Lnet/minecraft/nbt/visitor/NbtTextFormatter;SPACED_ENTRY_SEPARATOR:Ljava/lang/String;}
     */
-   private static final String f_elcnsvnq = ENTRY_SEPARATOR + " ";
+   private static final String SPACED_ENTRY_SEPARATOR = ENTRY_SEPARATOR + " ";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_dmwazrkd Lnet/minecraft/unmapped/C_cbswsmdy;f_dmwazrkd:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named FOLDED Lnet/minecraft/nbt/visitor/NbtTextFormatter;FOLDED:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_dmwazrkd = Text.literal("<...>").formatted(Formatting.GRAY);
+   private static final Text FOLDED = Text.literal("<...>").formatted(Formatting.GRAY);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bktumuci Lnet/minecraft/unmapped/C_cbswsmdy;f_bktumuci:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named BYTE_TYPE Lnet/minecraft/nbt/visitor/NbtTextFormatter;BYTE_TYPE:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_bktumuci = Text.literal("b").formatted(TYPE_SUFFIX_COLOR);
+   private static final Text BYTE_TYPE = Text.literal("b").formatted(TYPE_SUFFIX_COLOR);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ctzxnsom Lnet/minecraft/unmapped/C_cbswsmdy;f_ctzxnsom:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named SHORT_TYPE Lnet/minecraft/nbt/visitor/NbtTextFormatter;SHORT_TYPE:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_ctzxnsom = Text.literal("s").formatted(TYPE_SUFFIX_COLOR);
+   private static final Text SHORT_TYPE = Text.literal("s").formatted(TYPE_SUFFIX_COLOR);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_wywnbumh Lnet/minecraft/unmapped/C_cbswsmdy;f_wywnbumh:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named INT_TYPE Lnet/minecraft/nbt/visitor/NbtTextFormatter;INT_TYPE:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_wywnbumh = Text.literal("I").formatted(TYPE_SUFFIX_COLOR);
+   private static final Text INT_TYPE = Text.literal("I").formatted(TYPE_SUFFIX_COLOR);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_stdgiutw Lnet/minecraft/unmapped/C_cbswsmdy;f_stdgiutw:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named LONG_TYPE Lnet/minecraft/nbt/visitor/NbtTextFormatter;LONG_TYPE:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_stdgiutw = Text.literal("L").formatted(TYPE_SUFFIX_COLOR);
+   private static final Text LONG_TYPE = Text.literal("L").formatted(TYPE_SUFFIX_COLOR);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jxgzvfdw Lnet/minecraft/unmapped/C_cbswsmdy;f_jxgzvfdw:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named FLOAT_TYPE Lnet/minecraft/nbt/visitor/NbtTextFormatter;FLOAT_TYPE:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_jxgzvfdw = Text.literal("f").formatted(TYPE_SUFFIX_COLOR);
+   private static final Text FLOAT_TYPE = Text.literal("f").formatted(TYPE_SUFFIX_COLOR);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hqokqjhi Lnet/minecraft/unmapped/C_cbswsmdy;f_hqokqjhi:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named DOUBLE_TYPE Lnet/minecraft/nbt/visitor/NbtTextFormatter;DOUBLE_TYPE:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_hqokqjhi = Text.literal("d").formatted(TYPE_SUFFIX_COLOR);
+   private static final Text DOUBLE_TYPE = Text.literal("d").formatted(TYPE_SUFFIX_COLOR);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jpiwgzyp Lnet/minecraft/unmapped/C_cbswsmdy;f_jpiwgzyp:Lnet/minecraft/unmapped/C_rdaqiwdt;}
+    * @mapping {@literal named BYTE_ARRAY_TYPE Lnet/minecraft/nbt/visitor/NbtTextFormatter;BYTE_ARRAY_TYPE:Lnet/minecraft/text/Text;}
     */
-   private static final Text f_jpiwgzyp = Text.literal("B").formatted(TYPE_SUFFIX_COLOR);
+   private static final Text BYTE_ARRAY_TYPE = Text.literal("B").formatted(TYPE_SUFFIX_COLOR);
    /**
     * @mapping {@literal hashed f_kylpaqih Lnet/minecraft/unmapped/C_cbswsmdy;f_kylpaqih:Ljava/lang/String;}
     * @mapping {@literal named prefix Lnet/minecraft/nbt/visitor/NbtTextFormatter;prefix:Ljava/lang/String;}
     */
    private final String prefix;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_buzhmuqj Lnet/minecraft/unmapped/C_cbswsmdy;f_buzhmuqj:I}
+    * @mapping {@literal named indentationDepth Lnet/minecraft/nbt/visitor/NbtTextFormatter;indentationDepth:I}
     */
-   private int f_buzhmuqj;
+   private int indentationDepth;
    /**
     * @mapping {@literal hashed f_pgwezafl Lnet/minecraft/unmapped/C_cbswsmdy;f_pgwezafl:I}
     * @mapping {@literal named indentationLevel Lnet/minecraft/nbt/visitor/NbtTextFormatter;indentationLevel:I}
@@ -224,7 +237,7 @@
     */
    @Override
    public void visitByte(NbtByte element) {
-      this.result.append(Text.literal(String.valueOf(element.numberValue())).formatted(NUMBER_COLOR)).append(f_bktumuci);
+      this.result.append(Text.literal(String.valueOf(element.numberValue())).formatted(NUMBER_COLOR)).append(BYTE_TYPE);
    }
 
    /**
@@ -232,7 +245,7 @@
     */
    @Override
    public void visitShort(NbtShort element) {
-      this.result.append(Text.literal(String.valueOf(element.numberValue())).formatted(NUMBER_COLOR)).append(f_ctzxnsom);
+      this.result.append(Text.literal(String.valueOf(element.numberValue())).formatted(NUMBER_COLOR)).append(SHORT_TYPE);
    }
 
    /**
@@ -248,7 +261,7 @@
     */
    @Override
    public void visitLong(NbtLong element) {
-      this.result.append(Text.literal(String.valueOf(element.numberValue())).formatted(NUMBER_COLOR)).append(f_stdgiutw);
+      this.result.append(Text.literal(String.valueOf(element.numberValue())).formatted(NUMBER_COLOR)).append(LONG_TYPE);
    }
 
    /**
@@ -256,7 +269,7 @@
     */
    @Override
    public void visitFloat(NbtFloat element) {
-      this.result.append(Text.literal(String.valueOf(element.floatValue())).formatted(NUMBER_COLOR)).append(f_jxgzvfdw);
+      this.result.append(Text.literal(String.valueOf(element.floatValue())).formatted(NUMBER_COLOR)).append(FLOAT_TYPE);
    }
 
    /**
@@ -264,7 +277,7 @@
     */
    @Override
    public void visitDouble(NbtDouble element) {
-      this.result.append(Text.literal(String.valueOf(element.doubleValue())).formatted(NUMBER_COLOR)).append(f_hqokqjhi);
+      this.result.append(Text.literal(String.valueOf(element.doubleValue())).formatted(NUMBER_COLOR)).append(DOUBLE_TYPE);
    }
 
    /**
@@ -272,19 +285,19 @@
     */
    @Override
    public void visitByteArray(NbtByteArray element) {
-      this.result.append("[").append(f_jpiwgzyp).append(";");
+      this.result.append("[").append(BYTE_ARRAY_TYPE).append(";");
       byte[] bs = element.getByteArray();
 
       for (int i = 0; i < bs.length && i < 128; i++) {
          MutableText lv = Text.literal(String.valueOf(bs[i])).formatted(NUMBER_COLOR);
-         this.result.append(" ").append(lv).append(f_jpiwgzyp);
+         this.result.append(" ").append(lv).append(BYTE_ARRAY_TYPE);
          if (i != bs.length - 1) {
             this.result.append(ENTRY_SEPARATOR);
          }
       }
 
       if (bs.length > 128) {
-         this.result.append(f_dmwazrkd);
+         this.result.append(FOLDED);
       }
 
       this.result.append("]");
@@ -295,7 +308,7 @@
     */
    @Override
    public void visitIntArray(NbtIntArray element) {
-      this.result.append("[").append(f_wywnbumh).append(";");
+      this.result.append("[").append(INT_TYPE).append(";");
       int[] is = element.getIntArray();
 
       for (int i = 0; i < is.length && i < 128; i++) {
@@ -306,7 +319,7 @@
       }
 
       if (is.length > 128) {
-         this.result.append(f_dmwazrkd);
+         this.result.append(FOLDED);
       }
 
       this.result.append("]");
@@ -317,19 +330,19 @@
     */
    @Override
    public void visitLongArray(NbtLongArray element) {
-      this.result.append("[").append(f_stdgiutw).append(";");
+      this.result.append("[").append(LONG_TYPE).append(";");
       long[] ls = element.getLongArray();
 
       for (int i = 0; i < ls.length && i < 128; i++) {
          Text lv = Text.literal(String.valueOf(ls[i])).formatted(NUMBER_COLOR);
-         this.result.append(" ").append(lv).append(f_stdgiutw);
+         this.result.append(" ").append(lv).append(LONG_TYPE);
          if (i != ls.length - 1) {
             this.result.append(ENTRY_SEPARATOR);
          }
       }
 
       if (ls.length > 128) {
-         this.result.append(f_dmwazrkd);
+         this.result.append(FOLDED);
       }
 
       this.result.append("]");
@@ -343,16 +356,16 @@
       if (list.isEmpty()) {
          this.result.append("[]");
       } else if (this.indentationLevel >= 64) {
-         this.result.append("[").append(f_dmwazrkd).append("]");
+         this.result.append("[").append(FOLDED).append("]");
       } else if (SINGLE_LINE_ELEMENT_TYPES.contains(list.getHeldType()) && list.size() <= 8) {
          this.result.append("[");
 
          for (int i = 0; i < list.size(); i++) {
             if (i != 0) {
-               this.result.append(f_elcnsvnq);
+               this.result.append(SPACED_ENTRY_SEPARATOR);
             }
 
-            this.m_meunhhlm(list.get(i), false);
+            this.appendSubElement(list.get(i), false);
          }
 
          this.result.append("]");
@@ -362,22 +375,22 @@
             this.result.append("\n");
          }
 
-         String string = Strings.repeat(this.prefix, this.f_buzhmuqj + 1);
+         String string = Strings.repeat(this.prefix, this.indentationDepth + 1);
 
          for (int j = 0; j < list.size() && j < 128; j++) {
             this.result.append(string);
-            this.m_meunhhlm(list.get(j), true);
+            this.appendSubElement(list.get(j), true);
             if (j != list.size() - 1) {
-               this.result.append(this.prefix.isEmpty() ? f_elcnsvnq : f_tdczxvfc);
+               this.result.append(this.prefix.isEmpty() ? SPACED_ENTRY_SEPARATOR : WRAPPED_ENTRY_SEPARATOR);
             }
          }
 
          if (list.size() > 128) {
-            this.result.append(string).append(f_dmwazrkd);
+            this.result.append(string).append(FOLDED);
          }
 
          if (!this.prefix.isEmpty()) {
-            this.result.append("\n" + Strings.repeat(this.prefix, this.f_buzhmuqj));
+            this.result.append("\n" + Strings.repeat(this.prefix, this.indentationDepth));
          }
 
          this.result.append("]");
@@ -392,7 +405,7 @@
       if (compound.isEmpty()) {
          this.result.append("{}");
       } else if (this.indentationLevel >= 64) {
-         this.result.append("{").append(f_dmwazrkd).append("}");
+         this.result.append("{").append(FOLDED).append("}");
       } else {
          this.result.append("{");
          Collection<String> collection = compound.getKeys();
@@ -406,20 +419,20 @@
             this.result.append("\n");
          }
 
-         String string = Strings.repeat(this.prefix, this.f_buzhmuqj + 1);
+         String string = Strings.repeat(this.prefix, this.indentationDepth + 1);
          Iterator<String> iterator = collection.iterator();
 
          while (iterator.hasNext()) {
             String string2 = (String)iterator.next();
             this.result.append(string).append(escapeName(string2)).append(": ");
-            this.m_meunhhlm(compound.get(string2), true);
+            this.appendSubElement(compound.get(string2), true);
             if (iterator.hasNext()) {
-               this.result.append(this.prefix.isEmpty() ? f_elcnsvnq : f_tdczxvfc);
+               this.result.append(this.prefix.isEmpty() ? SPACED_ENTRY_SEPARATOR : WRAPPED_ENTRY_SEPARATOR);
             }
          }
 
          if (!this.prefix.isEmpty()) {
-            this.result.append("\n" + Strings.repeat(this.prefix, this.f_buzhmuqj));
+            this.result.append("\n" + Strings.repeat(this.prefix, this.indentationDepth));
          }
 
          this.result.append("}");
@@ -427,20 +440,21 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_meunhhlm Lnet/minecraft/unmapped/C_cbswsmdy;m_meunhhlm(Lnet/minecraft/unmapped/C_oivssbvb;Z)V}
+    * @mapping {@literal named appendSubElement Lnet/minecraft/nbt/visitor/NbtTextFormatter;appendSubElement(Lnet/minecraft/nbt/NbtElement;Z)V}
     */
-   private void m_meunhhlm(NbtElement arg, boolean bl) {
-      if (bl) {
-         this.f_buzhmuqj++;
+   private void appendSubElement(NbtElement element, boolean indent) {
+      if (indent) {
+         this.indentationDepth++;
       }
 
       this.indentationLevel++;
 
       try {
-         arg.accept(this);
+         element.accept(this);
       } finally {
-         if (bl) {
-            this.f_buzhmuqj--;
+         if (indent) {
+            this.indentationDepth--;
          }
 
          this.indentationLevel--;
diff -bur namedTargetSrc/net/minecraft/nbt/visitor/SkipFields.java namedSrc/net/minecraft/nbt/visitor/SkipFields.java
--- namedTargetSrc/net/minecraft/nbt/visitor/SkipFields.java	2024-08-08 16:16:37.830714053 +0000
+++ namedSrc/net/minecraft/nbt/visitor/SkipFields.java	2024-08-08 16:15:29.122426256 +0000
@@ -19,12 +19,13 @@
    private final Deque<FieldTree> stack = new ArrayDeque();
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_qvrhcqfv;<init>([Lnet/minecraft/unmapped/C_lxuqtocl;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/nbt/visitor/SkipFields;<init>([Lnet/minecraft/nbt/visitor/FieldSelector;)V}
     */
-   public SkipFields(FieldSelector... args) {
+   public SkipFields(FieldSelector... selectors) {
       FieldTree lv = FieldTree.createRoot();
 
-      for (FieldSelector lv2 : args) {
+      for (FieldSelector lv2 : selectors) {
          lv.addEntry(lv2);
       }
 
@@ -38,7 +39,7 @@
    public NbtScanner.NestedResult startSubNbt(NbtType<?> type, String key) {
       FieldTree lv = (FieldTree)this.stack.element();
       if (lv.isSelected(type, key)) {
-         return NbtScanner.NestedResult.f_lpjmwtad;
+         return NbtScanner.NestedResult.SKIP;
       } else {
          if (type == NbtCompound.TYPE) {
             FieldTree lv2 = (FieldTree)lv.fieldsToRecurse().get(key);
diff -bur namedTargetSrc/net/minecraft/nbt/visitor/StringNbtWriter.java namedSrc/net/minecraft/nbt/visitor/StringNbtWriter.java
--- namedTargetSrc/net/minecraft/nbt/visitor/StringNbtWriter.java	2024-08-08 16:16:37.862714187 +0000
+++ namedSrc/net/minecraft/nbt/visitor/StringNbtWriter.java	2024-08-08 16:15:29.158426406 +0000
@@ -41,8 +41,8 @@
     * @mapping {@literal hashed m_uzldvsqt Lnet/minecraft/unmapped/C_bjntyqcr;m_uzldvsqt(Lnet/minecraft/unmapped/C_oivssbvb;)Ljava/lang/String;}
     * @mapping {@literal named apply Lnet/minecraft/nbt/visitor/StringNbtWriter;apply(Lnet/minecraft/nbt/NbtElement;)Ljava/lang/String;}
     */
-   public String apply(NbtElement arg) {
-      arg.accept(this);
+   public String apply(NbtElement element) {
+      element.accept(this);
       return this.result.toString();
    }
 
diff -bur namedTargetSrc/net/minecraft/network/PacketByteBuf.java namedSrc/net/minecraft/network/PacketByteBuf.java
--- namedTargetSrc/net/minecraft/network/PacketByteBuf.java	2024-08-08 16:16:37.726713617 +0000
+++ namedSrc/net/minecraft/network/PacketByteBuf.java	2024-08-08 16:15:28.994425724 +0000
@@ -1258,7 +1258,7 @@
       }
 
       try {
-         NbtIo.m_dxxrvgvk(nbt, new ByteBufOutputStream(buf));
+         NbtIo.writeAnyElement(nbt, new ByteBufOutputStream(buf));
       } catch (IOException var3) {
          throw new EncoderException(var3);
       }
@@ -1305,7 +1305,7 @@
    @Nullable
    public static NbtElement readNbt(ByteBuf buf, NbtTagSizeTracker nbtTagSizeTracker) {
       try {
-         NbtElement lv = NbtIo.m_qmknfifn(new ByteBufInputStream(buf), nbtTagSizeTracker);
+         NbtElement lv = NbtIo.readAnyElement(new ByteBufInputStream(buf), nbtTagSizeTracker);
          return lv.getType() == 0 ? null : lv;
       } catch (IOException var3) {
          throw new EncoderException(var3);
diff -bur namedTargetSrc/net/minecraft/predicate/NbtPredicate.java namedSrc/net/minecraft/predicate/NbtPredicate.java
--- namedTargetSrc/net/minecraft/predicate/NbtPredicate.java	2024-08-08 16:16:37.670713383 +0000
+++ namedSrc/net/minecraft/predicate/NbtPredicate.java	2024-08-08 16:15:28.918425407 +0000
@@ -24,7 +24,7 @@
     * @mapping {@literal hashed f_ecdgjoqe Lnet/minecraft/unmapped/C_emmbeecz;f_ecdgjoqe:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/predicate/NbtPredicate;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<NbtPredicate> CODEC = StringNbtReader.f_hlrulnyw.xmap(NbtPredicate::new, NbtPredicate::tag);
+   public static final Codec<NbtPredicate> CODEC = StringNbtReader.LENIENT_CODEC.xmap(NbtPredicate::new, NbtPredicate::tag);
    /**
     * @mapping {@literal hashed f_pelcohoj Lnet/minecraft/unmapped/C_emmbeecz;f_pelcohoj:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/predicate/NbtPredicate;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
diff -bur namedTargetSrc/net/minecraft/server/command/DataCommand.java namedSrc/net/minecraft/server/command/DataCommand.java
--- namedTargetSrc/net/minecraft/server/command/DataCommand.java	2024-08-08 16:16:37.942714522 +0000
+++ namedSrc/net/minecraft/server/command/DataCommand.java	2024-08-08 16:15:29.218426655 +0000
@@ -207,7 +207,7 @@
                                  throw MODIFY_EXPECTED_OBJECT_EXCEPTION.create(lv4);
                               }
 
-                              NbtCompound lv7 = lv5.copy();
+                              NbtCompound lv7 = lv5.shallowCopy();
                               lv5.copyFrom(lvx);
                               i += lv7.equals(lv5) ? 0 : 1;
                            }
@@ -506,7 +506,7 @@
       if (NbtPathArgumentType.NbtPath.isTooDeep(nbt, 0)) {
          throw NbtPathArgumentType.TOO_DEEP_EXCEPTION.create();
       } else {
-         NbtCompound lv2 = lv.copy().copyFrom(nbt);
+         NbtCompound lv2 = lv.shallowCopy().copyFrom(nbt);
          if (lv.equals(lv2)) {
             throw MERGE_FAILED_EXCEPTION.create();
          } else {
diff -bur namedTargetSrc/net/minecraft/server/command/SummonCommand.java namedSrc/net/minecraft/server/command/SummonCommand.java
--- namedTargetSrc/net/minecraft/server/command/SummonCommand.java	2024-08-08 16:16:37.886714288 +0000
+++ namedSrc/net/minecraft/server/command/SummonCommand.java	2024-08-08 16:15:29.174426473 +0000
@@ -101,7 +101,7 @@
       if (!World.isValid(lv)) {
          throw INVALID_POSITION_EXCEPTION.create();
       } else {
-         NbtCompound lv2 = nbt.copy();
+         NbtCompound lv2 = nbt.shallowCopy();
          lv2.putString("id", entityType.getRegistryKey().getValue().toString());
          ServerWorld lv3 = source.getWorld();
          Entity lv4 = EntityType.loadEntityWithPassengers(lv2, lv3, entity -> {
diff -bur namedTargetSrc/net/minecraft/structure/rule/block/entity/AppendLootRuleBlockEntityModifier.java namedSrc/net/minecraft/structure/rule/block/entity/AppendLootRuleBlockEntityModifier.java
--- namedTargetSrc/net/minecraft/structure/rule/block/entity/AppendLootRuleBlockEntityModifier.java	2024-08-08 16:16:37.822714019 +0000
+++ namedSrc/net/minecraft/structure/rule/block/entity/AppendLootRuleBlockEntityModifier.java	2024-08-08 16:15:29.114426223 +0000
@@ -49,7 +49,7 @@
     */
    @Override
    public NbtCompound apply(RandomGenerator random, @Nullable NbtCompound nbt) {
-      NbtCompound lv = nbt == null ? new NbtCompound() : nbt.copy();
+      NbtCompound lv = nbt == null ? new NbtCompound() : nbt.shallowCopy();
       RegistryKey.codec(RegistryKeys.LOOT_TABLE)
          .encodeStart(NbtOps.INSTANCE, this.lootTable)
          .resultOrPartial(LOGGER::error)
diff -bur namedTargetSrc/net/minecraft/structure/rule/block/entity/AppendStaticRuleBlockEntityModifier.java namedSrc/net/minecraft/structure/rule/block/entity/AppendStaticRuleBlockEntityModifier.java
--- namedTargetSrc/net/minecraft/structure/rule/block/entity/AppendStaticRuleBlockEntityModifier.java	2024-08-08 16:16:37.946714539 +0000
+++ namedSrc/net/minecraft/structure/rule/block/entity/AppendStaticRuleBlockEntityModifier.java	2024-08-08 16:15:29.222426672 +0000
@@ -38,7 +38,7 @@
     */
    @Override
    public NbtCompound apply(RandomGenerator random, @Nullable NbtCompound nbt) {
-      return nbt == null ? this.data.copy() : nbt.copyFrom(this.data);
+      return nbt == null ? this.data.shallowCopy() : nbt.copyFrom(this.data);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/structure/Structure.java namedSrc/net/minecraft/structure/Structure.java
--- namedTargetSrc/net/minecraft/structure/Structure.java	2024-08-08 16:16:37.830714053 +0000
+++ namedSrc/net/minecraft/structure/Structure.java	2024-08-08 16:15:29.126426274 +0000
@@ -257,7 +257,7 @@
             lv4 = BlockPos.fromPosition(lv2);
          }
 
-         this.entities.add(new Structure.StructureEntityInfo(lv2, lv4, lv3.copy()));
+         this.entities.add(new Structure.StructureEntityInfo(lv2, lv4, lv3.shallowCopy()));
       }
    }
 
@@ -500,7 +500,7 @@
 
       for (Structure.StructureBlockInfo lv : blockInfo) {
          BlockPos lv2 = transform(placementData, lv.pos).add(pos);
-         Structure.StructureBlockInfo lv3 = new Structure.StructureBlockInfo(lv2, lv.state, lv.nbt != null ? lv.nbt.copy() : null);
+         Structure.StructureBlockInfo lv3 = new Structure.StructureBlockInfo(lv2, lv.state, lv.nbt != null ? lv.nbt.shallowCopy() : null);
          Iterator<StructureProcessor> iterator = placementData.getProcessors().iterator();
 
          while (lv3 != null && iterator.hasNext()) {
@@ -530,7 +530,7 @@
       for (Structure.StructureEntityInfo lv : this.entities) {
          BlockPos lv2 = transformAround(lv.blockPos, mirror, rotation, pivot).add(pos);
          if (area == null || area.isInside(lv2)) {
-            NbtCompound lv3 = lv.nbt.copy();
+            NbtCompound lv3 = lv.nbt.shallowCopy();
             Vec3d lv4 = transformAround(lv.pos, mirror, rotation, pivot);
             Vec3d lv5 = lv4.add((double)pos.getX(), (double)pos.getY(), (double)pos.getZ());
             NbtList lv6 = new NbtList();
diff -bur namedTargetSrc/net/minecraft/structure/StructureTemplateManager.java namedSrc/net/minecraft/structure/StructureTemplateManager.java
--- namedTargetSrc/net/minecraft/structure/StructureTemplateManager.java	2024-08-08 16:16:37.910714388 +0000
+++ namedSrc/net/minecraft/structure/StructureTemplateManager.java	2024-08-08 16:15:29.194426556 +0000
@@ -436,7 +436,7 @@
     * @mapping {@literal named readStructure Lnet/minecraft/structure/StructureTemplateManager;readStructure(Ljava/io/InputStream;)Lnet/minecraft/structure/Structure;}
     */
    private Structure readStructure(InputStream inputStream) throws IOException {
-      NbtCompound lv = NbtIo.m_kyzyffmz(inputStream, NbtTagSizeTracker.createWithUnlimitedBytes());
+      NbtCompound lv = NbtIo.readCompressed(inputStream, NbtTagSizeTracker.createWithUnlimitedBytes());
       return this.createStructureFromNbt(lv);
    }
 
Only in namedTargetSrc/net/minecraft/unmapped: C_hydfible.java
diff -bur namedTargetSrc/net/minecraft/unmapped/C_iktlenyy.java namedSrc/net/minecraft/unmapped/C_iktlenyy.java
--- namedTargetSrc/net/minecraft/unmapped/C_iktlenyy.java	2024-08-08 16:16:37.666713366 +0000
+++ namedSrc/net/minecraft/unmapped/C_iktlenyy.java	2024-08-08 16:15:28.914425392 +0000
@@ -64,7 +64,7 @@
          public <T> DataResult<T> encode(A object, DynamicOps<T> ops, T object2) {
             return C_iktlenyy.this.f_cgqnumpx
                .getUnchecked(new C_iktlenyy.C_xycprxmt<>(codec, object, ops))
-               .map(objectx -> objectx instanceof NbtElement lv ? lv.copy() : objectx);
+               .map(objectx -> objectx instanceof NbtElement lv ? lv.shallowCopy() : objectx);
          }
       };
    }
Only in namedTargetSrc/net/minecraft/unmapped: C_prxxuhrw.java
Only in namedSrc/net/minecraft/util: DelegatingDataOutput.java
diff -bur namedTargetSrc/net/minecraft/world/chunk/WorldChunk.java namedSrc/net/minecraft/world/chunk/WorldChunk.java
--- namedTargetSrc/net/minecraft/world/chunk/WorldChunk.java	2024-08-08 16:16:37.766713785 +0000
+++ namedSrc/net/minecraft/world/chunk/WorldChunk.java	2024-08-08 16:15:29.046425940 +0000
@@ -543,7 +543,7 @@
       } else {
          NbtCompound lv3 = (NbtCompound)this.blockEntityNbts.get(pos);
          if (lv3 != null) {
-            lv3 = lv3.copy();
+            lv3 = lv3.shallowCopy();
             lv3.putBoolean("keepPacked", true);
          }
 
diff -bur namedTargetSrc/net/minecraft/world/PersistentStateManager.java namedSrc/net/minecraft/world/PersistentStateManager.java
--- namedTargetSrc/net/minecraft/world/PersistentStateManager.java	2024-08-08 16:16:37.738713667 +0000
+++ namedSrc/net/minecraft/world/PersistentStateManager.java	2024-08-08 16:15:29.014425807 +0000
@@ -142,7 +142,7 @@
          try {
             NbtCompound lv;
             if (this.isCompressed(pushbackInputStream)) {
-               lv = NbtIo.m_kyzyffmz(pushbackInputStream, NbtTagSizeTracker.createWithUnlimitedBytes());
+               lv = NbtIo.readCompressed(pushbackInputStream, NbtTagSizeTracker.createWithUnlimitedBytes());
             } else {
                DataInputStream dataInputStream = new DataInputStream(pushbackInputStream);
 
diff -bur namedTargetSrc/net/minecraft/world/storage/StorageIoWorker.java namedSrc/net/minecraft/world/storage/StorageIoWorker.java
--- namedTargetSrc/net/minecraft/world/storage/StorageIoWorker.java	2024-08-08 16:16:37.866714204 +0000
+++ namedSrc/net/minecraft/world/storage/StorageIoWorker.java	2024-08-08 16:15:29.162426422 +0000
@@ -387,7 +387,7 @@
       @Nullable
       NbtCompound m_zawxvgnv() {
          NbtCompound lv = this.nbt;
-         return lv == null ? null : lv.copy();
+         return lv == null ? null : lv.shallowCopy();
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/world/storage/WorldSaveStorage.java namedSrc/net/minecraft/world/storage/WorldSaveStorage.java
--- namedTargetSrc/net/minecraft/world/storage/WorldSaveStorage.java	2024-08-08 16:16:37.934714488 +0000
+++ namedSrc/net/minecraft/world/storage/WorldSaveStorage.java	2024-08-08 16:15:29.214426638 +0000
@@ -40,6 +40,7 @@
 import net.minecraft.feature_flags.FeatureFlags;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
+import net.minecraft.nbt.NbtFormatException;
 import net.minecraft.nbt.NbtHelper;
 import net.minecraft.nbt.NbtIo;
 import net.minecraft.nbt.NbtOps;
@@ -54,7 +55,6 @@
 import net.minecraft.server.WorldLoader;
 import net.minecraft.server.world.FeatureAndDataSettings;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_prxxuhrw;
 import net.minecraft.util.DateTimeFormatterFactory;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Identifier;
@@ -347,7 +347,7 @@
     * @mapping {@literal named m_cycihmpm Lnet/minecraft/world/storage/WorldSaveStorage;m_cycihmpm(Ljava/nio/file/Path;)Lnet/minecraft/nbt/NbtCompound;}
     */
    static NbtCompound m_cycihmpm(Path path) throws IOException {
-      return NbtIo.m_jsabavmz(path, NbtTagSizeTracker.create(104857600L));
+      return NbtIo.readCompressed(path, NbtTagSizeTracker.create(104857600L));
    }
 
    /**
@@ -427,7 +427,7 @@
       SaveVersionInfo lv = SaveVersionInfo.fromDynamic(dynamic);
       int i = lv.getWorldFormatVersion();
       if (i != 19132 && i != 19133) {
-         throw new C_prxxuhrw("Unknown data version: " + Integer.toHexString(i));
+         throw new NbtFormatException("Unknown data version: " + Integer.toHexString(i));
       } else {
          boolean bl2 = i != this.getCurrentVersion();
          Path path = arg.getIconPath();
@@ -459,7 +459,7 @@
    @Nullable
    private static NbtElement loadCompactWorldData(Path path) throws IOException {
       SkipFields lv = new SkipFields(new FieldSelector("Data", NbtCompound.TYPE, "Player"), new FieldSelector("Data", NbtCompound.TYPE, "WorldGenSettings"));
-      NbtIo.m_mrabewpj(path, lv, NbtTagSizeTracker.create(104857600L));
+      NbtIo.parseCompressed(path, lv, NbtTagSizeTracker.create(104857600L));
       return lv.getRoot();
    }
 
diff -bur namedTargetSrc/net/minecraft/world/WorldSaveHandler.java namedSrc/net/minecraft/world/WorldSaveHandler.java
--- namedTargetSrc/net/minecraft/world/WorldSaveHandler.java	2024-08-08 16:16:37.722713600 +0000
+++ namedSrc/net/minecraft/world/WorldSaveHandler.java	2024-08-08 16:15:28.990425707 +0000
@@ -101,7 +101,7 @@
       File file = new File(this.playerDataDir, player.getUuidAsString() + extension);
       if (file.exists() && file.isFile()) {
          try {
-            return Optional.of(NbtIo.m_jsabavmz(file.toPath(), NbtTagSizeTracker.createWithUnlimitedBytes()));
+            return Optional.of(NbtIo.readCompressed(file.toPath(), NbtTagSizeTracker.createWithUnlimitedBytes()));
          } catch (Exception var5) {
             LOGGER.warn("Failed to load player data for {}", player.getName().getString());
          }

github-actions · 2024-08-08T17:58:14Z

No difference between head and target.

-Original file line number
+Diff line change
@@ Expand Up @@
     		ARG 1 value
     	METHOD <init> ([B)V
     		ARG 1 value
+    	METHOD clear clear ()V
     	METHOD equals (Ljava/lang/Object;)Z
     		ARG 1 o
     	METHOD get (I)Ljava/lang/Object;
     		ARG 1 index
     	METHOD m_jinrzhol getByteArray ()[B
     	METHOD m_zreujoew toArray (Ljava/util/List;)[B
     		ARG 0 list
+    	METHOD size size ()I
     	CLASS C_qzarviwo
-    		METHOD m_kndswgtt (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[B
+    		METHOD m_kndswgtt readRaw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)[B
     			ARG 0 input
     			ARG 1 tracker

-Original file line number
+Diff line change
@@ -1,8 +1,10 @@
     CLASS net/minecraft/unmapped/C_hhlwcnih net/minecraft/nbt/NbtCompound
     	COMMENT Represents an NBT compound object which holds unordered key-value pairs with distinct case-sensitive string keys.
+    	FIELD f_aetpjbog ENTRY_SIZE I
     	FIELD f_ckdatsht CODEC Lcom/mojang/serialization/Codec;
     	FIELD f_dopajgtr entries Ljava/util/Map;
     	FIELD f_ghusyxdr TYPE Lnet/minecraft/unmapped/C_ueidorcc;
+    	FIELD f_qucoyxms SIZE I
     	METHOD <init> (Ljava/util/Map;)V
     		ARG 1 entries
     	METHOD equals (Ljava/lang/Object;)Z
@@ Expand Down Expand Up @@
     	METHOD m_oidzekic putInt (Ljava/lang/String;I)V
     		ARG 1 key
     		ARG 2 value
+    	METHOD m_poylyjba createNbt ()Lnet/minecraft/unmapped/C_hhlwcnih;
     	METHOD m_pvrsstff putByteArray (Ljava/lang/String;Ljava/util/List;)V
     		ARG 1 key
     		ARG 2 value
@@ Expand Down Expand Up @@
     	METHOD m_sfeexgrr getList (Ljava/lang/String;I)Lnet/minecraft/unmapped/C_hqhtfwlr;
     		ARG 1 key
     		ARG 2 type
+    	METHOD m_smzpndim getEntries ()Ljava/util/Set;
     	METHOD m_ulzvmblb remove (Ljava/lang/String;)V
     		ARG 1 key
     	METHOD m_utczects copyFrom (Lnet/minecraft/unmapped/C_hhlwcnih;)Lnet/minecraft/unmapped/C_hhlwcnih;
@@ Expand Down Expand Up @@
     	METHOD m_zsbbwdsl getByteArray (Ljava/lang/String;)[B
     		ARG 1 key
     	CLASS C_krlbszwn
-    		METHOD m_heopwcei (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;
+    		METHOD m_heopwcei parseCompound (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_avcaqucb;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_avcaqucb$C_ysedvtle;
     			ARG 0 input
     			ARG 1 scanner
     			ARG 2 tracker
-    		METHOD m_mlnxbtqt (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String;
+    		METHOD m_mlnxbtqt readString (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Ljava/lang/String;
     			ARG 0 input
     			ARG 1 tracker
-    		METHOD m_qbdkgvms (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih;
+    		METHOD m_qbdkgvms readCompound (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)Lnet/minecraft/unmapped/C_hhlwcnih;
     			ARG 0 input
     			ARG 1 tracker

-Original file line number
+Diff line change
@@ Expand Up @@
     	METHOD m_oxqlveuv of (D)Lnet/minecraft/unmapped/C_xiyjytpd;
     		ARG 0 value
     	CLASS C_iubarszc
-    		METHOD m_frmxzypg (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)D
+    		METHOD m_frmxzypg readRaw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)D
     			ARG 0 input
     			ARG 1 tracker

-Original file line number
+Diff line change
@@ Expand Up @@
     		COMMENT
     		COMMENT @see NbtLong
     	FIELD f_zfdwqdmd STRING_SIZE I
-    	METHOD m_ehqkdijp copy ()Lnet/minecraft/unmapped/C_oivssbvb;
-    		COMMENT Copies this NBT element.
-    		COMMENT
-    		COMMENT @return the copied element
+    	METHOD m_ehqkdijp shallowCopy ()Lnet/minecraft/unmapped/C_oivssbvb;
     	METHOD m_gvxsfqzz scanAsRoot (Lnet/minecraft/unmapped/C_avcaqucb;)V
     		ARG 1 scanner
     	METHOD m_hbuflhqa getSizeInBytes ()I
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     	METHOD m_ugeyistl of (F)Lnet/minecraft/unmapped/C_nmjwsnmy;
     		ARG 0 value
     	CLASS C_rfwycmsf
-    		METHOD m_vpkdnupw (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)F
+    		METHOD m_vpkdnupw readFloat (Ljava/io/DataInput;Lnet/minecraft/unmapped/C_fozrrtcx;)F
     			ARG 0 input
     			ARG 1 tracker

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

4 comments on commit `40b8dba`

github-actions bot commented on `40b8dba` Aug 8, 2024

github-actions bot commented on `40b8dba` Aug 8, 2024

github-actions bot commented on `40b8dba` Aug 8, 2024

github-actions bot commented on `40b8dba` Aug 8, 2024

Commit

There are no files selected for viewing

4 comments on commit 40b8dba

github-actions bot commented on 40b8dba Aug 8, 2024

Choose a reason for hiding this comment

github-actions bot commented on 40b8dba Aug 8, 2024

Choose a reason for hiding this comment

github-actions bot commented on 40b8dba Aug 8, 2024

Choose a reason for hiding this comment

github-actions bot commented on 40b8dba Aug 8, 2024

Choose a reason for hiding this comment

4 comments on commit `40b8dba`

github-actions bot commented on `40b8dba` Aug 8, 2024

github-actions bot commented on `40b8dba` Aug 8, 2024

github-actions bot commented on `40b8dba` Aug 8, 2024

github-actions bot commented on `40b8dba` Aug 8, 2024