Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history 
Co-authored-by: Will <[email protected]>
  • Loading branch information
@ix0rai @supersaiyansubtlety
ix0rai and supersaiyansubtlety authored Mar 9, 2024
1 parent f40f3ed commit e9685f9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions mappings/net/minecraft/util/dynamic/Codecs.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
ARG 1 name
ARG 2 fallback
METHOD m_ahlasxan withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
ARG 1 entryLifestyleGetter
ARG 2 lifestyleGetter
ARG 1 entryLifecycleGetter
ARG 2 lifecycleGetter
METHOD m_awjfgfbh (Lcom/mojang/datafixers/util/Either;)Lcom/mojang/authlib/properties/PropertyMap;
ARG 0 either
METHOD m_azagsdch (Ljava/util/BitSet;)Ljava/util/stream/LongStream;
Expand All @@ -48,7 +48,7 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
METHOD m_bqtubtow (Ljava/util/function/Function;Ljava/util/Collection;)Lcom/mojang/serialization/DataResult;
ARG 1 collection
METHOD m_bylmenao withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec;
ARG 1 lifestyleGetter
ARG 1 lifecycleGetter
METHOD m_cjkdnnjx (Ljava/util/List;)Lorg/joml/Vector3f;
ARG 0 list2
METHOD m_cjobvjnd (IILjava/lang/String;)Lcom/mojang/serialization/DataResult;
Expand Down

3 comments on commit e9685f9

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With commit e9685f9, 210 file(s) were updated with 1254 line(s) added and 1096 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementHolder.java namedSrc/net/minecraft/advancement/AdvancementHolder.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementHolder.java	2024-03-09 04:30:04.868364397 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementHolder.java	2024-03-09 04:28:57.072263282 +0000
@@ -15,14 +15,14 @@
     * @mapping {@literal hashed f_epmbxpwm Lnet/minecraft/unmapped/C_unoypvme;f_epmbxpwm:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/advancement/AdvancementHolder;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, AdvancementHolder> PACKET_CODEC = PacketCodec.create(
+   public static final PacketCodec<RegistryByteBuf, AdvancementHolder> PACKET_CODEC = PacketCodec.tuple(
       Identifier.PACKET_CODEC, AdvancementHolder::id, Advancement.PACKET_CODEC, AdvancementHolder::data, AdvancementHolder::new
    );
    /**
     * @mapping {@literal hashed f_wpifnhgy Lnet/minecraft/unmapped/C_unoypvme;f_wpifnhgy:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named LIST_PACKET_CODEC Lnet/minecraft/advancement/AdvancementHolder;LIST_PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, List<AdvancementHolder>> LIST_PACKET_CODEC = PACKET_CODEC.apply(PacketCodecs.m_npmxjnbl());
+   public static final PacketCodec<RegistryByteBuf, List<AdvancementHolder>> LIST_PACKET_CODEC = PACKET_CODEC.apply(PacketCodecs.toCollection());
 
    /**
     * @mapping {@literal hashed equals Lnet/minecraft/unmapped/C_unoypvme;equals(Ljava/lang/Object;)Z}
diff -bur namedTargetSrc/net/minecraft/advancement/Advancement.java namedSrc/net/minecraft/advancement/Advancement.java
--- namedTargetSrc/net/minecraft/advancement/Advancement.java	2024-03-09 04:30:04.740364208 +0000
+++ namedSrc/net/minecraft/advancement/Advancement.java	2024-03-09 04:28:56.920263073 +0000
@@ -123,7 +123,7 @@
     */
    private void toPacket(RegistryByteBuf requirements) {
       requirements.writeOptional(this.parent, PacketByteBuf::writeIdentifier);
-      AdvancementDisplay.PACKET_CODEC.apply(PacketCodecs::m_ciouqnhu).encode(requirements, this.display);
+      AdvancementDisplay.PACKET_CODEC.apply(PacketCodecs::optional).encode(requirements, this.display);
       this.requirements.toPacket(requirements);
       requirements.writeBoolean(this.sendsTelemetryEvent);
    }
@@ -135,7 +135,7 @@
    private static Advancement fromPacket(RegistryByteBuf requirements) {
       return new Advancement(
          requirements.readOptional(PacketByteBuf::readIdentifier),
-         (Optional<AdvancementDisplay>)AdvancementDisplay.PACKET_CODEC.apply(PacketCodecs::m_ciouqnhu).decode(requirements),
+         (Optional<AdvancementDisplay>)AdvancementDisplay.PACKET_CODEC.apply(PacketCodecs::optional).decode(requirements),
          AdvancementRewards.NONE,
          Map.of(),
          new AdvancementRequirements(requirements),
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/CriterionProgress.java namedSrc/net/minecraft/advancement/criterion/CriterionProgress.java
--- namedTargetSrc/net/minecraft/advancement/criterion/CriterionProgress.java	2024-03-09 04:30:04.728364190 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CriterionProgress.java	2024-03-09 04:28:56.900263046 +0000
@@ -75,7 +75,7 @@
     * @mapping {@literal named toPacket Lnet/minecraft/advancement/criterion/CriterionProgress;toPacket(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    public void toPacket(PacketByteBuf buf) {
-      buf.m_zcmiuaxl(this.completedDate, PacketByteBuf::writeInstant);
+      buf.writeNullable(this.completedDate, PacketByteBuf::writeInstant);
    }
 
    /**
@@ -84,7 +84,7 @@
     */
    public static CriterionProgress fromPacket(PacketByteBuf buf) {
       CriterionProgress lv = new CriterionProgress();
-      lv.completedDate = buf.m_fjolbvuh(PacketByteBuf::readInstant);
+      lv.completedDate = buf.readNullable(PacketByteBuf::readInstant);
       return lv;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/BannerBlockEntity.java namedSrc/net/minecraft/block/entity/BannerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-03-09 04:30:04.776364261 +0000
+++ namedSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-03-09 04:28:56.968263140 +0000
@@ -108,7 +108,10 @@
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.writeNbt(nbt, arg2);
       if (!this.f_yqkmzniy.equals(C_wwbphpbp.f_hnnrbutf)) {
-         nbt.put("patterns", Util.getOrThrow(C_wwbphpbp.CODEC.encodeStart(arg2.m_uwaazyzq(NbtOps.INSTANCE), this.f_yqkmzniy), IllegalStateException::new));
+         nbt.put(
+            "patterns",
+            Util.getOrThrow(C_wwbphpbp.CODEC.encodeStart(arg2.createSerializationContext(NbtOps.INSTANCE), this.f_yqkmzniy), IllegalStateException::new)
+         );
       }
 
       if (this.customName != null) {
@@ -128,7 +131,7 @@
 
       if (nbt.contains("patterns")) {
          C_wwbphpbp.CODEC
-            .parse(arg2.m_uwaazyzq(NbtOps.INSTANCE), nbt.get("patterns"))
+            .parse(arg2.createSerializationContext(NbtOps.INSTANCE), nbt.get("patterns"))
             .resultOrPartial(string -> LOGGER.error("Failed to parse banner patterns: '{}'", string))
             .ifPresent(arg -> this.f_yqkmzniy = arg);
       }
diff -bur namedTargetSrc/net/minecraft/block/entity/BannerPattern.java namedSrc/net/minecraft/block/entity/BannerPattern.java
--- namedTargetSrc/net/minecraft/block/entity/BannerPattern.java	2024-03-09 04:30:04.736364202 +0000
+++ namedSrc/net/minecraft/block/entity/BannerPattern.java	2024-03-09 04:28:56.912263063 +0000
@@ -28,7 +28,7 @@
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, BannerPattern> f_ntxvrihf = PacketCodec.create(
+   public static final PacketCodec<RegistryByteBuf, BannerPattern> f_ntxvrihf = PacketCodec.tuple(
       Identifier.PACKET_CODEC, BannerPattern::assetId, PacketCodecs.STRING, BannerPattern::translationKey, BannerPattern::new
    );
    /**
@@ -38,5 +38,5 @@
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, Holder<BannerPattern>> f_zfnqliun = PacketCodecs.registryEntry(RegistryKeys.BANNER_PATTERN, f_ntxvrihf);
+   public static final PacketCodec<RegistryByteBuf, Holder<BannerPattern>> f_zfnqliun = PacketCodecs.holder(RegistryKeys.BANNER_PATTERN, f_ntxvrihf);
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/BeehiveBlockEntity.java namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-03-09 04:30:04.792364284 +0000
+++ namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-03-09 04:28:56.988263169 +0000
@@ -543,10 +543,11 @@
        */
       public static final Codec<List<BeehiveBlockEntity.C_cakykluc>> f_mffcrvpw = f_yzeidvrx.listOf();
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_avqlsgls Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;f_avqlsgls:Lnet/minecraft/unmapped/C_qsrmwluu;}
+       * @mapping {@literal named PACKET_CODEC Lnet/minecraft/block/entity/BeehiveBlockEntity$C_cakykluc;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, BeehiveBlockEntity.C_cakykluc> f_avqlsgls = PacketCodec.m_kqzabmpi(
-         C_incrreuu.f_lvjwhawk,
+      public static final PacketCodec<ByteBuf, BeehiveBlockEntity.C_cakykluc> PACKET_CODEC = PacketCodec.tuple(
+         C_incrreuu.PACKET_CODEC,
          BeehiveBlockEntity.C_cakykluc::entityData,
          PacketCodecs.VAR_INT,
          BeehiveBlockEntity.C_cakykluc::ticksInHive,
diff -bur namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java namedSrc/net/minecraft/block/entity/SignBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SignBlockEntity.java	2024-03-09 04:30:04.920364474 +0000
+++ namedSrc/net/minecraft/block/entity/SignBlockEntity.java	2024-03-09 04:28:57.132263363 +0000
@@ -162,7 +162,7 @@
    @Override
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.writeNbt(nbt, arg2);
-      DynamicOps<NbtElement> dynamicOps = arg2.m_uwaazyzq(NbtOps.INSTANCE);
+      DynamicOps<NbtElement> dynamicOps = arg2.createSerializationContext(NbtOps.INSTANCE);
       SignText.CODEC.encodeStart(dynamicOps, this.frontText).resultOrPartial(LOGGER::error).ifPresent(element -> nbt.put("front_text", element));
       SignText.CODEC.encodeStart(dynamicOps, this.backText).resultOrPartial(LOGGER::error).ifPresent(element -> nbt.put("back_text", element));
       nbt.putBoolean("is_waxed", this.waxed);
@@ -174,7 +174,7 @@
    @Override
    public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.readNbt(nbt, arg2);
-      DynamicOps<NbtElement> dynamicOps = arg2.m_uwaazyzq(NbtOps.INSTANCE);
+      DynamicOps<NbtElement> dynamicOps = arg2.createSerializationContext(NbtOps.INSTANCE);
       if (nbt.contains("front_text")) {
          SignText.CODEC
             .parse(dynamicOps, nbt.getCompound("front_text"))
diff -bur namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java namedSrc/net/minecraft/block/entity/SkullBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-03-09 04:30:04.916364468 +0000
+++ namedSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-03-09 04:28:57.124263353 +0000
@@ -294,7 +294,7 @@
     */
    public static CompletableFuture<Optional<GameProfile>> fetchProfile(String name) {
       LoadingCache<String, CompletableFuture<Optional<GameProfile>>> loadingCache = userCache;
-      return loadingCache != null && ChatUtil.m_anvjegoa(name) ? loadingCache.getUnchecked(name) : CompletableFuture.completedFuture(Optional.empty());
+      return loadingCache != null && ChatUtil.isValidPlayerName(name) ? loadingCache.getUnchecked(name) : CompletableFuture.completedFuture(Optional.empty());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/VaultBlockEntity.java namedSrc/net/minecraft/block/entity/VaultBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/VaultBlockEntity.java	2024-03-09 04:30:04.780364267 +0000
+++ namedSrc/net/minecraft/block/entity/VaultBlockEntity.java	2024-03-09 04:28:56.968263140 +0000
@@ -113,7 +113,7 @@
     * @mapping {@literal named m_pdkrtrkx Lnet/minecraft/block/entity/VaultBlockEntity;m_pdkrtrkx(Lcom/mojang/serialization/Codec;Ljava/lang/Object;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/nbt/NbtElement;}
     */
    private static <T> NbtElement m_pdkrtrkx(Codec<T> codec, T object, HolderLookup.Provider arg) {
-      return Util.getOrThrow(codec.encodeStart(arg.m_uwaazyzq(NbtOps.INSTANCE), object), IllegalStateException::new);
+      return Util.getOrThrow(codec.encodeStart(arg.createSerializationContext(NbtOps.INSTANCE), object), IllegalStateException::new);
    }
 
    /**
@@ -122,7 +122,7 @@
    @Override
    public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.readNbt(nbt, arg2);
-      DynamicOps<NbtElement> dynamicOps = arg2.m_uwaazyzq(NbtOps.INSTANCE);
+      DynamicOps<NbtElement> dynamicOps = arg2.createSerializationContext(NbtOps.INSTANCE);
       if (nbt.contains("server_data")) {
          C_nsbycoiv.codec.parse(dynamicOps, nbt.get("server_data")).resultOrPartial(LOGGER::error).ifPresent(this.f_uordyfhu::m_berunhjy);
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-03-09 04:30:04.688364131 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-03-09 04:28:56.848262973 +0000
@@ -552,10 +552,10 @@
                   throw new IllegalStateException("Needs at least one biome continue");
                } else {
                   WorldCreationContext lvx = this.worldCreator.getContext();
-                  DynamicOps<JsonElement> dynamicOps = lvx.getWorldgenRegistryManager().m_uwaazyzq(JsonOps.INSTANCE);
+                  DynamicOps<JsonElement> dynamicOps = lvx.getWorldgenRegistryManager().createSerializationContext(JsonOps.INSTANCE);
                   DataResult<JsonElement> dataResult = GeneratorOptions.encode(dynamicOps, lvx.options(), lvx.selectedDimensions())
                      .setLifecycle(Lifecycle.stable());
-                  DynamicOps<JsonElement> dynamicOps2 = context.datapackWorldgen().m_uwaazyzq(JsonOps.INSTANCE);
+                  DynamicOps<JsonElement> dynamicOps2 = context.datapackWorldgen().createSerializationContext(JsonOps.INSTANCE);
                   GeneratorOptions lv2 = dataResult.<GeneratorOptions>flatMap(encodedOptions -> GeneratorOptions.CODEC.parse(dynamicOps2, encodedOptions))
                      .getOrThrow(false, Util.addPrefix("Error parsing worldgen settings after loading data packs: ", LOGGER::error));
                   return new WorldLoader.DataLoadOutput<>(
diff -bur namedTargetSrc/net/minecraft/client/option/HotbarStorageEntry.java namedSrc/net/minecraft/client/option/HotbarStorageEntry.java
--- namedTargetSrc/net/minecraft/client/option/HotbarStorageEntry.java	2024-03-09 04:30:04.656364083 +0000
+++ namedSrc/net/minecraft/client/option/HotbarStorageEntry.java	2024-03-09 04:28:56.812262923 +0000
@@ -98,7 +98,7 @@
     * @mapping {@literal named m_xgurgxqq Lnet/minecraft/client/option/HotbarStorageEntry;m_xgurgxqq(Lnet/minecraft/entity/player/PlayerInventory;Lnet/minecraft/registry/DynamicRegistryManager;)V}
     */
    public void m_xgurgxqq(PlayerInventory arg, DynamicRegistryManager registryManager) {
-      RegistryOps<NbtElement> lv = registryManager.m_uwaazyzq(OPS);
+      RegistryOps<NbtElement> lv = registryManager.createSerializationContext(OPS);
       Builder<Dynamic<?>> builder = ImmutableList.builderWithExpectedSize(f_ceiuqqzz);
 
       for (int i = 0; i < f_ceiuqqzz; i++) {
diff -bur namedTargetSrc/net/minecraft/command/argument/ItemStackArgument.java namedSrc/net/minecraft/command/argument/ItemStackArgument.java
--- namedTargetSrc/net/minecraft/command/argument/ItemStackArgument.java	2024-03-09 04:30:04.836364349 +0000
+++ namedSrc/net/minecraft/command/argument/ItemStackArgument.java	2024-03-09 04:28:57.036263234 +0000
@@ -92,7 +92,7 @@
     * Mapping not found
     */
    private String m_wxinkgmq(HolderLookup.Provider arg) {
-      DynamicOps<NbtElement> dynamicOps = arg.m_uwaazyzq(NbtOps.INSTANCE);
+      DynamicOps<NbtElement> dynamicOps = arg.createSerializationContext(NbtOps.INSTANCE);
       return (String)this.f_oggohapd.m_qpbbhvpw().flatMap(argx -> {
          C_pscqxfcs<?> lv = argx.type();
          Identifier lv2 = Registries.DATA_COMPONENT_TYPE.getId(lv);
diff -bur namedTargetSrc/net/minecraft/data/DataProvider.java namedSrc/net/minecraft/data/DataProvider.java
--- namedTargetSrc/net/minecraft/data/DataProvider.java	2024-03-09 04:30:04.740364208 +0000
+++ namedSrc/net/minecraft/data/DataProvider.java	2024-03-09 04:28:56.916263068 +0000
@@ -64,7 +64,7 @@
     * @mapping {@literal named m_oiidqwdo Lnet/minecraft/data/DataProvider;m_oiidqwdo(Lnet/minecraft/data/DataWriter;Lnet/minecraft/registry/HolderLookup$Provider;Lcom/mojang/serialization/Codec;Ljava/lang/Object;Ljava/nio/file/Path;)Ljava/util/concurrent/CompletableFuture;}
     */
    static <T> CompletableFuture<?> m_oiidqwdo(DataWriter writer, HolderLookup.Provider arg2, Codec<T> codec, T object, Path path) {
-      RegistryOps<JsonElement> lv = arg2.m_uwaazyzq(JsonOps.INSTANCE);
+      RegistryOps<JsonElement> lv = arg2.createSerializationContext(JsonOps.INSTANCE);
       JsonElement jsonElement = Util.getOrThrow(codec.encodeStart(lv, object), IllegalStateException::new);
       return writeToPath(writer, jsonElement, path);
    }
diff -bur namedTargetSrc/net/minecraft/data/report/BiomeParametersProvider.java namedSrc/net/minecraft/data/report/BiomeParametersProvider.java
--- namedTargetSrc/net/minecraft/data/report/BiomeParametersProvider.java	2024-03-09 04:30:04.652364077 +0000
+++ namedSrc/net/minecraft/data/report/BiomeParametersProvider.java	2024-03-09 04:28:56.804262911 +0000
@@ -74,7 +74,7 @@
       return this.lookupProvider
          .thenCompose(
             arg2 -> {
-               DynamicOps<JsonElement> dynamicOps = arg2.m_uwaazyzq(JsonOps.INSTANCE);
+               DynamicOps<JsonElement> dynamicOps = arg2.createSerializationContext(JsonOps.INSTANCE);
                List<CompletableFuture<?>> list = new ArrayList();
                MultiNoiseBiomeSourceParameterList.m_dhdwhiqm()
                   .forEach((arg2x, arg3) -> list.add(write(this.resolveFile(arg2x.id()), writer, dynamicOps, CODEC, arg3)));
diff -bur namedTargetSrc/net/minecraft/data/report/BlockListProvider.java namedSrc/net/minecraft/data/report/BlockListProvider.java
--- namedTargetSrc/net/minecraft/data/report/BlockListProvider.java	2024-03-09 04:30:04.704364155 +0000
+++ namedSrc/net/minecraft/data/report/BlockListProvider.java	2024-03-09 04:28:56.868263001 +0000
@@ -53,7 +53,7 @@
          .thenCompose(
             arg2 -> {
                JsonObject jsonObject = new JsonObject();
-               RegistryOps<JsonElement> lv = arg2.m_uwaazyzq(JsonOps.INSTANCE);
+               RegistryOps<JsonElement> lv = arg2.createSerializationContext(JsonOps.INSTANCE);
                arg2.getLookupOrThrow(RegistryKeys.BLOCK)
                   .holders()
                   .forEach(
diff -bur namedTargetSrc/net/minecraft/data/report/RegistriesDataPackProvider.java namedSrc/net/minecraft/data/report/RegistriesDataPackProvider.java
--- namedTargetSrc/net/minecraft/data/report/RegistriesDataPackProvider.java	2024-03-09 04:30:04.876364409 +0000
+++ namedSrc/net/minecraft/data/report/RegistriesDataPackProvider.java	2024-03-09 04:28:57.084263298 +0000
@@ -55,7 +55,7 @@
       return this.lookupProvider
          .thenCompose(
             provider -> {
-               DynamicOps<JsonElement> dynamicOps = provider.m_uwaazyzq(JsonOps.INSTANCE);
+               DynamicOps<JsonElement> dynamicOps = provider.createSerializationContext(JsonOps.INSTANCE);
                return CompletableFuture.allOf(
                   (CompletableFuture[])RegistryLoader.WORLDGEN_REGISTRIES
                      .stream()
diff -bur namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java namedSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java
--- namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java	2024-03-09 04:30:04.740364208 +0000
+++ namedSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java	2024-03-09 04:28:56.920263073 +0000
@@ -45,9 +45,10 @@
     */
    public static final Codec<EntityAttributeModifier> f_qcjtagbu = f_bfacrmpa.codec();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_slcgssqv Lnet/minecraft/unmapped/C_hdbqsqsm;f_slcgssqv:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/attribute/EntityAttributeModifier;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<ByteBuf, EntityAttributeModifier> f_slcgssqv = PacketCodec.m_ouxffrgo(
+   public static final PacketCodec<ByteBuf, EntityAttributeModifier> PACKET_CODEC = PacketCodec.tuple(
       UuidUtil.packetCodec,
       EntityAttributeModifier::id,
       PacketCodecs.STRING,
@@ -145,7 +146,7 @@
        * @mapping {@literal hashed f_umhgvzca Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;f_umhgvzca:Lnet/minecraft/unmapped/C_qsrmwluu;}
        * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, EntityAttributeModifier.Operation> PACKET_CODEC = PacketCodecs.m_oxatcqxo(
+      public static final PacketCodec<ByteBuf, EntityAttributeModifier.Operation> PACKET_CODEC = PacketCodecs.indexed(
          f_qrkmptcr, EntityAttributeModifier.Operation::getId
       );
       /**
diff -bur namedTargetSrc/net/minecraft/entity/data/TrackedDataHandler.java namedSrc/net/minecraft/entity/data/TrackedDataHandler.java
--- namedTargetSrc/net/minecraft/entity/data/TrackedDataHandler.java	2024-03-09 04:30:04.664364095 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandler.java	2024-03-09 04:28:56.820262934 +0000
@@ -27,10 +27,11 @@
    T copy(T object);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eoamrvbe Lnet/minecraft/unmapped/C_xrzqxzbg;m_eoamrvbe(Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_xrzqxzbg;}
+    * @mapping {@literal named m_eoamrvbe Lnet/minecraft/entity/data/TrackedDataHandler;m_eoamrvbe(Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   static <T> TrackedDataHandler<T> m_eoamrvbe(PacketCodec<? super RegistryByteBuf, T> arg) {
-      return () -> arg;
+   static <T> TrackedDataHandler<T> m_eoamrvbe(PacketCodec<? super RegistryByteBuf, T> packetCodec) {
+      return () -> packetCodec;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java
--- namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-03-09 04:30:04.780364267 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-03-09 04:28:56.972263147 +0000
@@ -91,7 +91,7 @@
        */
       @Override
       public PacketCodec<? super RegistryByteBuf, ItemStack> codec() {
-         return ItemStack.f_iboyubuh;
+         return ItemStack.OPTIONAL_PACKET_CODEC;
       }
 
       /**
@@ -106,7 +106,7 @@
     * @mapping {@literal hashed f_dhomndic Lnet/minecraft/unmapped/C_fegtripb;f_dhomndic:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named BLOCK_STATE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;BLOCK_STATE:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<BlockState> BLOCK_STATE = TrackedDataHandler.m_eoamrvbe(PacketCodecs.m_jqcxtmyk(Block.STATE_IDS));
+   public static final TrackedDataHandler<BlockState> BLOCK_STATE = TrackedDataHandler.m_eoamrvbe(PacketCodecs.entryOf(Block.STATE_IDS));
    /**
     * Mapping not found
     */
@@ -151,35 +151,35 @@
     * @mapping {@literal hashed f_bhjosbpm Lnet/minecraft/unmapped/C_fegtripb;f_bhjosbpm:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named ROTATION Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;ROTATION:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<EulerAngle> ROTATION = TrackedDataHandler.m_eoamrvbe(EulerAngle.f_levhkgbx);
+   public static final TrackedDataHandler<EulerAngle> ROTATION = TrackedDataHandler.m_eoamrvbe(EulerAngle.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_qprbpdxq Lnet/minecraft/unmapped/C_fegtripb;f_qprbpdxq:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named BLOCK_POS Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;BLOCK_POS:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<BlockPos> BLOCK_POS = TrackedDataHandler.m_eoamrvbe(BlockPos.f_mcthbtbh);
+   public static final TrackedDataHandler<BlockPos> BLOCK_POS = TrackedDataHandler.m_eoamrvbe(BlockPos.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_adnhcqal Lnet/minecraft/unmapped/C_fegtripb;f_adnhcqal:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named OPTIONAL_BLOCK_POS Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_BLOCK_POS:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
    public static final TrackedDataHandler<Optional<BlockPos>> OPTIONAL_BLOCK_POS = TrackedDataHandler.m_eoamrvbe(
-      BlockPos.f_mcthbtbh.apply(PacketCodecs::m_ciouqnhu)
+      BlockPos.PACKET_CODEC.apply(PacketCodecs::optional)
    );
    /**
     * @mapping {@literal hashed f_aytkmhuo Lnet/minecraft/unmapped/C_fegtripb;f_aytkmhuo:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named DIRECTION Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;DIRECTION:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Direction> DIRECTION = TrackedDataHandler.m_eoamrvbe(Direction.f_nxrqizwh);
+   public static final TrackedDataHandler<Direction> DIRECTION = TrackedDataHandler.m_eoamrvbe(Direction.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_dwamwwzn Lnet/minecraft/unmapped/C_fegtripb;f_dwamwwzn:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named OPTIONAL_UUID Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_UUID:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Optional<UUID>> OPTIONAL_UUID = TrackedDataHandler.m_eoamrvbe(UuidUtil.packetCodec.apply(PacketCodecs::m_ciouqnhu));
+   public static final TrackedDataHandler<Optional<UUID>> OPTIONAL_UUID = TrackedDataHandler.m_eoamrvbe(UuidUtil.packetCodec.apply(PacketCodecs::optional));
    /**
     * @mapping {@literal hashed f_ifjlggjg Lnet/minecraft/unmapped/C_fegtripb;f_ifjlggjg:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named OPTIONAL_GLOBAL_POSITION Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;OPTIONAL_GLOBAL_POSITION:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
    public static final TrackedDataHandler<Optional<GlobalPos>> OPTIONAL_GLOBAL_POSITION = TrackedDataHandler.m_eoamrvbe(
-      GlobalPos.f_pchoperd.apply(PacketCodecs::m_ciouqnhu)
+      GlobalPos.PACKET_CODEC.apply(PacketCodecs::optional)
    );
    /**
     * @mapping {@literal hashed f_kpwqpgno Lnet/minecraft/unmapped/C_fegtripb;f_kpwqpgno:Lnet/minecraft/unmapped/C_xrzqxzbg;}
@@ -191,7 +191,7 @@
        */
       @Override
       public PacketCodec<? super RegistryByteBuf, NbtCompound> codec() {
-         return PacketCodecs.f_crcpeyzs;
+         return PacketCodecs.UNLIMITED_NBT_COMPOUND;
       }
 
       /**
@@ -237,7 +237,7 @@
     * @mapping {@literal hashed f_cdzoruas Lnet/minecraft/unmapped/C_fegtripb;f_cdzoruas:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named ENTITY_POSE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;ENTITY_POSE:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<EntityPose> ENTITY_POSE = TrackedDataHandler.m_eoamrvbe(EntityPose.f_drjcyate);
+   public static final TrackedDataHandler<EntityPose> ENTITY_POSE = TrackedDataHandler.m_eoamrvbe(EntityPose.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_ykhchcdb Lnet/minecraft/unmapped/C_fegtripb;f_ykhchcdb:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named CAT_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;CAT_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
@@ -246,7 +246,7 @@
    /**
     * Mapping not found
     */
-   public static final TrackedDataHandler<Holder<C_qgilydva>> f_jymqxprw = TrackedDataHandler.m_eoamrvbe(PacketCodecs.registryEntry(RegistryKeys.WOLF_VARIANT));
+   public static final TrackedDataHandler<Holder<C_qgilydva>> f_jymqxprw = TrackedDataHandler.m_eoamrvbe(PacketCodecs.holder(RegistryKeys.WOLF_VARIANT));
    /**
     * @mapping {@literal hashed f_vcohujss Lnet/minecraft/unmapped/C_fegtripb;f_vcohujss:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named FROG_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;FROG_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
@@ -257,18 +257,18 @@
     * @mapping {@literal named PAINTING_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;PAINTING_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
    public static final TrackedDataHandler<Holder<PaintingVariant>> PAINTING_VARIANT = TrackedDataHandler.m_eoamrvbe(
-      PacketCodecs.registryEntry(RegistryKeys.PAINTING_VARIANT)
+      PacketCodecs.holder(RegistryKeys.PAINTING_VARIANT)
    );
    /**
     * @mapping {@literal hashed f_zxvfivae Lnet/minecraft/unmapped/C_fegtripb;f_zxvfivae:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named ARMADILLO_STATE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;ARMADILLO_STATE:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<ArmadilloEntity.State> ARMADILLO_STATE = TrackedDataHandler.m_eoamrvbe(ArmadilloEntity.State.f_anjxyhoc);
+   public static final TrackedDataHandler<ArmadilloEntity.State> ARMADILLO_STATE = TrackedDataHandler.m_eoamrvbe(ArmadilloEntity.State.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_abgbckne Lnet/minecraft/unmapped/C_fegtripb;f_abgbckne:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named SNIFFER_STATE Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;SNIFFER_STATE:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<SnifferEntity.State> SNIFFER_STATE = TrackedDataHandler.m_eoamrvbe(SnifferEntity.State.f_jiyqkeyh);
+   public static final TrackedDataHandler<SnifferEntity.State> SNIFFER_STATE = TrackedDataHandler.m_eoamrvbe(SnifferEntity.State.PACKET_CODEC);
    /**
     * @mapping {@literal hashed f_teokfohv Lnet/minecraft/unmapped/C_fegtripb;f_teokfohv:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named VECTOR3F Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;VECTOR3F:Lnet/minecraft/entity/data/TrackedDataHandler;}
diff -bur namedTargetSrc/net/minecraft/entity/effect/StatusEffectInstance.java namedSrc/net/minecraft/entity/effect/StatusEffectInstance.java
--- namedTargetSrc/net/minecraft/entity/effect/StatusEffectInstance.java	2024-03-09 04:30:04.796364290 +0000
+++ namedSrc/net/minecraft/entity/effect/StatusEffectInstance.java	2024-03-09 04:28:56.996263180 +0000
@@ -59,12 +59,13 @@
             .apply(instance, StatusEffectInstance::new)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fmkfvhmz Lnet/minecraft/unmapped/C_wpfizwve;f_fmkfvhmz:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/effect/StatusEffectInstance;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, StatusEffectInstance> f_fmkfvhmz = PacketCodec.create(
-      PacketCodecs.registryEntry(RegistryKeys.STATUS_EFFECT),
+   public static final PacketCodec<RegistryByteBuf, StatusEffectInstance> PACKET_CODEC = PacketCodec.tuple(
+      PacketCodecs.holder(RegistryKeys.STATUS_EFFECT),
       StatusEffectInstance::getEffectType,
-      StatusEffectInstance.C_ivhzuvgd.f_axasinhf,
+      StatusEffectInstance.C_ivhzuvgd.PACKET_CODEC,
       StatusEffectInstance::m_cxsaifnx,
       StatusEffectInstance::new
    );
@@ -626,11 +627,11 @@
        * @mapping {@literal hashed f_nqqokkdi Lnet/minecraft/unmapped/C_wpfizwve$C_ivhzuvgd;f_nqqokkdi:Lcom/mojang/serialization/MapCodec;}
        * @mapping {@literal named CODEC Lnet/minecraft/entity/effect/StatusEffectInstance$C_ivhzuvgd;CODEC:Lcom/mojang/serialization/MapCodec;}
        */
-      public static final MapCodec<StatusEffectInstance.C_ivhzuvgd> CODEC = Codecs.m_wqqvahsk(
+      public static final MapCodec<StatusEffectInstance.C_ivhzuvgd> CODEC = Codecs.createRecursiveMap(
          "MobEffectInstance.Details",
          codec -> RecordCodecBuilder.mapCodec(
                instance -> instance.group(
-                        Codecs.createStrictOptionalField(Codecs.f_oqekknlk, "amplifier", 0).forGetter(StatusEffectInstance.C_ivhzuvgd::amplifier),
+                        Codecs.createStrictOptionalField(Codecs.UNSIGNED_BYTE, "amplifier", 0).forGetter(StatusEffectInstance.C_ivhzuvgd::amplifier),
                         Codecs.createStrictOptionalField(Codec.INT, "duration", 0).forGetter(StatusEffectInstance.C_ivhzuvgd::duration),
                         Codecs.createStrictOptionalField(Codec.BOOL, "ambient", false).forGetter(StatusEffectInstance.C_ivhzuvgd::ambient),
                         Codecs.createStrictOptionalField(Codec.BOOL, "show_particles", true).forGetter(StatusEffectInstance.C_ivhzuvgd::showParticles),
@@ -641,10 +642,11 @@
             )
       );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_axasinhf Lnet/minecraft/unmapped/C_wpfizwve$C_ivhzuvgd;f_axasinhf:Lnet/minecraft/unmapped/C_qsrmwluu;}
+       * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/effect/StatusEffectInstance$C_ivhzuvgd;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, StatusEffectInstance.C_ivhzuvgd> f_axasinhf = PacketCodec.m_ufniiqur(
-         arg -> PacketCodec.m_ysrdtnvi(
+      public static final PacketCodec<ByteBuf, StatusEffectInstance.C_ivhzuvgd> PACKET_CODEC = PacketCodec.recursive(
+         packetCodec -> PacketCodec.tuple(
                PacketCodecs.VAR_INT,
                StatusEffectInstance.C_ivhzuvgd::amplifier,
                PacketCodecs.VAR_INT,
@@ -655,7 +657,7 @@
                StatusEffectInstance.C_ivhzuvgd::showParticles,
                PacketCodecs.BOOL,
                StatusEffectInstance.C_ivhzuvgd::showIcon,
-               arg.apply(PacketCodecs::m_ciouqnhu),
+               packetCodec.apply(PacketCodecs::optional),
                StatusEffectInstance.C_ivhzuvgd::hiddenEffect,
                StatusEffectInstance.C_ivhzuvgd::new
             )
diff -bur namedTargetSrc/net/minecraft/entity/EntityPose.java namedSrc/net/minecraft/entity/EntityPose.java
--- namedTargetSrc/net/minecraft/entity/EntityPose.java	2024-03-09 04:30:04.700364148 +0000
+++ namedSrc/net/minecraft/entity/EntityPose.java	2024-03-09 04:28:56.864262995 +0000
@@ -107,9 +107,10 @@
     */
    public static final IntFunction<EntityPose> f_iutbzuhu = IdListUtil.sortArray(EntityPose::m_hbfckuwh, values(), IdListUtil.OutOfBoundsHandler.ZERO);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_drjcyate Lnet/minecraft/unmapped/C_ufdjspmk;f_drjcyate:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/EntityPose;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<ByteBuf, EntityPose> f_drjcyate = PacketCodecs.m_oxatcqxo(f_iutbzuhu, EntityPose::m_hbfckuwh);
+   public static final PacketCodec<ByteBuf, EntityPose> PACKET_CODEC = PacketCodecs.indexed(f_iutbzuhu, EntityPose::m_hbfckuwh);
    /**
     * Mapping not found
     */
diff -bur namedTargetSrc/net/minecraft/entity/mob/ZombieVillagerEntity.java namedSrc/net/minecraft/entity/mob/ZombieVillagerEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/ZombieVillagerEntity.java	2024-03-09 04:30:04.876364409 +0000
+++ namedSrc/net/minecraft/entity/mob/ZombieVillagerEntity.java	2024-03-09 04:28:57.080263293 +0000
@@ -149,7 +149,9 @@
       if (this.offerData != null) {
          nbt.put(
             "Offers",
-            Util.getOrThrow(TradeOfferList.CODEC.encodeStart(this.m_jofogjft().m_uwaazyzq(NbtOps.INSTANCE), this.offerData), IllegalStateException::new)
+            Util.getOrThrow(
+               TradeOfferList.CODEC.encodeStart(this.m_jofogjft().createSerializationContext(NbtOps.INSTANCE), this.offerData), IllegalStateException::new
+            )
          );
       }
 
@@ -178,7 +180,7 @@
 
       if (nbt.contains("Offers")) {
          TradeOfferList.CODEC
-            .parse(this.m_jofogjft().m_uwaazyzq(NbtOps.INSTANCE), nbt.get("Offers"))
+            .parse(this.m_jofogjft().createSerializationContext(NbtOps.INSTANCE), nbt.get("Offers"))
             .resultOrPartial(Util.addPrefix("Failed to load offers: ", LOGGER::warn))
             .ifPresent(arg -> this.offerData = arg);
       }
diff -bur namedTargetSrc/net/minecraft/entity/passive/ArmadilloEntity.java namedSrc/net/minecraft/entity/passive/ArmadilloEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/ArmadilloEntity.java	2024-03-09 04:30:04.848364368 +0000
+++ namedSrc/net/minecraft/entity/passive/ArmadilloEntity.java	2024-03-09 04:28:57.052263255 +0000
@@ -638,9 +638,10 @@
          ArmadilloEntity.State::m_iofbcnyp, values(), IdListUtil.OutOfBoundsHandler.ZERO
       );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_anjxyhoc Lnet/minecraft/unmapped/C_isgylmfr$C_wqokwagt;f_anjxyhoc:Lnet/minecraft/unmapped/C_qsrmwluu;}
+       * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/passive/ArmadilloEntity$State;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, ArmadilloEntity.State> f_anjxyhoc = PacketCodecs.m_oxatcqxo(f_fxutpqqj, ArmadilloEntity.State::m_iofbcnyp);
+      public static final PacketCodec<ByteBuf, ArmadilloEntity.State> PACKET_CODEC = PacketCodecs.indexed(f_fxutpqqj, ArmadilloEntity.State::m_iofbcnyp);
       /**
        * Mapping not found
        */
diff -bur namedTargetSrc/net/minecraft/entity/passive/MerchantEntity.java namedSrc/net/minecraft/entity/passive/MerchantEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/MerchantEntity.java	2024-03-09 04:30:04.868364397 +0000
+++ namedSrc/net/minecraft/entity/passive/MerchantEntity.java	2024-03-09 04:28:57.072263282 +0000
@@ -259,7 +259,10 @@
       super.writeCustomDataToNbt(nbt);
       TradeOfferList lv = this.getOffers();
       if (!lv.isEmpty()) {
-         nbt.put("Offers", Util.getOrThrow(TradeOfferList.CODEC.encodeStart(this.m_jofogjft().m_uwaazyzq(NbtOps.INSTANCE), lv), IllegalStateException::new));
+         nbt.put(
+            "Offers",
+            Util.getOrThrow(TradeOfferList.CODEC.encodeStart(this.m_jofogjft().createSerializationContext(NbtOps.INSTANCE), lv), IllegalStateException::new)
+         );
       }
 
       this.putInventory(nbt, this.m_jofogjft());
@@ -273,7 +276,7 @@
       super.readCustomDataFromNbt(nbt);
       if (nbt.contains("Offers")) {
          TradeOfferList.CODEC
-            .parse(this.m_jofogjft().m_uwaazyzq(NbtOps.INSTANCE), nbt.get("Offers"))
+            .parse(this.m_jofogjft().createSerializationContext(NbtOps.INSTANCE), nbt.get("Offers"))
             .resultOrPartial(Util.addPrefix("Failed to load offers: ", LOGGER::warn))
             .ifPresent(arg -> this.offers = arg);
       }
diff -bur namedTargetSrc/net/minecraft/entity/passive/SnifferEntity.java namedSrc/net/minecraft/entity/passive/SnifferEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/SnifferEntity.java	2024-03-09 04:30:04.780364267 +0000
+++ namedSrc/net/minecraft/entity/passive/SnifferEntity.java	2024-03-09 04:28:56.972263147 +0000
@@ -747,9 +747,10 @@
          SnifferEntity.State::m_jwgewysc, values(), IdListUtil.OutOfBoundsHandler.ZERO
       );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_jiyqkeyh Lnet/minecraft/unmapped/C_frelvdpe$C_ekatpfyn;f_jiyqkeyh:Lnet/minecraft/unmapped/C_qsrmwluu;}
+       * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/passive/SnifferEntity$State;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, SnifferEntity.State> f_jiyqkeyh = PacketCodecs.m_oxatcqxo(f_pkjifclz, SnifferEntity.State::m_jwgewysc);
+      public static final PacketCodec<ByteBuf, SnifferEntity.State> PACKET_CODEC = PacketCodecs.indexed(f_pkjifclz, SnifferEntity.State::m_jwgewysc);
       /**
        * Mapping not found
        */
diff -bur namedTargetSrc/net/minecraft/item/Instrument.java namedSrc/net/minecraft/item/Instrument.java
--- namedTargetSrc/net/minecraft/item/Instrument.java	2024-03-09 04:30:04.760364237 +0000
+++ namedSrc/net/minecraft/item/Instrument.java	2024-03-09 04:28:56.944263107 +0000
@@ -30,7 +30,7 @@
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, Instrument> f_vmxkrnak = PacketCodec.m_kqzabmpi(
+   public static final PacketCodec<RegistryByteBuf, Instrument> f_vmxkrnak = PacketCodec.tuple(
       SoundEvent.REGISTRY_PACKET_CODEC, Instrument::sound, PacketCodecs.VAR_INT, Instrument::duration, PacketCodecs.FLOAT, Instrument::range, Instrument::new
    );
    /**
@@ -41,5 +41,5 @@
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, Holder<Instrument>> f_ttwxxpiv = PacketCodecs.registryEntry(RegistryKeys.INSTRUMENT, f_vmxkrnak);
+   public static final PacketCodec<RegistryByteBuf, Holder<Instrument>> f_ttwxxpiv = PacketCodecs.holder(RegistryKeys.INSTRUMENT, f_vmxkrnak);
 }
diff -bur namedTargetSrc/net/minecraft/item/ItemStack.java namedSrc/net/minecraft/item/ItemStack.java
--- namedTargetSrc/net/minecraft/item/ItemStack.java	2024-03-09 04:30:04.720364178 +0000
+++ namedSrc/net/minecraft/item/ItemStack.java	2024-03-09 04:28:56.892263035 +0000
@@ -175,21 +175,22 @@
    /**
     * Mapping not found
     */
-   public static final Codec<ItemStack> f_duuhtyre = Codecs.m_ilnvpqgy(CODEC)
+   public static final Codec<ItemStack> f_duuhtyre = Codecs.optionalEmptyMap(CODEC)
       .xmap(optional -> (ItemStack)optional.orElse(ItemStack.EMPTY), stack -> stack.isEmpty() ? Optional.empty() : Optional.of(stack));
    /**
     * Mapping not found
     */
    public static final Codec<ItemStack> f_rrbqzuyq = NON_AIR_ITEM_CODEC.xmap(ItemStack::new, ItemStack::getHolder);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_iboyubuh Lnet/minecraft/unmapped/C_sddaxwyk;f_iboyubuh:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named OPTIONAL_PACKET_CODEC Lnet/minecraft/item/ItemStack;OPTIONAL_PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, ItemStack> f_iboyubuh = new PacketCodec<RegistryByteBuf, ItemStack>() {
+   public static final PacketCodec<RegistryByteBuf, ItemStack> OPTIONAL_PACKET_CODEC = new PacketCodec<RegistryByteBuf, ItemStack>() {
       /**
        * @mapping {@literal hashed f_ejfbjbgz Lnet/minecraft/unmapped/C_sddaxwyk$C_qbkytozl;f_ejfbjbgz:Lnet/minecraft/unmapped/C_qsrmwluu;}
        * @mapping {@literal named ITEM_PACKET_CODEC Lnet/minecraft/item/ItemStack$C_qbkytozl;ITEM_PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      private static final PacketCodec<RegistryByteBuf, Holder<Item>> ITEM_PACKET_CODEC = PacketCodecs.registryEntry(RegistryKeys.ITEM);
+      private static final PacketCodec<RegistryByteBuf, Holder<Item>> ITEM_PACKET_CODEC = PacketCodecs.holder(RegistryKeys.ITEM);
 
       /**
        * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_sddaxwyk$C_qbkytozl;decode(Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_sddaxwyk;}
@@ -201,7 +202,7 @@
             return ItemStack.EMPTY;
          } else {
             Holder<Item> lv = ITEM_PACKET_CODEC.decode(arg);
-            C_jqyoylib lv2 = C_jqyoylib.f_ceranigh.decode(arg);
+            C_jqyoylib lv2 = C_jqyoylib.PACKET_CODEC.decode(arg);
             return new ItemStack(lv, i, lv2);
          }
       }
@@ -216,7 +217,7 @@
          } else {
             arg.writeVarInt(stack.getCount());
             ITEM_PACKET_CODEC.encode(arg, stack.getHolder());
-            C_jqyoylib.f_ceranigh.encode(arg, stack.f_bgqyysyj.m_hcxzaime());
+            C_jqyoylib.PACKET_CODEC.encode(arg, stack.f_bgqyysyj.m_hcxzaime());
          }
       }
    };
@@ -230,7 +231,7 @@
        * @mapping {@literal named decode Lnet/minecraft/item/ItemStack$C_atxqyxsn;decode(Lnet/minecraft/network/RegistryByteBuf;)Lnet/minecraft/item/ItemStack;}
        */
       public ItemStack decode(RegistryByteBuf arg) {
-         ItemStack lv = ItemStack.f_iboyubuh.decode(arg);
+         ItemStack lv = ItemStack.OPTIONAL_PACKET_CODEC.decode(arg);
          if (lv.isEmpty()) {
             throw new DecoderException("Empty ItemStack not allowed");
          } else {
@@ -246,18 +247,18 @@
          if (stack.isEmpty()) {
             throw new EncoderException("Empty ItemStack not allowed");
          } else {
-            ItemStack.f_iboyubuh.encode(arg, stack);
+            ItemStack.OPTIONAL_PACKET_CODEC.encode(arg, stack);
          }
       }
    };
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, List<ItemStack>> f_eculldrq = f_iboyubuh.apply(PacketCodecs.m_yypssatp(DefaultedList::ofSize));
+   public static final PacketCodec<RegistryByteBuf, List<ItemStack>> f_eculldrq = OPTIONAL_PACKET_CODEC.apply(PacketCodecs.toCollection(DefaultedList::ofSize));
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, List<ItemStack>> f_hnyuumqo = PACKET_CODEC.apply(PacketCodecs.m_yypssatp(DefaultedList::ofSize));
+   public static final PacketCodec<RegistryByteBuf, List<ItemStack>> f_hnyuumqo = PACKET_CODEC.apply(PacketCodecs.toCollection(DefaultedList::ofSize));
    /**
     * @mapping {@literal hashed f_ohakxxel Lnet/minecraft/unmapped/C_sddaxwyk;f_ohakxxel:Lorg/slf4j/Logger;}
     * @mapping {@literal named LOGGER Lnet/minecraft/item/ItemStack;LOGGER:Lorg/slf4j/Logger;}
@@ -399,7 +400,8 @@
     * Mapping not found
     */
    public static Optional<ItemStack> m_izgziaft(HolderLookup.Provider arg, NbtElement arg2) {
-      return CODEC.parse(arg.m_uwaazyzq(NbtOps.INSTANCE), arg2).resultOrPartial(string -> LOGGER.error("Tried to load invalid item: '{}'", string));
+      return CODEC.parse(arg.createSerializationContext(NbtOps.INSTANCE), arg2)
+         .resultOrPartial(string -> LOGGER.error("Tried to load invalid item: '{}'", string));
    }
 
    /**
@@ -582,7 +584,7 @@
       if (this.isEmpty()) {
          throw new IllegalStateException("Cannot encode empty ItemStack");
       } else {
-         return Util.getOrThrow(CODEC.encode(this, arg.m_uwaazyzq(NbtOps.INSTANCE), arg2), IllegalStateException::new);
+         return Util.getOrThrow(CODEC.encode(this, arg.createSerializationContext(NbtOps.INSTANCE), arg2), IllegalStateException::new);
       }
    }
 
@@ -594,7 +596,7 @@
       if (this.isEmpty()) {
          throw new IllegalStateException("Cannot encode empty ItemStack");
       } else {
-         return Util.getOrThrow(CODEC.encodeStart(arg.m_uwaazyzq(NbtOps.INSTANCE), this), IllegalStateException::new);
+         return Util.getOrThrow(CODEC.encodeStart(arg.createSerializationContext(NbtOps.INSTANCE), this), IllegalStateException::new);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/item/map/MapIcon.java namedSrc/net/minecraft/item/map/MapIcon.java
--- namedTargetSrc/net/minecraft/item/map/MapIcon.java	2024-03-09 04:30:04.876364409 +0000
+++ namedSrc/net/minecraft/item/map/MapIcon.java	2024-03-09 04:28:57.080263293 +0000
@@ -21,7 +21,7 @@
     * @mapping {@literal hashed f_xprnzxvn Lnet/minecraft/unmapped/C_lptbbwvu;f_xprnzxvn:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/item/map/MapIcon;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, MapIcon> PACKET_CODEC = PacketCodec.m_whbpgkrx(
+   public static final PacketCodec<RegistryByteBuf, MapIcon> PACKET_CODEC = PacketCodec.tuple(
       MapIcon.Type.PACKET_CODEC,
       MapIcon::type,
       PacketCodecs.BYTE,
@@ -278,7 +278,7 @@
        * @mapping {@literal hashed f_fevyugav Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;f_fevyugav:Lnet/minecraft/unmapped/C_qsrmwluu;}
        * @mapping {@literal named PACKET_CODEC Lnet/minecraft/item/map/MapIcon$Type;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, MapIcon.Type> PACKET_CODEC = PacketCodecs.m_oxatcqxo(INDEX_TO_TYPE, MapIcon.Type::getIndex);
+      public static final PacketCodec<ByteBuf, MapIcon.Type> PACKET_CODEC = PacketCodecs.indexed(INDEX_TO_TYPE, MapIcon.Type::getIndex);
       /**
        * @mapping {@literal hashed f_skfrxrmz Lnet/minecraft/unmapped/C_lptbbwvu$C_ooswjmee;f_skfrxrmz:I}
        * @mapping {@literal named index Lnet/minecraft/item/map/MapIcon$Type;index:I}
diff -bur namedTargetSrc/net/minecraft/item/map/MapId.java namedSrc/net/minecraft/item/map/MapId.java
--- namedTargetSrc/net/minecraft/item/map/MapId.java	2024-03-09 04:30:04.772364255 +0000
+++ namedSrc/net/minecraft/item/map/MapId.java	2024-03-09 04:28:56.960263130 +0000
@@ -19,7 +19,7 @@
     * @mapping {@literal hashed f_qwhcskfq Lnet/minecraft/unmapped/C_qqxyyzzm;f_qwhcskfq:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/item/map/MapId;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<ByteBuf, MapId> PACKET_CODEC = PacketCodecs.VAR_INT.create(MapId::new, MapId::id);
+   public static final PacketCodec<ByteBuf, MapId> PACKET_CODEC = PacketCodecs.VAR_INT.map(MapId::new, MapId::id);
 
    /**
     * @mapping {@literal hashed m_xpqsuwlt Lnet/minecraft/unmapped/C_qqxyyzzm;m_xpqsuwlt()Ljava/lang/String;}
diff -bur namedTargetSrc/net/minecraft/item/map/MapState.java namedSrc/net/minecraft/item/map/MapState.java
--- namedTargetSrc/net/minecraft/item/map/MapState.java	2024-03-09 04:30:04.712364166 +0000
+++ namedSrc/net/minecraft/item/map/MapState.java	2024-03-09 04:28:56.884263023 +0000
@@ -223,7 +223,7 @@
          lv2.colors = bs;
       }
 
-      RegistryOps<NbtElement> lv3 = provider.m_uwaazyzq(NbtOps.INSTANCE);
+      RegistryOps<NbtElement> lv3 = provider.createSerializationContext(NbtOps.INSTANCE);
 
       for (MapBannerMarker lv4 : (List)MapBannerMarker.LIST_CODEC
          .parse(lv3, nbt.get("banners"))
@@ -267,7 +267,7 @@
       arg.putBoolean("trackingPosition", this.showIcons);
       arg.putBoolean("unlimitedTracking", this.unlimitedTracking);
       arg.putBoolean("locked", this.locked);
-      RegistryOps<NbtElement> lv = arg2.m_uwaazyzq(NbtOps.INSTANCE);
+      RegistryOps<NbtElement> lv = arg2.createSerializationContext(NbtOps.INSTANCE);
       arg.put("banners", Util.getOrThrow(MapBannerMarker.LIST_CODEC.encodeStart(lv, List.copyOf(this.banners.values())), IllegalStateException::new));
       NbtList lv2 = new NbtList();
 
diff -bur namedTargetSrc/net/minecraft/item/trim/ArmorTrimMaterial.java namedSrc/net/minecraft/item/trim/ArmorTrimMaterial.java
--- namedTargetSrc/net/minecraft/item/trim/ArmorTrimMaterial.java	2024-03-09 04:30:04.928364486 +0000
+++ namedSrc/net/minecraft/item/trim/ArmorTrimMaterial.java	2024-03-09 04:28:57.140263374 +0000
@@ -44,14 +44,14 @@
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, ArmorTrimMaterial> f_cgkhncln = PacketCodec.m_whbpgkrx(
+   public static final PacketCodec<RegistryByteBuf, ArmorTrimMaterial> f_cgkhncln = PacketCodec.tuple(
       PacketCodecs.STRING,
       ArmorTrimMaterial::assetName,
-      PacketCodecs.registryEntry(RegistryKeys.ITEM),
+      PacketCodecs.holder(RegistryKeys.ITEM),
       ArmorTrimMaterial::ingredient,
       PacketCodecs.FLOAT,
       ArmorTrimMaterial::itemModelIndex,
-      PacketCodecs.m_dpnrrusl(Object2ObjectOpenHashMap::new, PacketCodecs.registryEntry(RegistryKeys.ARMOR_MATERIAL), PacketCodecs.STRING),
+      PacketCodecs.map(Object2ObjectOpenHashMap::new, PacketCodecs.holder(RegistryKeys.ARMOR_MATERIAL), PacketCodecs.STRING),
       ArmorTrimMaterial::overrideArmorMaterials,
       TextCodecs.REGISTRY_TEXT_CODEC,
       ArmorTrimMaterial::description,
@@ -65,7 +65,7 @@
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, Holder<ArmorTrimMaterial>> f_wegtpbgk = PacketCodecs.registryEntry(RegistryKeys.TRIM_MATERIAL, f_cgkhncln);
+   public static final PacketCodec<RegistryByteBuf, Holder<ArmorTrimMaterial>> f_wegtpbgk = PacketCodecs.holder(RegistryKeys.TRIM_MATERIAL, f_cgkhncln);
 
    /**
     * @mapping {@literal hashed m_xsfuxoow Lnet/minecraft/unmapped/C_iqayrpqa;m_xsfuxoow(Ljava/lang/String;Lnet/minecraft/unmapped/C_vorddnax;FLnet/minecraft/unmapped/C_rdaqiwdt;Ljava/util/Map;)Lnet/minecraft/unmapped/C_iqayrpqa;}
diff -bur namedTargetSrc/net/minecraft/item/trim/ArmorTrimPattern.java namedSrc/net/minecraft/item/trim/ArmorTrimPattern.java
--- namedTargetSrc/net/minecraft/item/trim/ArmorTrimPattern.java	2024-03-09 04:30:04.748364220 +0000
+++ namedSrc/net/minecraft/item/trim/ArmorTrimPattern.java	2024-03-09 04:28:56.928263085 +0000
@@ -35,10 +35,10 @@
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, ArmorTrimPattern> f_ihuvumef = PacketCodec.m_ouxffrgo(
+   public static final PacketCodec<RegistryByteBuf, ArmorTrimPattern> f_ihuvumef = PacketCodec.tuple(
       Identifier.PACKET_CODEC,
       ArmorTrimPattern::assetId,
-      PacketCodecs.registryEntry(RegistryKeys.ITEM),
+      PacketCodecs.holder(RegistryKeys.ITEM),
       ArmorTrimPattern::templateItem,
       TextCodecs.REGISTRY_TEXT_CODEC,
       ArmorTrimPattern::description,
@@ -54,7 +54,7 @@
    /**
     * Mapping not found
     */
-   public static final PacketCodec<RegistryByteBuf, Holder<ArmorTrimPattern>> f_kjdpqyia = PacketCodecs.registryEntry(RegistryKeys.TRIM_PATTERN, f_ihuvumef);
+   public static final PacketCodec<RegistryByteBuf, Holder<ArmorTrimPattern>> f_kjdpqyia = PacketCodecs.holder(RegistryKeys.TRIM_PATTERN, f_ihuvumef);
 
    /**
     * @mapping {@literal hashed m_pldaxmlk Lnet/minecraft/unmapped/C_tzrkresl;m_pldaxmlk(Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_rdaqiwdt;}
diff -bur namedTargetSrc/net/minecraft/item/trim/ArmorTrimPermutation.java namedSrc/net/minecraft/item/trim/ArmorTrimPermutation.java
--- namedTargetSrc/net/minecraft/item/trim/ArmorTrimPermutation.java	2024-03-09 04:30:04.832364344 +0000
+++ namedSrc/net/minecraft/item/trim/ArmorTrimPermutation.java	2024-03-09 04:28:57.036263234 +0000
@@ -38,9 +38,10 @@
             .apply(instance, ArmorTrimPermutation::new)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_yoectkcp Lnet/minecraft/unmapped/C_vglbnrob;f_yoectkcp:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/item/trim/ArmorTrimPermutation;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, ArmorTrimPermutation> f_yoectkcp = PacketCodec.m_kqzabmpi(
+   public static final PacketCodec<RegistryByteBuf, ArmorTrimPermutation> PACKET_CODEC = PacketCodec.tuple(
       ArmorTrimMaterial.f_wegtpbgk,
       ArmorTrimPermutation::getMaterial,
       ArmorTrimPattern.f_kjdpqyia,
diff -bur namedTargetSrc/net/minecraft/loot/LootManager.java namedSrc/net/minecraft/loot/LootManager.java
--- namedTargetSrc/net/minecraft/loot/LootManager.java	2024-03-09 04:30:04.912364463 +0000
+++ namedSrc/net/minecraft/loot/LootManager.java	2024-03-09 04:28:57.120263347 +0000
@@ -97,7 +97,7 @@
       Executor prepareExecutor,
       Map<LootDataType<?>, Map<Identifier, ?>> allElements
    ) {
-      RegistryOps<JsonElement> lv = arg2.m_uwaazyzq(JsonOps.INSTANCE);
+      RegistryOps<JsonElement> lv = arg2.createSerializationContext(JsonOps.INSTANCE);
       Map<Identifier, T> map2 = new HashMap();
       allElements.put(dataType, map2);
       return CompletableFuture.runAsync(() -> {

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/network/codec/PacketCodec.java namedSrc/net/minecraft/network/codec/PacketCodec.java
--- namedTargetSrc/net/minecraft/network/codec/PacketCodec.java	2024-03-09 04:30:04.696364142 +0000
+++ namedSrc/net/minecraft/network/codec/PacketCodec.java	2024-03-09 04:28:56.856262984 +0000
@@ -66,16 +66,16 @@
 
    /**
     * @mapping {@literal hashed m_vdpeazsa Lnet/minecraft/unmapped/C_qsrmwluu;m_vdpeazsa(Ljava/lang/Object;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named create Lnet/minecraft/network/codec/PacketCodec;create(Ljava/lang/Object;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named unit Lnet/minecraft/network/codec/PacketCodec;unit(Ljava/lang/Object;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B, V> PacketCodec<B, V> create(V object) {
+   static <B, V> PacketCodec<B, V> unit(V value) {
       return new PacketCodec<B, V>() {
          /**
           * Mapping not found
           */
          @Override
          public V decode(B object) {
-            return object;
+            return value;
          }
 
          /**
@@ -83,8 +83,8 @@
           */
          @Override
          public void encode(B object, V object2) {
-            if (!object2.equals(object)) {
-               throw new IllegalStateException("Can't encode '" + object2 + "', expected '" + object + "'");
+            if (!object2.equals(value)) {
+               throw new IllegalStateException("Can't encode '" + object2 + "', expected '" + value + "'");
             }
          }
       };
@@ -92,24 +92,24 @@
 
    /**
     * @mapping {@literal hashed m_xepolosp Lnet/minecraft/unmapped/C_qsrmwluu;m_xepolosp(Lnet/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named apply Lnet/minecraft/network/codec/PacketCodec;apply(Lnet/minecraft/network/codec/PacketCodec$C_afmwjpzk;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named apply Lnet/minecraft/network/codec/PacketCodec;apply(Lnet/minecraft/network/codec/PacketCodec$ResultFunction;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   default <O> PacketCodec<B, O> apply(PacketCodec.C_afmwjpzk<B, V, O> arg) {
-      return arg.apply(this);
+   default <O> PacketCodec<B, O> apply(PacketCodec.ResultFunction<B, V, O> function) {
+      return function.apply(this);
    }
 
    /**
     * @mapping {@literal hashed m_xdepsjrp Lnet/minecraft/unmapped/C_qsrmwluu;m_xdepsjrp(Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named create Lnet/minecraft/network/codec/PacketCodec;create(Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named map Lnet/minecraft/network/codec/PacketCodec;map(Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   default <O> PacketCodec<B, O> create(Function<? super V, ? extends O> function, Function<? super O, ? extends V> function2) {
+   default <O> PacketCodec<B, O> map(Function<? super V, ? extends O> to, Function<? super O, ? extends V> from) {
       return new PacketCodec<B, O>() {
          /**
           * Mapping not found
           */
          @Override
          public O decode(B object) {
-            return (O)function.apply(PacketCodec.this.decode(object));
+            return (O)to.apply(PacketCodec.this.decode(object));
          }
 
          /**
@@ -117,16 +117,16 @@
           */
          @Override
          public void encode(B object, O object2) {
-            PacketCodec.this.encode(object, (V)function2.apply(object2));
+            PacketCodec.this.encode(object, (V)from.apply(object2));
          }
       };
    }
 
    /**
     * @mapping {@literal hashed m_jnlparpp Lnet/minecraft/unmapped/C_qsrmwluu;m_jnlparpp(Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named create Lnet/minecraft/network/codec/PacketCodec;create(Ljava/util/function/Function;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named mapBuf Lnet/minecraft/network/codec/PacketCodec;mapBuf(Ljava/util/function/Function;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   default <O extends ByteBuf> PacketCodec<O, V> create(Function<O, ? extends B> function) {
+   default <O extends ByteBuf> PacketCodec<O, V> mapBuf(Function<O, ? extends B> function) {
       return new PacketCodec<O, V>() {
          /**
           * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_qsrmwluu$C_gbkygmvw;decode(Lio/netty/buffer/ByteBuf;)Ljava/lang/Object;}
@@ -149,11 +149,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xkeikrrc Lnet/minecraft/unmapped/C_qsrmwluu;m_xkeikrrc(Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named dispatch Lnet/minecraft/network/codec/PacketCodec;dispatch(Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   default <U> PacketCodec<B, U> m_xkeikrrc(
-      Function<? super U, ? extends V> function, Function<? super V, ? extends PacketCodec<? super B, ? extends U>> function2
-   ) {
+   default <U> PacketCodec<B, U> dispatch(Function<? super U, ? extends V> type, Function<? super V, ? extends PacketCodec<? super B, ? extends U>> codec) {
       return new PacketCodec<B, U>() {
          /**
           * Mapping not found
@@ -161,7 +160,7 @@
          @Override
          public U decode(B object) {
             V object2 = PacketCodec.this.decode(object);
-            PacketCodec<? super B, ? extends U> lv = (PacketCodec<? super B, ? extends U>)function2.apply(object2);
+            PacketCodec<? super B, ? extends U> lv = (PacketCodec<? super B, ? extends U>)codec.apply(object2);
             return (U)lv.decode(object);
          }
 
@@ -170,8 +169,8 @@
           */
          @Override
          public void encode(B object, U object2) {
-            V object3 = (V)function.apply(object2);
-            PacketCodec<B, U> lv = (PacketCodec<B, U>)function2.apply(object3);
+            V object3 = (V)type.apply(object2);
+            PacketCodec<B, U> lv = (PacketCodec<B, U>)codec.apply(object3);
             PacketCodec.this.encode(object, object3);
             lv.encode(object, object2);
          }
@@ -180,17 +179,17 @@
 
    /**
     * @mapping {@literal hashed m_tahgmrfg Lnet/minecraft/unmapped/C_qsrmwluu;m_tahgmrfg(Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named create Lnet/minecraft/network/codec/PacketCodec;create(Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named tuple Lnet/minecraft/network/codec/PacketCodec;tuple(Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Ljava/util/function/Function;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B, C, T1> PacketCodec<B, C> create(PacketCodec<? super B, T1> arg, Function<C, T1> function, Function<T1, C> function2) {
+   static <B, C, T1> PacketCodec<B, C> tuple(PacketCodec<? super B, T1> codec, Function<C, T1> from, Function<T1, C> to) {
       return new PacketCodec<B, C>() {
          /**
           * Mapping not found
           */
          @Override
          public C decode(B object) {
-            T1 object2 = arg.decode(object);
-            return (C)function2.apply(object2);
+            T1 object2 = codec.decode(object);
+            return (C)to.apply(object2);
          }
 
          /**
@@ -198,17 +197,17 @@
           */
          @Override
          public void encode(B object, C object2) {
-            arg.encode(object, (T1)function.apply(object2));
+            codec.encode(object, (T1)from.apply(object2));
          }
       };
    }
 
    /**
     * @mapping {@literal hashed m_neslfeqk Lnet/minecraft/unmapped/C_qsrmwluu;m_neslfeqk(Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named create Lnet/minecraft/network/codec/PacketCodec;create(Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named tuple Lnet/minecraft/network/codec/PacketCodec;tuple(Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Ljava/util/function/BiFunction;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B, C, T1, T2> PacketCodec<B, C> create(
-      PacketCodec<? super B, T1> arg, Function<C, T1> function, PacketCodec<? super B, T2> arg2, Function<C, T2> function2, BiFunction<T1, T2, C> biFunction
+   static <B, C, T1, T2> PacketCodec<B, C> tuple(
+      PacketCodec<? super B, T1> codec1, Function<C, T1> from1, PacketCodec<? super B, T2> codec2, Function<C, T2> from2, BiFunction<T1, T2, C> to
    ) {
       return new PacketCodec<B, C>() {
          /**
@@ -216,9 +215,9 @@
           */
          @Override
          public C decode(B object) {
-            T1 object2 = arg.decode(object);
-            T2 object3 = arg2.decode(object);
-            return (C)biFunction.apply(object2, object3);
+            T1 object2 = codec1.decode(object);
+            T2 object3 = codec2.decode(object);
+            return (C)to.apply(object2, object3);
          }
 
          /**
@@ -226,23 +225,24 @@
           */
          @Override
          public void encode(B object, C object2) {
-            arg.encode(object, (T1)function.apply(object2));
-            arg2.encode(object, (T2)function2.apply(object2));
+            codec1.encode(object, (T1)from1.apply(object2));
+            codec2.encode(object, (T2)from2.apply(object2));
          }
       };
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kqzabmpi Lnet/minecraft/unmapped/C_qsrmwluu;m_kqzabmpi(Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named tuple Lnet/minecraft/network/codec/PacketCodec;tuple(Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function3;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B, C, T1, T2, T3> PacketCodec<B, C> m_kqzabmpi(
-      PacketCodec<? super B, T1> arg,
-      Function<C, T1> function,
-      PacketCodec<? super B, T2> arg2,
-      Function<C, T2> function2,
-      PacketCodec<? super B, T3> arg3,
-      Function<C, T3> function3,
-      Function3<T1, T2, T3, C> function32
+   static <B, C, T1, T2, T3> PacketCodec<B, C> tuple(
+      PacketCodec<? super B, T1> codec1,
+      Function<C, T1> from1,
+      PacketCodec<? super B, T2> codec2,
+      Function<C, T2> from2,
+      PacketCodec<? super B, T3> codec3,
+      Function<C, T3> from3,
+      Function3<T1, T2, T3, C> to
    ) {
       return new PacketCodec<B, C>() {
          /**
@@ -250,10 +250,10 @@
           */
          @Override
          public C decode(B object) {
-            T1 object2 = arg.decode(object);
-            T2 object3 = arg2.decode(object);
-            T3 object4 = arg3.decode(object);
-            return function32.apply(object2, object3, object4);
+            T1 object2 = codec1.decode(object);
+            T2 object3 = codec2.decode(object);
+            T3 object4 = codec3.decode(object);
+            return to.apply(object2, object3, object4);
          }
 
          /**
@@ -261,26 +261,27 @@
           */
          @Override
          public void encode(B object, C object2) {
-            arg.encode(object, (T1)function.apply(object2));
-            arg2.encode(object, (T2)function2.apply(object2));
-            arg3.encode(object, (T3)function3.apply(object2));
+            codec1.encode(object, (T1)from1.apply(object2));
+            codec2.encode(object, (T2)from2.apply(object2));
+            codec3.encode(object, (T3)from3.apply(object2));
          }
       };
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ouxffrgo Lnet/minecraft/unmapped/C_qsrmwluu;m_ouxffrgo(Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named tuple Lnet/minecraft/network/codec/PacketCodec;tuple(Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B, C, T1, T2, T3, T4> PacketCodec<B, C> m_ouxffrgo(
-      PacketCodec<? super B, T1> arg,
-      Function<C, T1> function,
-      PacketCodec<? super B, T2> arg2,
-      Function<C, T2> function2,
-      PacketCodec<? super B, T3> arg3,
-      Function<C, T3> function3,
-      PacketCodec<? super B, T4> arg4,
-      Function<C, T4> function4,
-      Function4<T1, T2, T3, T4, C> function42
+   static <B, C, T1, T2, T3, T4> PacketCodec<B, C> tuple(
+      PacketCodec<? super B, T1> codec1,
+      Function<C, T1> from1,
+      PacketCodec<? super B, T2> codec2,
+      Function<C, T2> from2,
+      PacketCodec<? super B, T3> codec3,
+      Function<C, T3> from3,
+      PacketCodec<? super B, T4> codec4,
+      Function<C, T4> from4,
+      Function4<T1, T2, T3, T4, C> to
    ) {
       return new PacketCodec<B, C>() {
          /**
@@ -288,11 +289,11 @@
           */
          @Override
          public C decode(B object) {
-            T1 object2 = arg.decode(object);
-            T2 object3 = arg2.decode(object);
-            T3 object4 = arg3.decode(object);
-            T4 object5 = arg4.decode(object);
-            return function42.apply(object2, object3, object4, object5);
+            T1 object2 = codec1.decode(object);
+            T2 object3 = codec2.decode(object);
+            T3 object4 = codec3.decode(object);
+            T4 object5 = codec4.decode(object);
+            return to.apply(object2, object3, object4, object5);
          }
 
          /**
@@ -300,29 +301,30 @@
           */
          @Override
          public void encode(B object, C object2) {
-            arg.encode(object, (T1)function.apply(object2));
-            arg2.encode(object, (T2)function2.apply(object2));
-            arg3.encode(object, (T3)function3.apply(object2));
-            arg4.encode(object, (T4)function4.apply(object2));
+            codec1.encode(object, (T1)from1.apply(object2));
+            codec2.encode(object, (T2)from2.apply(object2));
+            codec3.encode(object, (T3)from3.apply(object2));
+            codec4.encode(object, (T4)from4.apply(object2));
          }
       };
    }
 
    /**
-    * Mapping not found
-    */
-   static <B, C, T1, T2, T3, T4, T5> PacketCodec<B, C> m_whbpgkrx(
-      PacketCodec<? super B, T1> arg,
-      Function<C, T1> function,
-      PacketCodec<? super B, T2> arg2,
-      Function<C, T2> function2,
-      PacketCodec<? super B, T3> arg3,
-      Function<C, T3> function3,
-      PacketCodec<? super B, T4> arg4,
-      Function<C, T4> function4,
-      PacketCodec<? super B, T5> arg5,
-      Function<C, T5> function5,
-      Function5<T1, T2, T3, T4, T5, C> function52
+    * @mapping {@literal hashed m_whbpgkrx Lnet/minecraft/unmapped/C_qsrmwluu;m_whbpgkrx(Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function5;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named tuple Lnet/minecraft/network/codec/PacketCodec;tuple(Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function5;)Lnet/minecraft/network/codec/PacketCodec;}
+    */
+   static <B, C, T1, T2, T3, T4, T5> PacketCodec<B, C> tuple(
+      PacketCodec<? super B, T1> codec1,
+      Function<C, T1> from1,
+      PacketCodec<? super B, T2> codec2,
+      Function<C, T2> from2,
+      PacketCodec<? super B, T3> codec3,
+      Function<C, T3> from3,
+      PacketCodec<? super B, T4> codec4,
+      Function<C, T4> from4,
+      PacketCodec<? super B, T5> codec5,
+      Function<C, T5> from5,
+      Function5<T1, T2, T3, T4, T5, C> to
    ) {
       return new PacketCodec<B, C>() {
          /**
@@ -330,12 +332,12 @@
           */
          @Override
          public C decode(B object) {
-            T1 object2 = arg.decode(object);
-            T2 object3 = arg2.decode(object);
-            T3 object4 = arg3.decode(object);
-            T4 object5 = arg4.decode(object);
-            T5 object6 = arg5.decode(object);
-            return function52.apply(object2, object3, object4, object5, object6);
+            T1 object2 = codec1.decode(object);
+            T2 object3 = codec2.decode(object);
+            T3 object4 = codec3.decode(object);
+            T4 object5 = codec4.decode(object);
+            T5 object6 = codec5.decode(object);
+            return to.apply(object2, object3, object4, object5, object6);
          }
 
          /**
@@ -343,32 +345,33 @@
           */
          @Override
          public void encode(B object, C object2) {
-            arg.encode(object, (T1)function.apply(object2));
-            arg2.encode(object, (T2)function2.apply(object2));
-            arg3.encode(object, (T3)function3.apply(object2));
-            arg4.encode(object, (T4)function4.apply(object2));
-            arg5.encode(object, (T5)function5.apply(object2));
+            codec1.encode(object, (T1)from1.apply(object2));
+            codec2.encode(object, (T2)from2.apply(object2));
+            codec3.encode(object, (T3)from3.apply(object2));
+            codec4.encode(object, (T4)from4.apply(object2));
+            codec5.encode(object, (T5)from5.apply(object2));
          }
       };
    }
 
    /**
-    * Mapping not found
-    */
-   static <B, C, T1, T2, T3, T4, T5, T6> PacketCodec<B, C> m_ysrdtnvi(
-      PacketCodec<? super B, T1> arg,
-      Function<C, T1> function,
-      PacketCodec<? super B, T2> arg2,
-      Function<C, T2> function2,
-      PacketCodec<? super B, T3> arg3,
-      Function<C, T3> function3,
-      PacketCodec<? super B, T4> arg4,
-      Function<C, T4> function4,
-      PacketCodec<? super B, T5> arg5,
-      Function<C, T5> function5,
-      PacketCodec<? super B, T6> arg6,
-      Function<C, T6> function6,
-      Function6<T1, T2, T3, T4, T5, T6, C> function62
+    * @mapping {@literal hashed m_ysrdtnvi Lnet/minecraft/unmapped/C_qsrmwluu;m_ysrdtnvi(Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lnet/minecraft/unmapped/C_qsrmwluu;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function6;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named tuple Lnet/minecraft/network/codec/PacketCodec;tuple(Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lnet/minecraft/network/codec/PacketCodec;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function6;)Lnet/minecraft/network/codec/PacketCodec;}
+    */
+   static <B, C, T1, T2, T3, T4, T5, T6> PacketCodec<B, C> tuple(
+      PacketCodec<? super B, T1> codec1,
+      Function<C, T1> from1,
+      PacketCodec<? super B, T2> codec2,
+      Function<C, T2> from2,
+      PacketCodec<? super B, T3> codec3,
+      Function<C, T3> from3,
+      PacketCodec<? super B, T4> codec4,
+      Function<C, T4> from4,
+      PacketCodec<? super B, T5> codec5,
+      Function<C, T5> from5,
+      PacketCodec<? super B, T6> codec6,
+      Function<C, T6> from6,
+      Function6<T1, T2, T3, T4, T5, T6, C> to
    ) {
       return new PacketCodec<B, C>() {
          /**
@@ -376,13 +379,13 @@
           */
          @Override
          public C decode(B object) {
-            T1 object2 = arg.decode(object);
-            T2 object3 = arg2.decode(object);
-            T3 object4 = arg3.decode(object);
-            T4 object5 = arg4.decode(object);
-            T5 object6 = arg5.decode(object);
-            T6 object7 = arg6.decode(object);
-            return function62.apply(object2, object3, object4, object5, object6, object7);
+            T1 object2 = codec1.decode(object);
+            T2 object3 = codec2.decode(object);
+            T3 object4 = codec3.decode(object);
+            T4 object5 = codec4.decode(object);
+            T5 object6 = codec5.decode(object);
+            T6 object7 = codec6.decode(object);
+            return to.apply(object2, object3, object4, object5, object6, object7);
          }
 
          /**
@@ -390,32 +393,34 @@
           */
          @Override
          public void encode(B object, C object2) {
-            arg.encode(object, (T1)function.apply(object2));
-            arg2.encode(object, (T2)function2.apply(object2));
-            arg3.encode(object, (T3)function3.apply(object2));
-            arg4.encode(object, (T4)function4.apply(object2));
-            arg5.encode(object, (T5)function5.apply(object2));
-            arg6.encode(object, (T6)function6.apply(object2));
+            codec1.encode(object, (T1)from1.apply(object2));
+            codec2.encode(object, (T2)from2.apply(object2));
+            codec3.encode(object, (T3)from3.apply(object2));
+            codec4.encode(object, (T4)from4.apply(object2));
+            codec5.encode(object, (T5)from5.apply(object2));
+            codec6.encode(object, (T6)from6.apply(object2));
          }
       };
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ufniiqur Lnet/minecraft/unmapped/C_qsrmwluu;m_ufniiqur(Ljava/util/function/UnaryOperator;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named recursive Lnet/minecraft/network/codec/PacketCodec;recursive(Ljava/util/function/UnaryOperator;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B, T> PacketCodec<B, T> m_ufniiqur(UnaryOperator<PacketCodec<B, T>> unaryOperator) {
+   static <B, T> PacketCodec<B, T> recursive(UnaryOperator<PacketCodec<B, T>> codecGetter) {
       return new PacketCodec<B, T>() {
          /**
-          * Mapping not found
+          * @mapping {@literal hashed f_qahzmlxg Lnet/minecraft/unmapped/C_qsrmwluu$C_vqnuwlhg;f_qahzmlxg:Ljava/util/function/Supplier;}
+          * @mapping {@literal named codecSupplier Lnet/minecraft/network/codec/PacketCodec$C_vqnuwlhg;codecSupplier:Ljava/util/function/Supplier;}
           */
-         private final Supplier<PacketCodec<B, T>> f_qahzmlxg = Suppliers.memoize(() -> (PacketCodec<B, T>)unaryOperator.apply(this));
+         private final Supplier<PacketCodec<B, T>> codecSupplier = Suppliers.memoize(() -> (PacketCodec<B, T>)codecGetter.apply(this));
 
          /**
           * Mapping not found
           */
          @Override
          public T decode(B object) {
-            return (T)((PacketCodec)this.f_qahzmlxg.get()).decode(object);
+            return (T)((PacketCodec)this.codecSupplier.get()).decode(object);
          }
 
          /**
@@ -423,27 +428,29 @@
           */
          @Override
          public void encode(B object, T object2) {
-            ((PacketCodec)this.f_qahzmlxg.get()).encode(object, (V)object2);
+            ((PacketCodec)this.codecSupplier.get()).encode(object, (V)object2);
          }
       };
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yeusexqs Lnet/minecraft/unmapped/C_qsrmwluu;m_yeusexqs()Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named cast Lnet/minecraft/network/codec/PacketCodec;cast()Lnet/minecraft/network/codec/PacketCodec;}
     */
-   default <S extends B> PacketCodec<S, V> m_yeusexqs() {
+   default <S extends B> PacketCodec<S, V> cast() {
       return this;
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk}
-    * @mapping {@literal named net/minecraft/network/codec/PacketCodec$C_afmwjpzk}
+    * @mapping {@literal named net/minecraft/network/codec/PacketCodec$ResultFunction}
     */
    @FunctionalInterface
-   public interface C_afmwjpzk<B, S, T> {
+   public interface ResultFunction<B, S, T> {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed apply Lnet/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk;apply(Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+       * @mapping {@literal named apply Lnet/minecraft/network/codec/PacketCodec$ResultFunction;apply(Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/network/codec/PacketCodec;}
        */
-      PacketCodec<B, T> apply(PacketCodec<B, S> arg);
+      PacketCodec<B, T> apply(PacketCodec<B, S> packetCodec);
    }
 }

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/network/codec/PacketCodecs.java namedSrc/net/minecraft/network/codec/PacketCodecs.java
--- namedTargetSrc/net/minecraft/network/codec/PacketCodecs.java	2024-03-09 04:30:04.704364155 +0000
+++ namedSrc/net/minecraft/network/codec/PacketCodecs.java	2024-03-09 04:28:56.868263001 +0000
@@ -47,9 +47,10 @@
  */
 public interface PacketCodecs {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_supiohbz Lnet/minecraft/unmapped/C_anfarvhg;f_supiohbz:I}
+    * @mapping {@literal named MAX_INITIAL_SIZE Lnet/minecraft/network/codec/PacketCodecs;MAX_INITIAL_SIZE:I}
     */
-   int f_supiohbz = 65536;
+   int MAX_INITIAL_SIZE = 65536;
    /**
     * @mapping {@literal hashed f_zeeybklf Lnet/minecraft/unmapped/C_anfarvhg;f_zeeybklf:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named BOOL Lnet/minecraft/network/codec/PacketCodecs;BOOL:Lnet/minecraft/network/codec/PacketCodec;}
@@ -114,9 +115,10 @@
       }
    };
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_uyscbhlw Lnet/minecraft/unmapped/C_anfarvhg;f_uyscbhlw:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named INT Lnet/minecraft/network/codec/PacketCodecs;INT:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   PacketCodec<ByteBuf, Integer> f_uyscbhlw = new PacketCodec<ByteBuf, Integer>() {
+   PacketCodec<ByteBuf, Integer> INT = new PacketCodec<ByteBuf, Integer>() {
       /**
        * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_anfarvhg$C_orkhdfwe;decode(Lio/netty/buffer/ByteBuf;)Ljava/lang/Integer;}
        * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_orkhdfwe;decode(Lio/netty/buffer/ByteBuf;)Ljava/lang/Integer;}
@@ -218,21 +220,24 @@
       }
    };
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ggqudulf Lnet/minecraft/unmapped/C_anfarvhg;f_ggqudulf:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named BYTE_ARRAY Lnet/minecraft/network/codec/PacketCodecs;BYTE_ARRAY:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   PacketCodec<ByteBuf, byte[]> f_ggqudulf = new PacketCodec<ByteBuf, byte[]>() {
+   PacketCodec<ByteBuf, byte[]> BYTE_ARRAY = new PacketCodec<ByteBuf, byte[]>() {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_kfajemtk Lnet/minecraft/unmapped/C_anfarvhg$C_hvrqkwdr;m_kfajemtk(Lio/netty/buffer/ByteBuf;)[B}
+       * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_hvrqkwdr;decode(Lio/netty/buffer/ByteBuf;)[B}
        */
-      public byte[] m_kfajemtk(ByteBuf byteBuf) {
-         return PacketByteBuf.readByteArray(byteBuf);
+      public byte[] decode(ByteBuf buf) {
+         return PacketByteBuf.readByteArray(buf);
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_vyhpugrn Lnet/minecraft/unmapped/C_anfarvhg$C_hvrqkwdr;m_vyhpugrn(Lio/netty/buffer/ByteBuf;[B)V}
+       * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_hvrqkwdr;encode(Lio/netty/buffer/ByteBuf;[B)V}
        */
-      public void m_vyhpugrn(ByteBuf byteBuf, byte[] bs) {
-         PacketByteBuf.writeByteArray(byteBuf, bs);
+      public void encode(ByteBuf buf, byte[] stack) {
+         PacketByteBuf.writeByteArray(buf, stack);
       }
    };
    /**
@@ -244,20 +249,22 @@
     * @mapping {@literal hashed f_kcibtezy Lnet/minecraft/unmapped/C_anfarvhg;f_kcibtezy:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named NBT_ELEMENT Lnet/minecraft/network/codec/PacketCodecs;NBT_ELEMENT:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   PacketCodec<ByteBuf, NbtElement> NBT_ELEMENT = m_fcmaafce(() -> NbtTagSizeTracker.create(2097152L));
+   PacketCodec<ByteBuf, NbtElement> NBT_ELEMENT = nbtElement(() -> NbtTagSizeTracker.create(2097152L));
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_lbagivqh Lnet/minecraft/unmapped/C_anfarvhg;f_lbagivqh:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named UNLIMITED_NBT_ELEMENT Lnet/minecraft/network/codec/PacketCodecs;UNLIMITED_NBT_ELEMENT:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   PacketCodec<ByteBuf, NbtElement> f_lbagivqh = m_fcmaafce(NbtTagSizeTracker::createWithUnlimitedBytes);
+   PacketCodec<ByteBuf, NbtElement> UNLIMITED_NBT_ELEMENT = nbtElement(NbtTagSizeTracker::createWithUnlimitedBytes);
    /**
     * @mapping {@literal hashed f_pvgxhbfa Lnet/minecraft/unmapped/C_anfarvhg;f_pvgxhbfa:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named NBT_COMPOUND Lnet/minecraft/network/codec/PacketCodecs;NBT_COMPOUND:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   PacketCodec<ByteBuf, NbtCompound> NBT_COMPOUND = m_prosdmov(() -> NbtTagSizeTracker.create(2097152L));
+   PacketCodec<ByteBuf, NbtCompound> NBT_COMPOUND = nbtCompound(() -> NbtTagSizeTracker.create(2097152L));
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_crcpeyzs Lnet/minecraft/unmapped/C_anfarvhg;f_crcpeyzs:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named UNLIMITED_NBT_COMPOUND Lnet/minecraft/network/codec/PacketCodecs;UNLIMITED_NBT_COMPOUND:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   PacketCodec<ByteBuf, NbtCompound> f_crcpeyzs = m_prosdmov(NbtTagSizeTracker::createWithUnlimitedBytes);
+   PacketCodec<ByteBuf, NbtCompound> UNLIMITED_NBT_COMPOUND = nbtCompound(NbtTagSizeTracker::createWithUnlimitedBytes);
    /**
     * @mapping {@literal hashed f_jbsfgkwv Lnet/minecraft/unmapped/C_anfarvhg;f_jbsfgkwv:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named OPTIONAL_NBT Lnet/minecraft/network/codec/PacketCodecs;OPTIONAL_NBT:Lnet/minecraft/network/codec/PacketCodec;}
@@ -322,38 +329,43 @@
       }
    };
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bgegdnvw Lnet/minecraft/unmapped/C_anfarvhg;f_bgegdnvw:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PROPERTY_MAP Lnet/minecraft/network/codec/PacketCodecs;PROPERTY_MAP:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   PacketCodec<ByteBuf, PropertyMap> f_bgegdnvw = new PacketCodec<ByteBuf, PropertyMap>() {
+   PacketCodec<ByteBuf, PropertyMap> PROPERTY_MAP = new PacketCodec<ByteBuf, PropertyMap>() {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_pjmbtmut Lnet/minecraft/unmapped/C_anfarvhg$C_kafuxsar;f_pjmbtmut:I}
+       * @mapping {@literal named MAX_NAME_LENGTH Lnet/minecraft/network/codec/PacketCodecs$C_kafuxsar;MAX_NAME_LENGTH:I}
        */
-      private static final int f_pjmbtmut = 64;
+      private static final int MAX_NAME_LENGTH = 64;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_qryhtiop Lnet/minecraft/unmapped/C_anfarvhg$C_kafuxsar;f_qryhtiop:I}
+       * @mapping {@literal named MAX_VALUE_LENGTH Lnet/minecraft/network/codec/PacketCodecs$C_kafuxsar;MAX_VALUE_LENGTH:I}
        */
-      private static final int f_qryhtiop = 32767;
+      private static final int MAX_VALUE_LENGTH = 32767;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_tudrrsev Lnet/minecraft/unmapped/C_anfarvhg$C_kafuxsar;f_tudrrsev:I}
+       * @mapping {@literal named MAX_SIGNATURE_LENGTH Lnet/minecraft/network/codec/PacketCodecs$C_kafuxsar;MAX_SIGNATURE_LENGTH:I}
        */
-      private static final int f_tudrrsev = 1024;
+      private static final int MAX_SIGNATURE_LENGTH = 1024;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_tfyfoyzd Lnet/minecraft/unmapped/C_anfarvhg$C_kafuxsar;f_tfyfoyzd:I}
+       * @mapping {@literal named MAX_MAP_SIZE Lnet/minecraft/network/codec/PacketCodecs$C_kafuxsar;MAX_MAP_SIZE:I}
        */
-      private static final int f_tfyfoyzd = 16;
+      private static final int MAX_MAP_SIZE = 16;
 
       /**
        * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_anfarvhg$C_kafuxsar;decode(Lio/netty/buffer/ByteBuf;)Lcom/mojang/authlib/properties/PropertyMap;}
        * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_kafuxsar;decode(Lio/netty/buffer/ByteBuf;)Lcom/mojang/authlib/properties/PropertyMap;}
        */
       public PropertyMap decode(ByteBuf byteBuf) {
-         int i = PacketCodecs.m_lyaauawx(byteBuf, 16);
+         int i = PacketCodecs.readCollectionSize(byteBuf, 16);
          PropertyMap propertyMap = new PropertyMap();
 
          for (int j = 0; j < i; j++) {
             String string = StringEncoding.read(byteBuf, 64);
             String string2 = StringEncoding.read(byteBuf, 32767);
-            String string3 = PacketByteBuf.m_mdkhzffo(byteBuf, byteBufx -> StringEncoding.read(byteBufx, 1024));
+            String string3 = PacketByteBuf.readNullable(byteBuf, byteBufx -> StringEncoding.read(byteBufx, 1024));
             Property property = new Property(string, string2, string3);
             propertyMap.put(property.name(), property);
          }
@@ -366,19 +378,20 @@
        * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_kafuxsar;encode(Lio/netty/buffer/ByteBuf;Lcom/mojang/authlib/properties/PropertyMap;)V}
        */
       public void encode(ByteBuf byteBuf, PropertyMap propertyMap) {
-         PacketCodecs.m_ygyhvfaa(byteBuf, propertyMap.size(), 16);
+         PacketCodecs.writeCollectionSize(byteBuf, propertyMap.size(), 16);
 
          for (Property property : propertyMap.values()) {
             StringEncoding.write(byteBuf, property.name(), 64);
             StringEncoding.write(byteBuf, property.value(), 32767);
-            PacketByteBuf.m_omssfaex(byteBuf, property.signature(), (byteBufx, string) -> StringEncoding.write(byteBufx, string, 1024));
+            PacketByteBuf.writeNullable(byteBuf, property.signature(), (byteBufx, string) -> StringEncoding.write(byteBufx, string, 1024));
          }
       }
    };
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kvwzvahn Lnet/minecraft/unmapped/C_anfarvhg;f_kvwzvahn:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named GAME_PROFILE Lnet/minecraft/network/codec/PacketCodecs;GAME_PROFILE:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   PacketCodec<ByteBuf, GameProfile> f_kvwzvahn = new PacketCodec<ByteBuf, GameProfile>() {
+   PacketCodec<ByteBuf, GameProfile> GAME_PROFILE = new PacketCodec<ByteBuf, GameProfile>() {
       /**
        * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_anfarvhg$C_bmyndbtu;decode(Lio/netty/buffer/ByteBuf;)Lcom/mojang/authlib/GameProfile;}
        * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_bmyndbtu;decode(Lio/netty/buffer/ByteBuf;)Lcom/mojang/authlib/GameProfile;}
@@ -387,7 +400,7 @@
          UUID uUID = UuidUtil.packetCodec.decode(byteBuf);
          String string = StringEncoding.read(byteBuf, 16);
          GameProfile gameProfile = new GameProfile(uUID, string);
-         gameProfile.getProperties().putAll(PacketCodecs.f_bgegdnvw.decode(byteBuf));
+         gameProfile.getProperties().putAll(PacketCodecs.PROPERTY_MAP.decode(byteBuf));
          return gameProfile;
       }
 
@@ -398,30 +411,33 @@
       public void encode(ByteBuf byteBuf, GameProfile profile) {
          UuidUtil.packetCodec.encode(byteBuf, profile.getId());
          StringEncoding.write(byteBuf, profile.getName(), 16);
-         PacketCodecs.f_bgegdnvw.encode(byteBuf, profile.getProperties());
+         PacketCodecs.PROPERTY_MAP.encode(byteBuf, profile.getProperties());
       }
    };
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ydaogaft Lnet/minecraft/unmapped/C_anfarvhg;m_ydaogaft(I)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named byteArray Lnet/minecraft/network/codec/PacketCodecs;byteArray(I)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static PacketCodec<ByteBuf, byte[]> m_ydaogaft(int i) {
+   static PacketCodec<ByteBuf, byte[]> byteArray(int maxLength) {
       return new PacketCodec<ByteBuf, byte[]>() {
          /**
-          * Mapping not found
+          * @mapping {@literal hashed m_meevnjcw Lnet/minecraft/unmapped/C_anfarvhg$C_roxkizqk;m_meevnjcw(Lio/netty/buffer/ByteBuf;)[B}
+          * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_roxkizqk;decode(Lio/netty/buffer/ByteBuf;)[B}
           */
-         public byte[] m_meevnjcw(ByteBuf byteBuf) {
-            return PacketByteBuf.readByteArray(byteBuf, i);
+         public byte[] decode(ByteBuf buf) {
+            return PacketByteBuf.readByteArray(buf, maxLength);
          }
 
          /**
-          * Mapping not found
+          * @mapping {@literal hashed m_zwyjwjob Lnet/minecraft/unmapped/C_anfarvhg$C_roxkizqk;m_zwyjwjob(Lio/netty/buffer/ByteBuf;[B)V}
+          * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_roxkizqk;encode(Lio/netty/buffer/ByteBuf;[B)V}
           */
-         public void m_zwyjwjob(ByteBuf byteBuf, byte[] bs) {
-            if (bs.length > i) {
-               throw new EncoderException("ByteArray with size " + bs.length + " is bigger than allowed " + i);
+         public void encode(ByteBuf buf, byte[] stack) {
+            if (stack.length > maxLength) {
+               throw new EncoderException("ByteArray with size " + stack.length + " is bigger than allowed " + maxLength);
             } else {
-               PacketByteBuf.writeByteArray(byteBuf, bs);
+               PacketByteBuf.writeByteArray(buf, stack);
             }
          }
       };
@@ -452,16 +468,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fcmaafce Lnet/minecraft/unmapped/C_anfarvhg;m_fcmaafce(Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named nbtElement Lnet/minecraft/network/codec/PacketCodecs;nbtElement(Ljava/util/function/Supplier;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static PacketCodec<ByteBuf, NbtElement> m_fcmaafce(Supplier<NbtTagSizeTracker> supplier) {
+   static PacketCodec<ByteBuf, NbtElement> nbtElement(Supplier<NbtTagSizeTracker> sizeTracker) {
       return new PacketCodec<ByteBuf, NbtElement>() {
          /**
           * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_anfarvhg$C_otvumexh;decode(Lio/netty/buffer/ByteBuf;)Lnet/minecraft/unmapped/C_oivssbvb;}
           * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_otvumexh;decode(Lio/netty/buffer/ByteBuf;)Lnet/minecraft/nbt/NbtElement;}
           */
          public NbtElement decode(ByteBuf byteBuf) {
-            NbtElement lv = PacketByteBuf.readNbt(byteBuf, (NbtTagSizeTracker)supplier.get());
+            NbtElement lv = PacketByteBuf.readNbt(byteBuf, (NbtTagSizeTracker)sizeTracker.get());
             if (lv == null) {
                throw new DecoderException("Expected non-null compound tag");
             } else {
@@ -484,70 +501,69 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_prosdmov Lnet/minecraft/unmapped/C_anfarvhg;m_prosdmov(Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named nbtCompound Lnet/minecraft/network/codec/PacketCodecs;nbtCompound(Ljava/util/function/Supplier;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static PacketCodec<ByteBuf, NbtCompound> m_prosdmov(Supplier<NbtTagSizeTracker> supplier) {
-      return m_fcmaafce(supplier).create(arg -> {
-         if (arg instanceof NbtCompound) {
-            return (NbtCompound)arg;
+   static PacketCodec<ByteBuf, NbtCompound> nbtCompound(Supplier<NbtTagSizeTracker> sizeTracker) {
+      return nbtElement(sizeTracker).map(element -> {
+         if (element instanceof NbtCompound) {
+            return (NbtCompound)element;
          } else {
-            throw new DecoderException("Not a compound tag: " + arg);
+            throw new DecoderException("Not a compound tag: " + element);
          }
-      }, arg -> arg);
+      }, element -> element);
    }
 
    /**
     * @mapping {@literal hashed m_pzbvtfeh Lnet/minecraft/unmapped/C_anfarvhg;m_pzbvtfeh(Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_pzbvtfeh Lnet/minecraft/network/codec/PacketCodecs;m_pzbvtfeh(Lcom/mojang/serialization/Codec;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named fromCodecUnlimited Lnet/minecraft/network/codec/PacketCodecs;fromCodecUnlimited(Lcom/mojang/serialization/Codec;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<ByteBuf, T> m_pzbvtfeh(Codec<T> codec) {
-      return m_hzgsqquo(codec, NbtTagSizeTracker::createWithUnlimitedBytes);
+   static <T> PacketCodec<ByteBuf, T> fromCodecUnlimited(Codec<T> codec) {
+      return fromCodec(codec, NbtTagSizeTracker::createWithUnlimitedBytes);
    }
 
    /**
     * @mapping {@literal hashed m_limimtjq Lnet/minecraft/unmapped/C_anfarvhg;m_limimtjq(Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_limimtjq Lnet/minecraft/network/codec/PacketCodecs;m_limimtjq(Lcom/mojang/serialization/Codec;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named fromCodec Lnet/minecraft/network/codec/PacketCodecs;fromCodec(Lcom/mojang/serialization/Codec;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<ByteBuf, T> m_limimtjq(Codec<T> codec) {
-      return m_hzgsqquo(codec, () -> NbtTagSizeTracker.create(2097152L));
+   static <T> PacketCodec<ByteBuf, T> fromCodec(Codec<T> codec) {
+      return fromCodec(codec, () -> NbtTagSizeTracker.create(2097152L));
    }
 
    /**
     * @mapping {@literal hashed m_hzgsqquo Lnet/minecraft/unmapped/C_anfarvhg;m_hzgsqquo(Lcom/mojang/serialization/Codec;Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_hzgsqquo Lnet/minecraft/network/codec/PacketCodecs;m_hzgsqquo(Lcom/mojang/serialization/Codec;Ljava/util/function/Supplier;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named fromCodec Lnet/minecraft/network/codec/PacketCodecs;fromCodec(Lcom/mojang/serialization/Codec;Ljava/util/function/Supplier;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<ByteBuf, T> m_hzgsqquo(Codec<T> codec, Supplier<NbtTagSizeTracker> supplier) {
-      return m_fcmaafce(supplier)
-         .create(
-            arg -> Util.getOrThrow(codec.parse(NbtOps.INSTANCE, arg), string -> new DecoderException("Failed to decode: " + string + " " + arg)),
-            object -> Util.getOrThrow(
-                  codec.encodeStart(NbtOps.INSTANCE, (T)object), string -> new EncoderException("Failed to encode: " + string + " " + object)
-               )
+   static <T> PacketCodec<ByteBuf, T> fromCodec(Codec<T> codec, Supplier<NbtTagSizeTracker> sizeTracker) {
+      return nbtElement(sizeTracker)
+         .map(
+            element -> Util.getOrThrow(codec.parse(NbtOps.INSTANCE, element), string -> new DecoderException("Failed to decode: " + string + " " + element)),
+            value -> Util.getOrThrow(codec.encodeStart(NbtOps.INSTANCE, (T)value), string -> new EncoderException("Failed to encode: " + string + " " + value))
          );
    }
 
    /**
     * @mapping {@literal hashed m_ttkrtamq Lnet/minecraft/unmapped/C_anfarvhg;m_ttkrtamq(Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_ttkrtamq Lnet/minecraft/network/codec/PacketCodecs;m_ttkrtamq(Lcom/mojang/serialization/Codec;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named fromRegistryCodecUnlimited Lnet/minecraft/network/codec/PacketCodecs;fromRegistryCodecUnlimited(Lcom/mojang/serialization/Codec;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<RegistryByteBuf, T> m_ttkrtamq(Codec<T> codec) {
-      return m_egxexijk(codec, NbtTagSizeTracker::createWithUnlimitedBytes);
+   static <T> PacketCodec<RegistryByteBuf, T> fromRegistryCodecUnlimited(Codec<T> codec) {
+      return fromRegistryCodec(codec, NbtTagSizeTracker::createWithUnlimitedBytes);
    }
 
    /**
     * @mapping {@literal hashed m_qaqftswj Lnet/minecraft/unmapped/C_anfarvhg;m_qaqftswj(Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_qaqftswj Lnet/minecraft/network/codec/PacketCodecs;m_qaqftswj(Lcom/mojang/serialization/Codec;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named fromRegistryCodec Lnet/minecraft/network/codec/PacketCodecs;fromRegistryCodec(Lcom/mojang/serialization/Codec;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<RegistryByteBuf, T> m_qaqftswj(Codec<T> codec) {
-      return m_egxexijk(codec, () -> NbtTagSizeTracker.create(2097152L));
+   static <T> PacketCodec<RegistryByteBuf, T> fromRegistryCodec(Codec<T> codec) {
+      return fromRegistryCodec(codec, () -> NbtTagSizeTracker.create(2097152L));
    }
 
    /**
     * @mapping {@literal hashed m_egxexijk Lnet/minecraft/unmapped/C_anfarvhg;m_egxexijk(Lcom/mojang/serialization/Codec;Ljava/util/function/Supplier;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_egxexijk Lnet/minecraft/network/codec/PacketCodecs;m_egxexijk(Lcom/mojang/serialization/Codec;Ljava/util/function/Supplier;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named fromRegistryCodec Lnet/minecraft/network/codec/PacketCodecs;fromRegistryCodec(Lcom/mojang/serialization/Codec;Ljava/util/function/Supplier;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<RegistryByteBuf, T> m_egxexijk(Codec<T> codec, Supplier<NbtTagSizeTracker> supplier) {
-      final PacketCodec<ByteBuf, NbtElement> lv = m_fcmaafce(supplier);
+   static <T> PacketCodec<RegistryByteBuf, T> fromRegistryCodec(Codec<T> codec, Supplier<NbtTagSizeTracker> sizeTracker) {
+      final PacketCodec<ByteBuf, NbtElement> lv = nbtElement(sizeTracker);
       return new PacketCodec<RegistryByteBuf, T>() {
          /**
           * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_anfarvhg$C_qocgsfeq;decode(Lnet/minecraft/unmapped/C_bngyzsts;)Ljava/lang/Object;}
@@ -555,7 +571,7 @@
           */
          public T decode(RegistryByteBuf arg) {
             NbtElement lv = lv.decode(arg);
-            RegistryOps<NbtElement> lv2 = arg.getRegistryManager().m_uwaazyzq(NbtOps.INSTANCE);
+            RegistryOps<NbtElement> lv2 = arg.getRegistryManager().createSerializationContext(NbtOps.INSTANCE);
             return Util.getOrThrow(codec.parse(lv2, lv), string -> new DecoderException("Failed to decode: " + string + " " + lv));
          }
 
@@ -564,7 +580,7 @@
           * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_qocgsfeq;encode(Lnet/minecraft/network/RegistryByteBuf;Ljava/lang/Object;)V}
           */
          public void encode(RegistryByteBuf arg, T object) {
-            RegistryOps<NbtElement> lv = arg.getRegistryManager().m_uwaazyzq(NbtOps.INSTANCE);
+            RegistryOps<NbtElement> lv = arg.getRegistryManager().createSerializationContext(NbtOps.INSTANCE);
             NbtElement lv2 = Util.getOrThrow(codec.encodeStart(lv, object), string -> new EncoderException("Failed to encode: " + string + " " + object));
             lv.encode(arg, lv2);
          }
@@ -572,16 +588,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ciouqnhu Lnet/minecraft/unmapped/C_anfarvhg;m_ciouqnhu(Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named optional Lnet/minecraft/network/codec/PacketCodecs;optional(Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B extends ByteBuf, V> PacketCodec<B, Optional<V>> m_ciouqnhu(PacketCodec<B, V> arg) {
+   static <B extends ByteBuf, V> PacketCodec<B, Optional<V>> optional(PacketCodec<B, V> packetCodec) {
       return new PacketCodec<B, Optional<V>>() {
          /**
           * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_anfarvhg$C_jtktidyp;decode(Lio/netty/buffer/ByteBuf;)Ljava/util/Optional;}
           * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_jtktidyp;decode(Lio/netty/buffer/ByteBuf;)Ljava/util/Optional;}
           */
          public Optional<V> decode(B byteBuf) {
-            return byteBuf.readBoolean() ? Optional.of(arg.decode(byteBuf)) : Optional.empty();
+            return byteBuf.readBoolean() ? Optional.of(packetCodec.decode(byteBuf)) : Optional.empty();
          }
 
          /**
@@ -591,7 +608,7 @@
          public void encode(B byteBuf, Optional<V> optional) {
             if (optional.isPresent()) {
                byteBuf.writeBoolean(true);
-               arg.encode(byteBuf, (V)optional.get());
+               packetCodec.encode(byteBuf, (V)optional.get());
             } else {
                byteBuf.writeBoolean(false);
             }
@@ -601,12 +618,12 @@
 
    /**
     * @mapping {@literal hashed m_lyaauawx Lnet/minecraft/unmapped/C_anfarvhg;m_lyaauawx(Lio/netty/buffer/ByteBuf;I)I}
-    * @mapping {@literal named m_lyaauawx Lnet/minecraft/network/codec/PacketCodecs;m_lyaauawx(Lio/netty/buffer/ByteBuf;I)I}
+    * @mapping {@literal named readCollectionSize Lnet/minecraft/network/codec/PacketCodecs;readCollectionSize(Lio/netty/buffer/ByteBuf;I)I}
     */
-   static int m_lyaauawx(ByteBuf buf, int i) {
+   static int readCollectionSize(ByteBuf buf, int maxSize) {
       int j = VarInts.read(buf);
-      if (j > i) {
-         throw new DecoderException(j + " elements exceeded max size of: " + i);
+      if (j > maxSize) {
+         throw new DecoderException(j + " elements exceeded max size of: " + maxSize);
       } else {
          return j;
       }
@@ -614,38 +631,42 @@
 
    /**
     * @mapping {@literal hashed m_ygyhvfaa Lnet/minecraft/unmapped/C_anfarvhg;m_ygyhvfaa(Lio/netty/buffer/ByteBuf;II)V}
-    * @mapping {@literal named m_ygyhvfaa Lnet/minecraft/network/codec/PacketCodecs;m_ygyhvfaa(Lio/netty/buffer/ByteBuf;II)V}
+    * @mapping {@literal named writeCollectionSize Lnet/minecraft/network/codec/PacketCodecs;writeCollectionSize(Lio/netty/buffer/ByteBuf;II)V}
     */
-   static void m_ygyhvfaa(ByteBuf buf, int i, int j) {
-      if (i > j) {
-         throw new EncoderException(i + " elements exceeded max size of: " + j);
+   static void writeCollectionSize(ByteBuf buf, int size, int maxSize) {
+      if (size > maxSize) {
+         throw new EncoderException(size + " elements exceeded max size of: " + maxSize);
       } else {
-         VarInts.write(buf, i);
+         VarInts.write(buf, size);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hnoeqrke Lnet/minecraft/unmapped/C_anfarvhg;m_hnoeqrke(Ljava/util/function/IntFunction;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named factory Lnet/minecraft/network/codec/PacketCodecs;factory(Ljava/util/function/IntFunction;Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B extends ByteBuf, V, C extends Collection<V>> PacketCodec<B, C> m_hnoeqrke(IntFunction<C> intFunction, PacketCodec<? super B, V> arg) {
-      return m_alnjbjmz(intFunction, arg, Integer.MAX_VALUE);
+   static <B extends ByteBuf, V, C extends Collection<V>> PacketCodec<B, C> factory(IntFunction<C> factory, PacketCodec<? super B, V> packetCodec) {
+      return collection(factory, packetCodec, Integer.MAX_VALUE);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_alnjbjmz Lnet/minecraft/unmapped/C_anfarvhg;m_alnjbjmz(Ljava/util/function/IntFunction;Lnet/minecraft/unmapped/C_qsrmwluu;I)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named collection Lnet/minecraft/network/codec/PacketCodecs;collection(Ljava/util/function/IntFunction;Lnet/minecraft/network/codec/PacketCodec;I)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B extends ByteBuf, V, C extends Collection<V>> PacketCodec<B, C> m_alnjbjmz(IntFunction<C> intFunction, PacketCodec<? super B, V> arg, int i) {
+   static <B extends ByteBuf, V, C extends Collection<V>> PacketCodec<B, C> collection(
+      IntFunction<C> factory, PacketCodec<? super B, V> elementCodec, int maxSize
+   ) {
       return new PacketCodec<B, C>() {
          /**
           * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_anfarvhg$C_rvjxngop;decode(Lio/netty/buffer/ByteBuf;)Ljava/util/Collection;}
           * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_rvjxngop;decode(Lio/netty/buffer/ByteBuf;)Ljava/util/Collection;}
           */
          public C decode(B byteBuf) {
-            int i = PacketCodecs.m_lyaauawx(byteBuf, i);
-            C collection = (C)intFunction.apply(Math.min(i, 65536));
+            int i = PacketCodecs.readCollectionSize(byteBuf, maxSize);
+            C collection = (C)factory.apply(Math.min(i, 65536));
 
             for (int j = 0; j < i; j++) {
-               collection.add(arg.decode(byteBuf));
+               collection.add(elementCodec.decode(byteBuf));
             }
 
             return collection;
@@ -656,50 +677,55 @@
           * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_rvjxngop;encode(Lio/netty/buffer/ByteBuf;Ljava/util/Collection;)V}
           */
          public void encode(B byteBuf, C collection) {
-            PacketCodecs.m_ygyhvfaa(byteBuf, collection.size(), i);
+            PacketCodecs.writeCollectionSize(byteBuf, collection.size(), maxSize);
 
             for (V object : collection) {
-               arg.encode(byteBuf, object);
+               elementCodec.encode(byteBuf, object);
             }
          }
       };
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yypssatp Lnet/minecraft/unmapped/C_anfarvhg;m_yypssatp(Ljava/util/function/IntFunction;)Lnet/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk;}
+    * @mapping {@literal named toCollection Lnet/minecraft/network/codec/PacketCodecs;toCollection(Ljava/util/function/IntFunction;)Lnet/minecraft/network/codec/PacketCodec$ResultFunction;}
     */
-   static <B extends ByteBuf, V, C extends Collection<V>> PacketCodec.C_afmwjpzk<B, V, C> m_yypssatp(IntFunction<C> intFunction) {
-      return arg -> m_hnoeqrke(intFunction, arg);
+   static <B extends ByteBuf, V, C extends Collection<V>> PacketCodec.ResultFunction<B, V, C> toCollection(IntFunction<C> factory) {
+      return packetCodec -> factory(factory, packetCodec);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_npmxjnbl Lnet/minecraft/unmapped/C_anfarvhg;m_npmxjnbl()Lnet/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk;}
+    * @mapping {@literal named toCollection Lnet/minecraft/network/codec/PacketCodecs;toCollection()Lnet/minecraft/network/codec/PacketCodec$ResultFunction;}
     */
-   static <B extends ByteBuf, V> PacketCodec.C_afmwjpzk<B, V, List<V>> m_npmxjnbl() {
-      return arg -> m_hnoeqrke(ArrayList::new, arg);
+   static <B extends ByteBuf, V> PacketCodec.ResultFunction<B, V, List<V>> toCollection() {
+      return packetCodec -> factory(ArrayList::new, packetCodec);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_oloxdgqd Lnet/minecraft/unmapped/C_anfarvhg;m_oloxdgqd(I)Lnet/minecraft/unmapped/C_qsrmwluu$C_afmwjpzk;}
+    * @mapping {@literal named toCollection Lnet/minecraft/network/codec/PacketCodecs;toCollection(I)Lnet/minecraft/network/codec/PacketCodec$ResultFunction;}
     */
-   static <B extends ByteBuf, V> PacketCodec.C_afmwjpzk<B, V, List<V>> m_oloxdgqd(int i) {
-      return arg -> m_alnjbjmz(ArrayList::new, arg, i);
+   static <B extends ByteBuf, V> PacketCodec.ResultFunction<B, V, List<V>> toCollection(int maxSize) {
+      return packetCodec -> collection(ArrayList::new, packetCodec, maxSize);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_dpnrrusl Lnet/minecraft/unmapped/C_anfarvhg;m_dpnrrusl(Ljava/util/function/IntFunction;Lnet/minecraft/unmapped/C_qsrmwluu;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named map Lnet/minecraft/network/codec/PacketCodecs;map(Ljava/util/function/IntFunction;Lnet/minecraft/network/codec/PacketCodec;Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B extends ByteBuf, K, V, M extends Map<K, V>> PacketCodec<B, M> m_dpnrrusl(
-      IntFunction<? extends M> intFunction, PacketCodec<? super B, K> arg, PacketCodec<? super B, V> arg2
+   static <B extends ByteBuf, K, V, M extends Map<K, V>> PacketCodec<B, M> map(
+      IntFunction<? extends M> factory, PacketCodec<? super B, K> keyCodec, PacketCodec<? super B, V> valueCodec
    ) {
-      return m_nqqkdxck(intFunction, arg, arg2, Integer.MAX_VALUE);
+      return map(factory, keyCodec, valueCodec, Integer.MAX_VALUE);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_nqqkdxck Lnet/minecraft/unmapped/C_anfarvhg;m_nqqkdxck(Ljava/util/function/IntFunction;Lnet/minecraft/unmapped/C_qsrmwluu;Lnet/minecraft/unmapped/C_qsrmwluu;I)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named map Lnet/minecraft/network/codec/PacketCodecs;map(Ljava/util/function/IntFunction;Lnet/minecraft/network/codec/PacketCodec;Lnet/minecraft/network/codec/PacketCodec;I)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B extends ByteBuf, K, V, M extends Map<K, V>> PacketCodec<B, M> m_nqqkdxck(
-      IntFunction<? extends M> intFunction, PacketCodec<? super B, K> arg, PacketCodec<? super B, V> arg2, int i
+   static <B extends ByteBuf, K, V, M extends Map<K, V>> PacketCodec<B, M> map(
+      IntFunction<? extends M> factory, PacketCodec<? super B, K> keyCodec, PacketCodec<? super B, V> valueCodec, int maxSize
    ) {
       return new PacketCodec<B, M>() {
          /**
@@ -707,10 +733,10 @@
           * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_oatylnwr;encode(Lio/netty/buffer/ByteBuf;Ljava/util/Map;)V}
           */
          public void encode(B byteBuf, M map) {
-            PacketCodecs.m_ygyhvfaa(byteBuf, map.size(), i);
-            map.forEach((object, object2) -> {
-               arg.encode(byteBuf, (K)object);
-               arg2.encode(byteBuf, (V)object2);
+            PacketCodecs.writeCollectionSize(byteBuf, map.size(), maxSize);
+            map.forEach((key, value) -> {
+               keyCodec.encode(byteBuf, (K)key);
+               valueCodec.encode(byteBuf, (V)value);
             });
          }
 
@@ -719,12 +745,12 @@
           * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_oatylnwr;decode(Lio/netty/buffer/ByteBuf;)Ljava/util/Map;}
           */
          public M decode(B byteBuf) {
-            int i = PacketCodecs.m_lyaauawx(byteBuf, i);
-            M map = (M)intFunction.apply(Math.min(i, 65536));
+            int i = PacketCodecs.readCollectionSize(byteBuf, maxSize);
+            M map = (M)factory.apply(Math.min(i, 65536));
 
             for (int j = 0; j < i; j++) {
-               K object = arg.decode(byteBuf);
-               V object2 = arg2.decode(byteBuf);
+               K object = keyCodec.decode(byteBuf);
+               V object2 = valueCodec.decode(byteBuf);
                map.put(object, object2);
             }
 
@@ -734,16 +760,17 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mjfejzjf Lnet/minecraft/unmapped/C_anfarvhg;m_mjfejzjf(Lnet/minecraft/unmapped/C_qsrmwluu;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named either Lnet/minecraft/network/codec/PacketCodecs;either(Lnet/minecraft/network/codec/PacketCodec;Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <B extends ByteBuf, L, R> PacketCodec<B, Either<L, R>> m_mjfejzjf(PacketCodec<? super B, L> arg, PacketCodec<? super B, R> arg2) {
+   static <B extends ByteBuf, L, R> PacketCodec<B, Either<L, R>> either(PacketCodec<? super B, L> left, PacketCodec<? super B, R> right) {
       return new PacketCodec<B, Either<L, R>>() {
          /**
           * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_anfarvhg$C_pylymjel;decode(Lio/netty/buffer/ByteBuf;)Lcom/mojang/datafixers/util/Either;}
           * @mapping {@literal named decode Lnet/minecraft/network/codec/PacketCodecs$C_pylymjel;decode(Lio/netty/buffer/ByteBuf;)Lcom/mojang/datafixers/util/Either;}
           */
          public Either<L, R> decode(B byteBuf) {
-            return byteBuf.readBoolean() ? Either.left(arg.decode(byteBuf)) : Either.right(arg2.decode(byteBuf));
+            return byteBuf.readBoolean() ? Either.left(left.decode(byteBuf)) : Either.right(right.decode(byteBuf));
          }
 
          /**
@@ -751,21 +778,22 @@
           * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_pylymjel;encode(Lio/netty/buffer/ByteBuf;Lcom/mojang/datafixers/util/Either;)V}
           */
          public void encode(B byteBuf, Either<L, R> either) {
-            either.ifLeft(object -> {
+            either.ifLeft(value -> {
                byteBuf.writeBoolean(true);
-               arg.encode(byteBuf, (L)object);
-            }).ifRight(object -> {
+               left.encode(byteBuf, (L)value);
+            }).ifRight(value -> {
                byteBuf.writeBoolean(false);
-               arg2.encode(byteBuf, (R)object);
+               right.encode(byteBuf, (R)value);
             });
          }
       };
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_oxatcqxo Lnet/minecraft/unmapped/C_anfarvhg;m_oxatcqxo(Ljava/util/function/IntFunction;Ljava/util/function/ToIntFunction;)Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named indexed Lnet/minecraft/network/codec/PacketCodecs;indexed(Ljava/util/function/IntFunction;Ljava/util/function/ToIntFunction;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<ByteBuf, T> m_oxatcqxo(IntFunction<T> intFunction, ToIntFunction<T> toIntFunction) {
+   static <T> PacketCodec<ByteBuf, T> indexed(IntFunction<T> indexToValue, ToIntFunction<T> valueToIndex) {
       return new PacketCodec<ByteBuf, T>() {
          /**
           * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_anfarvhg$C_cwrifgxv;decode(Lio/netty/buffer/ByteBuf;)Ljava/lang/Object;}
@@ -773,7 +801,7 @@
           */
          public T decode(ByteBuf byteBuf) {
             int i = VarInts.read(byteBuf);
-            return (T)intFunction.apply(i);
+            return (T)indexToValue.apply(i);
          }
 
          /**
@@ -781,7 +809,7 @@
           * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_cwrifgxv;encode(Lio/netty/buffer/ByteBuf;Ljava/lang/Object;)V}
           */
          public void encode(ByteBuf byteBuf, T object) {
-            int i = toIntFunction.applyAsInt(object);
+            int i = valueToIndex.applyAsInt(object);
             VarInts.write(byteBuf, i);
          }
       };
@@ -789,10 +817,10 @@
 
    /**
     * @mapping {@literal hashed m_jqcxtmyk Lnet/minecraft/unmapped/C_anfarvhg;m_jqcxtmyk(Lnet/minecraft/unmapped/C_feaetnaz;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_jqcxtmyk Lnet/minecraft/network/codec/PacketCodecs;m_jqcxtmyk(Lnet/minecraft/util/collection/IndexedIterable;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named entryOf Lnet/minecraft/network/codec/PacketCodecs;entryOf(Lnet/minecraft/util/collection/IndexedIterable;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<ByteBuf, T> m_jqcxtmyk(IndexedIterable<T> obj) {
-      return m_oxatcqxo(obj::getOrThrow, obj::m_hjasljfw);
+   static <T> PacketCodec<ByteBuf, T> entryOf(IndexedIterable<T> obj) {
+      return indexed(obj::getOrThrow, obj::getRawIdOrThrow);
    }
 
    /**
@@ -800,14 +828,15 @@
     * @mapping {@literal named registry Lnet/minecraft/network/codec/PacketCodecs;registry(Lnet/minecraft/registry/RegistryKey;Ljava/util/function/Function;)Lnet/minecraft/network/codec/PacketCodec;}
     */
    private static <T, R> PacketCodec<RegistryByteBuf, R> registry(
-      RegistryKey<? extends Registry<T>> registryKey, Function<Registry<T>, IndexedIterable<R>> function
+      RegistryKey<? extends Registry<T>> registryKey, Function<Registry<T>, IndexedIterable<R>> registryTransformer
    ) {
       return new PacketCodec<RegistryByteBuf, R>() {
          /**
-          * Mapping not found
+          * @mapping {@literal hashed m_eqcajgzv Lnet/minecraft/unmapped/C_anfarvhg$C_xvgblejl;m_eqcajgzv(Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_feaetnaz;}
+          * @mapping {@literal named createIterable Lnet/minecraft/network/codec/PacketCodecs$C_xvgblejl;createIterable(Lnet/minecraft/network/RegistryByteBuf;)Lnet/minecraft/util/collection/IndexedIterable;}
           */
-         private IndexedIterable<R> m_eqcajgzv(RegistryByteBuf arg) {
-            return (IndexedIterable<R>)function.apply(arg.getRegistryManager().get(registryKey));
+         private IndexedIterable<R> createIterable(RegistryByteBuf buf) {
+            return (IndexedIterable<R>)registryTransformer.apply(buf.getRegistryManager().get(registryKey));
          }
 
          /**
@@ -816,7 +845,7 @@
           */
          public R decode(RegistryByteBuf arg) {
             int i = VarInts.read(arg);
-            return (R)this.m_eqcajgzv(arg).getOrThrow(i);
+            return (R)this.createIterable(arg).getOrThrow(i);
          }
 
          /**
@@ -824,7 +853,7 @@
           * @mapping {@literal named encode Lnet/minecraft/network/codec/PacketCodecs$C_xvgblejl;encode(Lnet/minecraft/network/RegistryByteBuf;Ljava/lang/Object;)V}
           */
          public void encode(RegistryByteBuf arg, R object) {
-            int i = this.m_eqcajgzv(arg).m_hjasljfw(object);
+            int i = this.createIterable(arg).getRawIdOrThrow(object);
             VarInts.write(arg, i);
          }
       };
@@ -840,30 +869,32 @@
 
    /**
     * @mapping {@literal hashed m_hbizjcsr Lnet/minecraft/unmapped/C_anfarvhg;m_hbizjcsr(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named registryEntry Lnet/minecraft/network/codec/PacketCodecs;registryEntry(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named holder Lnet/minecraft/network/codec/PacketCodecs;holder(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<RegistryByteBuf, Holder<T>> registryEntry(RegistryKey<? extends Registry<T>> registryKey) {
+   static <T> PacketCodec<RegistryByteBuf, Holder<T>> holder(RegistryKey<? extends Registry<T>> registryKey) {
       return registry(registryKey, Registry::asHolderIdMap);
    }
 
    /**
     * @mapping {@literal hashed m_vpmnqxks Lnet/minecraft/unmapped/C_anfarvhg;m_vpmnqxks(Lnet/minecraft/unmapped/C_xhhleach;Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named registryEntry Lnet/minecraft/network/codec/PacketCodecs;registryEntry(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named holder Lnet/minecraft/network/codec/PacketCodecs;holder(Lnet/minecraft/registry/RegistryKey;Lnet/minecraft/network/codec/PacketCodec;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<RegistryByteBuf, Holder<T>> registryEntry(
-      RegistryKey<? extends Registry<T>> registryKey, PacketCodec<? super RegistryByteBuf, T> arg2
+   static <T> PacketCodec<RegistryByteBuf, Holder<T>> holder(
+      RegistryKey<? extends Registry<T>> registryKey, PacketCodec<? super RegistryByteBuf, T> packetCodec
    ) {
       return new PacketCodec<RegistryByteBuf, Holder<T>>() {
          /**
-          * Mapping not found
+          * @mapping {@literal hashed f_iesrdjsl Lnet/minecraft/unmapped/C_anfarvhg$C_vvbhljtb;f_iesrdjsl:I}
+          * @mapping {@literal named DIRECT_VALUE Lnet/minecraft/network/codec/PacketCodecs$C_vvbhljtb;DIRECT_VALUE:I}
           */
-         private static final int f_iesrdjsl = 0;
+         private static final int DIRECT_VALUE = 0;
 
          /**
-          * Mapping not found
+          * @mapping {@literal hashed m_foxeftop Lnet/minecraft/unmapped/C_anfarvhg$C_vvbhljtb;m_foxeftop(Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_feaetnaz;}
+          * @mapping {@literal named getHolderIdMap Lnet/minecraft/network/codec/PacketCodecs$C_vvbhljtb;getHolderIdMap(Lnet/minecraft/network/RegistryByteBuf;)Lnet/minecraft/util/collection/IndexedIterable;}
           */
-         private IndexedIterable<Holder<T>> m_foxeftop(RegistryByteBuf arg) {
-            return arg.getRegistryManager().get(registryKey).asHolderIdMap();
+         private IndexedIterable<Holder<T>> getHolderIdMap(RegistryByteBuf buf) {
+            return buf.getRegistryManager().get(registryKey).asHolderIdMap();
          }
 
          /**
@@ -872,7 +903,7 @@
           */
          public Holder<T> decode(RegistryByteBuf arg) {
             int i = VarInts.read(arg);
-            return i == 0 ? Holder.createDirect(arg2.decode(arg)) : (Holder)this.m_foxeftop(arg).getOrThrow(i - 1);
+            return i == 0 ? Holder.createDirect(packetCodec.decode(arg)) : (Holder)this.getHolderIdMap(arg).getOrThrow(i - 1);
          }
 
          /**
@@ -882,12 +913,12 @@
          public void encode(RegistryByteBuf arg, Holder<T> arg2) {
             switch (arg2.getKind()) {
                case REFERENCE:
-                  int i = this.m_foxeftop(arg).m_hjasljfw(arg2);
+                  int i = this.getHolderIdMap(arg).getRawIdOrThrow(arg2);
                   VarInts.write(arg, i + 1);
                   break;
                case DIRECT:
                   VarInts.write(arg, 0);
-                  arg2.encode(arg, arg2.value());
+                  packetCodec.encode(arg, arg2.value());
             }
          }
       };
@@ -895,18 +926,20 @@
 
    /**
     * @mapping {@literal hashed m_likrvuxr Lnet/minecraft/unmapped/C_anfarvhg;m_likrvuxr(Lnet/minecraft/unmapped/C_xhhleach;)Lnet/minecraft/unmapped/C_qsrmwluu;}
-    * @mapping {@literal named m_likrvuxr Lnet/minecraft/network/codec/PacketCodecs;m_likrvuxr(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/network/codec/PacketCodec;}
+    * @mapping {@literal named holderSet Lnet/minecraft/network/codec/PacketCodecs;holderSet(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/network/codec/PacketCodec;}
     */
-   static <T> PacketCodec<RegistryByteBuf, HolderSet<T>> m_likrvuxr(RegistryKey<? extends Registry<T>> registryKey) {
+   static <T> PacketCodec<RegistryByteBuf, HolderSet<T>> holderSet(RegistryKey<? extends Registry<T>> registryKey) {
       return new PacketCodec<RegistryByteBuf, HolderSet<T>>() {
          /**
-          * Mapping not found
+          * @mapping {@literal hashed f_pzuarqam Lnet/minecraft/unmapped/C_anfarvhg$C_dhtumjvv;f_pzuarqam:I}
+          * @mapping {@literal named DIRECT_ENTRY Lnet/minecraft/network/codec/PacketCodecs$C_dhtumjvv;DIRECT_ENTRY:I}
           */
-         private static final int f_pzuarqam = -1;
+         private static final int DIRECT_ENTRY = -1;
          /**
-          * Mapping not found
+          * @mapping {@literal hashed f_ysesalon Lnet/minecraft/unmapped/C_anfarvhg$C_dhtumjvv;f_ysesalon:Lnet/minecraft/unmapped/C_qsrmwluu;}
+          * @mapping {@literal named holderCodec Lnet/minecraft/network/codec/PacketCodecs$C_dhtumjvv;holderCodec:Lnet/minecraft/network/codec/PacketCodec;}
           */
-         private final PacketCodec<RegistryByteBuf, Holder<T>> f_ysesalon = PacketCodecs.registryEntry(registryKey);
+         private final PacketCodec<RegistryByteBuf, Holder<T>> holderCodec = PacketCodecs.holder(registryKey);
 
          /**
           * @mapping {@literal hashed decode Lnet/minecraft/unmapped/C_anfarvhg$C_dhtumjvv;decode(Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_odfnijdo;}
@@ -921,7 +954,7 @@
                List<Holder<T>> list = new ArrayList(Math.min(i, 65536));
 
                for (int j = 0; j < i; j++) {
-                  list.add(this.f_ysesalon.decode(arg));
+                  list.add(this.holderCodec.decode(arg));
                }
 
                return HolderSet.createDirect(list);
@@ -941,7 +974,7 @@
                VarInts.write(arg, arg2.size() + 1);
 
                for (Holder<T> lv : arg2) {
-                  this.f_ysesalon.encode(arg, lv);
+                  this.holderCodec.encode(arg, lv);
                }
             }
          }
diff -bur namedTargetSrc/net/minecraft/network/codec/ValueFirstEncoder.java namedSrc/net/minecraft/network/codec/ValueFirstEncoder.java
--- namedTargetSrc/net/minecraft/network/codec/ValueFirstEncoder.java	2024-03-09 04:30:04.700364148 +0000
+++ namedSrc/net/minecraft/network/codec/ValueFirstEncoder.java	2024-03-09 04:28:56.860262990 +0000
@@ -7,7 +7,8 @@
 @FunctionalInterface
 public interface ValueFirstEncoder<O, T> {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed encode Lnet/minecraft/unmapped/C_dptxqryi;encode(Ljava/lang/Object;Ljava/lang/Object;)V}
+    * @mapping {@literal named encode Lnet/minecraft/network/codec/ValueFirstEncoder;encode(Ljava/lang/Object;Ljava/lang/Object;)V}
     */
-   void encode(T object, O object2);
+   void encode(T value, O buf);
 }
diff -bur namedTargetSrc/net/minecraft/network/message/MessageType.java namedSrc/net/minecraft/network/message/MessageType.java
--- namedTargetSrc/net/minecraft/network/message/MessageType.java	2024-03-09 04:30:04.712364166 +0000
+++ namedSrc/net/minecraft/network/message/MessageType.java	2024-03-09 04:28:56.884263023 +0000
@@ -142,8 +142,8 @@
        * @mapping {@literal hashed f_foaxmibi Lnet/minecraft/unmapped/C_hasnsypd$C_iocvgdxe;f_foaxmibi:Lnet/minecraft/unmapped/C_qsrmwluu;}
        * @mapping {@literal named CODEC Lnet/minecraft/network/message/MessageType$Parameters;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<RegistryByteBuf, MessageType.Parameters> CODEC = PacketCodec.m_kqzabmpi(
-         PacketCodecs.registryEntry(RegistryKeys.MESSAGE_TYPE),
+      public static final PacketCodec<RegistryByteBuf, MessageType.Parameters> CODEC = PacketCodec.tuple(
+         PacketCodecs.holder(RegistryKeys.MESSAGE_TYPE),
          MessageType.Parameters::messageType,
          TextCodecs.f_bqvdscyz,
          MessageType.Parameters::name,
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.java	2024-03-09 04:30:04.776364261 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/common/CustomPayloadC2SPacket.java	2024-03-09 04:28:56.968263140 +0000
@@ -28,7 +28,7 @@
    public static final PacketCodec<PacketByteBuf, CustomPayloadC2SPacket> CODEC = CustomPayload.<PacketByteBuf>create(
          arg -> DiscardedCustomPayload.createCodec(arg, 32767), List.of(new CustomPayload.Type<>(BrandPayload.ID, BrandPayload.CODEC))
       )
-      .create(CustomPayloadC2SPacket::new, CustomPayloadC2SPacket::payload);
+      .map(CustomPayloadC2SPacket::new, CustomPayloadC2SPacket::payload);
 
    /**
     * Mapping not found
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/configuration/CookieResponseC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/configuration/CookieResponseC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/configuration/CookieResponseC2SPacket.java	2024-03-09 04:30:04.924364480 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/configuration/CookieResponseC2SPacket.java	2024-03-09 04:28:57.136263368 +0000
@@ -26,7 +26,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/network/packet/c2s/configuration/CookieResponseC2SPacket;<init>(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    private CookieResponseC2SPacket(PacketByteBuf buf) {
-      this(buf.readIdentifier(), buf.m_fjolbvuh(StoreCookieS2CPacket.f_brepbitu));
+      this(buf.readIdentifier(), buf.readNullable(StoreCookieS2CPacket.f_brepbitu));
    }
 
    /**
@@ -35,7 +35,7 @@
     */
    private void write(PacketByteBuf buf) {
       buf.writeIdentifier(this.key);
-      buf.m_zcmiuaxl(this.payload, StoreCookieS2CPacket.f_brepbitu);
+      buf.writeNullable(this.payload, StoreCookieS2CPacket.f_brepbitu);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/configuration/FinishConfigurationC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/configuration/FinishConfigurationC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/configuration/FinishConfigurationC2SPacket.java	2024-03-09 04:30:04.780364267 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/configuration/FinishConfigurationC2SPacket.java	2024-03-09 04:28:56.972263147 +0000
@@ -21,7 +21,7 @@
     * @mapping {@literal hashed f_shgoahby Lnet/minecraft/unmapped/C_elgbekgb;f_shgoahby:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/c2s/configuration/FinishConfigurationC2SPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<ByteBuf, FinishConfigurationC2SPacket> CODEC = PacketCodec.create(INSTANCE);
+   public static final PacketCodec<ByteBuf, FinishConfigurationC2SPacket> CODEC = PacketCodec.unit(INSTANCE);
 
    /**
     * Mapping not found
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/login/LoginAcknowledgementC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/login/LoginAcknowledgementC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/login/LoginAcknowledgementC2SPacket.java	2024-03-09 04:30:04.736364202 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/login/LoginAcknowledgementC2SPacket.java	2024-03-09 04:28:56.908263057 +0000
@@ -21,7 +21,7 @@
     * @mapping {@literal hashed f_gzrhzncl Lnet/minecraft/unmapped/C_rhwnywfq;f_gzrhzncl:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/c2s/login/LoginAcknowledgementC2SPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<ByteBuf, LoginAcknowledgementC2SPacket> CODEC = PacketCodec.create(INSTANCE);
+   public static final PacketCodec<ByteBuf, LoginAcknowledgementC2SPacket> CODEC = PacketCodec.unit(INSTANCE);
 
    /**
     * Mapping not found
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.java	2024-03-09 04:30:04.744364214 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/login/LoginQueryResponseC2SPacket.java	2024-03-09 04:28:56.920263073 +0000
@@ -65,7 +65,7 @@
     */
    private void write(PacketByteBuf buf) {
       buf.writeVarInt(this.transactionId);
-      buf.m_zcmiuaxl(this.payload, (bufx, payload) -> payload.write(bufx));
+      buf.writeNullable(this.payload, (bufx, payload) -> payload.write(bufx));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/BeaconUpdateC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/BeaconUpdateC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/BeaconUpdateC2SPacket.java	2024-03-09 04:30:04.792364284 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/BeaconUpdateC2SPacket.java	2024-03-09 04:28:56.988263169 +0000
@@ -22,10 +22,10 @@
     * @mapping {@literal hashed f_eercwmdv Lnet/minecraft/unmapped/C_cmduifyg;f_eercwmdv:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/c2s/play/BeaconUpdateC2SPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, BeaconUpdateC2SPacket> CODEC = PacketCodec.create(
-      PacketCodecs.registryEntry(RegistryKeys.STATUS_EFFECT).apply(PacketCodecs::m_ciouqnhu),
+   public static final PacketCodec<RegistryByteBuf, BeaconUpdateC2SPacket> CODEC = PacketCodec.tuple(
+      PacketCodecs.holder(RegistryKeys.STATUS_EFFECT).apply(PacketCodecs::optional),
       BeaconUpdateC2SPacket::primary,
-      PacketCodecs.registryEntry(RegistryKeys.STATUS_EFFECT).apply(PacketCodecs::m_ciouqnhu),
+      PacketCodecs.holder(RegistryKeys.STATUS_EFFECT).apply(PacketCodecs::optional),
       BeaconUpdateC2SPacket::secondary,
       BeaconUpdateC2SPacket::new
    );
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.java	2024-03-09 04:30:04.912364463 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/BookUpdateC2SPacket.java	2024-03-09 04:28:57.124263353 +0000
@@ -39,12 +39,12 @@
     * @mapping {@literal hashed f_cehpabkk Lnet/minecraft/unmapped/C_qojpogdb;f_cehpabkk:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/c2s/play/BookUpdateC2SPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<PacketByteBuf, BookUpdateC2SPacket> CODEC = PacketCodec.m_kqzabmpi(
+   public static final PacketCodec<PacketByteBuf, BookUpdateC2SPacket> CODEC = PacketCodec.tuple(
       PacketCodecs.VAR_INT,
       BookUpdateC2SPacket::slot,
-      PacketCodecs.string(8192).apply(PacketCodecs.m_oloxdgqd(200)),
+      PacketCodecs.string(8192).apply(PacketCodecs.toCollection(200)),
       BookUpdateC2SPacket::pages,
-      PacketCodecs.string(128).apply(PacketCodecs::m_ciouqnhu),
+      PacketCodecs.string(128).apply(PacketCodecs::optional),
       BookUpdateC2SPacket::title,
       BookUpdateC2SPacket::new
    );
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.java	2024-03-09 04:30:04.732364196 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/ChatMessageC2SPacket.java	2024-03-09 04:28:56.904263051 +0000
@@ -29,7 +29,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/network/packet/c2s/play/ChatMessageC2SPacket;<init>(Lnet/minecraft/network/PacketByteBuf;)V}
     */
    private ChatMessageC2SPacket(PacketByteBuf buf) {
-      this(buf.readString(256), buf.readInstant(), buf.readLong(), buf.m_fjolbvuh(MessageSignature::read), new MessageSignatureList.Acknowledgment(buf));
+      this(buf.readString(256), buf.readInstant(), buf.readLong(), buf.readNullable(MessageSignature::read), new MessageSignatureList.Acknowledgment(buf));
    }
 
    /**
@@ -40,7 +40,7 @@
       buf.writeString(this.message, 256);
       buf.writeInstant(this.timestamp);
       buf.writeLong(this.salt);
-      buf.m_zcmiuaxl(this.signature, MessageSignature::write);
+      buf.writeNullable(this.signature, MessageSignature::write);
       this.messageAcknowledgments.write(buf);
    }
 
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.java	2024-03-09 04:30:04.740364208 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/CreativeInventoryActionC2SPacket.java	2024-03-09 04:28:56.916263068 +0000
@@ -46,7 +46,7 @@
     */
    private CreativeInventoryActionC2SPacket(RegistryByteBuf slot) {
       this.slot = slot.readShort();
-      this.stack = ItemStack.f_iboyubuh.decode(slot);
+      this.stack = ItemStack.OPTIONAL_PACKET_CODEC.decode(slot);
    }
 
    /**
@@ -55,7 +55,7 @@
     */
    private void write(RegistryByteBuf buf) {
       buf.writeShort(this.slot);
-      ItemStack.f_iboyubuh.encode(buf, this.stack);
+      ItemStack.OPTIONAL_PACKET_CODEC.encode(buf, this.stack);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/ReconfigurationAcknowledgementC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/ReconfigurationAcknowledgementC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/ReconfigurationAcknowledgementC2SPacket.java	2024-03-09 04:30:04.672364107 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/ReconfigurationAcknowledgementC2SPacket.java	2024-03-09 04:28:56.832262951 +0000
@@ -21,7 +21,7 @@
     * @mapping {@literal hashed f_zrnjzrrr Lnet/minecraft/unmapped/C_pnrerjik;f_zrnjzrrr:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named CODEC Lnet/minecraft/network/packet/c2s/play/ReconfigurationAcknowledgementC2SPacket;CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<ByteBuf, ReconfigurationAcknowledgementC2SPacket> CODEC = PacketCodec.create(INSTANCE);
+   public static final PacketCodec<ByteBuf, ReconfigurationAcknowledgementC2SPacket> CODEC = PacketCodec.unit(INSTANCE);
 
    /**
     * Mapping not found
diff -bur namedTargetSrc/net/minecraft/network/packet/c2s/play/SlotClickC2SPacket.java namedSrc/net/minecraft/network/packet/c2s/play/SlotClickC2SPacket.java
--- namedTargetSrc/net/minecraft/network/packet/c2s/play/SlotClickC2SPacket.java	2024-03-09 04:30:04.828364338 +0000
+++ namedSrc/net/minecraft/network/packet/c2s/play/SlotClickC2SPacket.java	2024-03-09 04:28:57.032263229 +0000
@@ -32,8 +32,8 @@
     * @mapping {@literal hashed f_nxqdpizm Lnet/minecraft/unmapped/C_enzhnfdg;f_nxqdpizm:Lnet/minecraft/unmapped/C_qsrmwluu;}
     * @mapping {@literal named STACK_MAP_CODEC Lnet/minecraft/network/packet/c2s/play/SlotClickC2SPacket;STACK_MAP_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   private static final PacketCodec<RegistryByteBuf, Int2ObjectMap<ItemStack>> STACK_MAP_CODEC = PacketCodecs.m_nqqkdxck(
-      Int2ObjectOpenHashMap::new, PacketCodecs.SHORT.create(Short::intValue, Integer::shortValue), ItemStack.f_iboyubuh, 128
+   private static final PacketCodec<RegistryByteBuf, Int2ObjectMap<ItemStack>> STACK_MAP_CODEC = PacketCodecs.map(
+      Int2ObjectOpenHashMap::new, PacketCodecs.SHORT.map(Short::intValue, Integer::shortValue), ItemStack.OPTIONAL_PACKET_CODEC, 128
    );
    /**
     * @mapping {@literal hashed f_wdmowzhx Lnet/minecraft/unmapped/C_enzhnfdg;f_wdmowzhx:I}
@@ -98,7 +98,7 @@
       this.button = buf.readByte();
       this.actionType = buf.readEnumConstant(SlotActionType.class);
       this.modifiedStacks = Int2ObjectMaps.unmodifiable(STACK_MAP_CODEC.decode(buf));
-      this.stack = ItemStack.f_iboyubuh.decode(buf);
+      this.stack = ItemStack.OPTIONAL_PACKET_CODEC.decode(buf);
    }
 
    /**
@@ -112,7 +112,7 @@
       buf.writeByte(this.button);
       buf.writeEnumConstant(this.actionType);
       STACK_MAP_CODEC.encode(buf, this.modifiedStacks);
-      ItemStack.f_iboyubuh.encode(buf, this.stack);
+      ItemStack.OPTIONAL_PACKET_CODEC.encode(buf, this.stack);
    }
 
    /**


The remaining diff is too long!

Please sign in to comment.