start working on components · ix0rai/quilt-mappings@9ad8065

github-actions · 2024-03-11T03:07:33Z

With commit 9ad8065, 346 file(s) were updated with 2194 line(s) added and 1974 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-11 03:07:31.227480588 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementHolder.java	2024-03-11 03:06:22.770413645 +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-11 03:07:31.075478210 +0000
+++ namedSrc/net/minecraft/advancement/Advancement.java	2024-03-11 03:06:22.646411727 +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-11 03:07:31.059477960 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CriterionProgress.java	2024-03-11 03:06:22.626411417 +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/BeehiveBlock.java namedSrc/net/minecraft/block/BeehiveBlock.java
--- namedTargetSrc/net/minecraft/block/BeehiveBlock.java	2024-03-11 03:07:31.187479962 +0000
+++ namedSrc/net/minecraft/block/BeehiveBlock.java	2024-03-11 03:06:22.738413150 +0000
@@ -7,6 +7,7 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
@@ -35,7 +36,6 @@
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_snokizpi;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -367,7 +367,7 @@
          if (bl || i > 0) {
             ItemStack lv3 = new ItemStack(this);
             lv3.m_vchnqfkp(lv2.m_wiiwewxr());
-            lv3.m_zakagwqa(C_icwdaizi.BLOCK_STATE, C_snokizpi.f_fxqtkqgw.m_pmxqilvg(HONEY_LEVEL, i));
+            lv3.m_zakagwqa(DataComponentTypes.BLOCK_STATE, C_snokizpi.f_fxqtkqgw.m_pmxqilvg(HONEY_LEVEL, i));
             ItemEntity lv4 = new ItemEntity(world, (double)pos.getX(), (double)pos.getY(), (double)pos.getZ(), lv3);
             lv4.setToDefaultPickupDelay();
             world.spawnEntity(lv4);
diff -bur namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java
--- namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-03-11 03:07:31.015477271 +0000
+++ namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-03-11 03:06:22.582410737 +0000
@@ -9,6 +9,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.ShulkerBoxBlock;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -20,7 +21,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_wwbphpbp;
 import net.minecraft.unmapped.C_xpqegwnr;
 import net.minecraft.util.Hand;
@@ -121,13 +121,13 @@
     * @mapping {@literal named CLEAN_BANNER Lnet/minecraft/block/cauldron/CauldronBehavior;CLEAN_BANNER:Lnet/minecraft/block/cauldron/CauldronBehavior;}
     */
    CauldronBehavior CLEAN_BANNER = (state, world, pos, player, hand, stack) -> {
-      C_wwbphpbp lv = stack.m_bcdzwasi(C_icwdaizi.BANNER_PATTERNS, C_wwbphpbp.f_hnnrbutf);
+      C_wwbphpbp lv = stack.getOrDefault(DataComponentTypes.BANNER_PATTERNS, C_wwbphpbp.f_hnnrbutf);
       if (lv.layers().isEmpty()) {
          return InteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
       } else {
          if (!world.isClient) {
             ItemStack lv2 = stack.withCount(1);
-            lv2.m_zakagwqa(C_icwdaizi.BANNER_PATTERNS, lv.m_wacyujar());
+            lv2.m_zakagwqa(DataComponentTypes.BANNER_PATTERNS, lv.m_wacyujar());
             stack.m_tyuugrfg(1, player);
             if (stack.isEmpty()) {
                player.setStackInHand(hand, lv2);
@@ -151,11 +151,11 @@
    CauldronBehavior CLEAN_DYEABLE_ITEM = (state, world, pos, player, hand, stack) -> {
       if (!stack.isIn(ItemTags.DYEABLE)) {
          return InteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
-      } else if (!stack.m_pqplbapb(C_icwdaizi.DYED_COLOR)) {
+      } else if (!stack.contains(DataComponentTypes.DYED_COLOR)) {
          return InteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
       } else {
          if (!world.isClient) {
-            stack.m_kdmqavat(C_icwdaizi.DYED_COLOR);
+            stack.m_kdmqavat(DataComponentTypes.DYED_COLOR);
             player.incrementStat(Stats.CLEAN_ARMOR);
             LeveledCauldronBlock.decrementFluidLevel(state, world, pos);
          }
@@ -190,7 +190,7 @@
       Map<Item, CauldronBehavior> map = EMPTY_CAULDRON_BEHAVIOR.map();
       registerBucketBehavior(map);
       map.put(Items.POTION, (CauldronBehavior)(state, world, pos, player, hand, stack) -> {
-         C_xpqegwnr lv = stack.m_dnvbhafp(C_icwdaizi.POTION_CONTENTS);
+         C_xpqegwnr lv = stack.get(DataComponentTypes.POTION_CONTENTS);
          if (lv != null && lv.m_njngtrku(Potions.WATER)) {
             if (!world.isClient) {
                Item lv2 = stack.getItem();
@@ -240,7 +240,7 @@
          if ((Integer)state.get(LeveledCauldronBlock.LEVEL) == 3) {
             return InteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
          } else {
-            C_xpqegwnr lv = stack.m_dnvbhafp(C_icwdaizi.POTION_CONTENTS);
+            C_xpqegwnr lv = stack.get(DataComponentTypes.POTION_CONTENTS);
             if (lv != null && lv.m_njngtrku(Potions.WATER)) {
                if (!world.isClient) {
                   player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, new ItemStack(Items.GLASS_BOTTLE)));
diff -bur namedTargetSrc/net/minecraft/block/CommandBlock.java namedSrc/net/minecraft/block/CommandBlock.java
--- namedTargetSrc/net/minecraft/block/CommandBlock.java	2024-03-11 03:07:31.187479962 +0000
+++ namedSrc/net/minecraft/block/CommandBlock.java	2024-03-11 03:06:22.734413088 +0000
@@ -6,6 +6,7 @@
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.CommandBlockBlockEntity;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
@@ -15,7 +16,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
 import net.minecraft.util.BlockRotation;
@@ -196,7 +196,7 @@
       if (world.getBlockEntity(pos) instanceof CommandBlockBlockEntity lv2) {
          CommandBlockExecutor lv3 = lv2.getCommandExecutor();
          if (!world.isClient) {
-            if (!stack.m_pqplbapb(C_icwdaizi.BLOCK_ENTITY_DATA)) {
+            if (!stack.contains(DataComponentTypes.BLOCK_ENTITY_DATA)) {
                lv3.setTrackingOutput(world.getGameRules().getBooleanValue(GameRules.SEND_COMMAND_FEEDBACK));
                lv2.setAuto(this.auto);
             }
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-03-11 03:07:31.015477271 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-03-11 03:06:22.582410737 +0000
@@ -6,6 +6,7 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.DecoratedPotBlockEntity;
 import net.minecraft.client.item.TooltipContext;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.ai.pathing.NavigationType;
 import net.minecraft.entity.player.PlayerEntity;
@@ -35,7 +36,6 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_cpmlbyix;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
@@ -290,7 +290,7 @@
       ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options, @Nullable DynamicRegistryManager registryManager
    ) {
       super.appendTooltip(stack, world, tooltip, options, registryManager);
-      C_cpmlbyix lv = stack.m_bcdzwasi(C_icwdaizi.POT_DECORATIONS, C_cpmlbyix.f_gautzvog);
+      C_cpmlbyix lv = stack.getOrDefault(DataComponentTypes.POT_DECORATIONS, C_cpmlbyix.f_gautzvog);
       if (!lv.equals(C_cpmlbyix.f_gautzvog)) {
          tooltip.add(CommonTexts.EMPTY);
          Stream.of(lv.front(), lv.left(), lv.right(), lv.back())
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-03-11 03:07:31.159479524 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-03-11 03:06:22.714412779 +0000
@@ -22,6 +22,7 @@
 import net.minecraft.block.entity.BeehiveBlockEntity;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.SkullBlockEntity;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.Saddleable;
@@ -61,7 +62,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.state.properties.RotationSegment;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_xpqegwnr;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Util;
@@ -836,7 +836,7 @@
              */
             @Override
             public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-               C_xpqegwnr lv = stack.m_bcdzwasi(C_icwdaizi.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
+               C_xpqegwnr lv = stack.getOrDefault(DataComponentTypes.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
                if (!lv.m_njngtrku(Potions.WATER)) {
                   return this.f_hupyxnsp.dispense(pointer, stack);
                } else {
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-11 03:07:31.135479149 +0000
+++ namedSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-03-11 03:06:22.686412346 +0000
@@ -4,6 +4,8 @@
 import net.minecraft.block.AbstractBannerBlock;
 import net.minecraft.block.BannerBlock;
 import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
@@ -11,8 +13,6 @@
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.unmapped.C_wwbphpbp;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Nameable;
@@ -81,7 +81,7 @@
     */
    public void m_igihlswz(ItemStack stack, DyeColor arg2) {
       this.baseColor = arg2;
-      this.m_kdfbpbpy(stack.m_eutadtlw());
+      this.m_kdfbpbpy(stack.getComponents());
    }
 
    /**
@@ -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);
       }
@@ -179,18 +182,18 @@
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
-      this.f_yqkmzniy = arg.m_ueulfbom(C_icwdaizi.BANNER_PATTERNS, C_wwbphpbp.f_hnnrbutf);
-      this.customName = arg.m_ryahtcyv(C_icwdaizi.CUSTOM_NAME);
+   public void m_kdfbpbpy(DataComponentMap arg) {
+      this.f_yqkmzniy = arg.getOrDefault(DataComponentTypes.BANNER_PATTERNS, C_wwbphpbp.f_hnnrbutf);
+      this.customName = arg.get(DataComponentTypes.CUSTOM_NAME);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
-      arg.m_zuepxtcm(C_icwdaizi.BANNER_PATTERNS, this.f_yqkmzniy);
-      arg.m_zuepxtcm(C_icwdaizi.CUSTOM_NAME, this.customName);
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
+      arg.put(DataComponentTypes.BANNER_PATTERNS, this.f_yqkmzniy);
+      arg.put(DataComponentTypes.CUSTOM_NAME, this.customName);
    }
 
    /**
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-11 03:07:31.067478085 +0000
+++ namedSrc/net/minecraft/block/entity/BannerPattern.java	2024-03-11 03:06:22.638411603 +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/BeaconBlockEntity.java namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-03-11 03:07:31.131479087 +0000
+++ namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-03-11 03:06:22.682412284 +0000
@@ -13,6 +13,8 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.Stainable;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
@@ -36,8 +38,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Nameable;
 import net.minecraft.util.math.BlockPos;
@@ -517,19 +517,19 @@
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
-      this.customName = arg.m_ryahtcyv(C_icwdaizi.CUSTOM_NAME);
-      this.lock = arg.m_ueulfbom(C_icwdaizi.LOCK, ContainerLock.EMPTY);
+   public void m_kdfbpbpy(DataComponentMap arg) {
+      this.customName = arg.get(DataComponentTypes.CUSTOM_NAME);
+      this.lock = arg.getOrDefault(DataComponentTypes.LOCK, ContainerLock.EMPTY);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
-      arg.m_zuepxtcm(C_icwdaizi.CUSTOM_NAME, this.customName);
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
+      arg.put(DataComponentTypes.CUSTOM_NAME, this.customName);
       if (!this.lock.equals(ContainerLock.EMPTY)) {
-         arg.m_zuepxtcm(C_icwdaizi.LOCK, this.lock);
+         arg.put(DataComponentTypes.LOCK, this.lock);
       }
    }
 
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-11 03:07:31.155479462 +0000
+++ namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-03-11 03:06:22.706412655 +0000
@@ -12,6 +12,8 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.CampfireBlock;
 import net.minecraft.block.FireBlock;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.BeeEntity;
@@ -28,9 +30,7 @@
 import net.minecraft.server.network.DebugInfoSender;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.util.Util;
 import net.minecraft.util.annotation.Debug;
 import net.minecraft.util.dynamic.Codecs;
@@ -422,10 +422,10 @@
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
+   public void m_kdfbpbpy(DataComponentMap arg) {
       super.m_kdfbpbpy(arg);
       this.bees.clear();
-      List<BeehiveBlockEntity.C_cakykluc> list = arg.m_ueulfbom(C_icwdaizi.BEES, List.of());
+      List<BeehiveBlockEntity.C_cakykluc> list = arg.getOrDefault(DataComponentTypes.BEES, List.of());
       list.forEach(this::addBee);
    }
 
@@ -433,9 +433,9 @@
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
       super.m_yrvcizjn(arg);
-      arg.m_zuepxtcm(C_icwdaizi.BEES, this.m_qwlovmrg());
+      arg.put(DataComponentTypes.BEES, this.m_qwlovmrg());
    }
 
    /**
@@ -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/BlockEntity.java namedSrc/net/minecraft/block/entity/BlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BlockEntity.java	2024-03-11 03:07:31.047477773 +0000
+++ namedSrc/net/minecraft/block/entity/BlockEntity.java	2024-03-11 03:06:22.618411294 +0000
@@ -2,6 +2,7 @@
 
 import com.mojang.logging.LogUtils;
 import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentMap;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
@@ -9,7 +10,6 @@
 import net.minecraft.network.packet.Packet;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.registry.Registries;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.crash.CrashCallable;
 import net.minecraft.util.crash.CrashReportSection;
@@ -369,13 +369,13 @@
    /**
     * Mapping not found
     */
-   public void m_kdfbpbpy(C_kouhnfig arg) {
+   public void m_kdfbpbpy(DataComponentMap arg) {
    }
 
    /**
     * Mapping not found
     */
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
    }
 
    /**
@@ -388,9 +388,9 @@
    /**
     * Mapping not found
     */
-   public final C_kouhnfig m_wiiwewxr() {
-      C_kouhnfig.C_vfzyoahz lv = C_kouhnfig.m_invvxtoq();
+   public final DataComponentMap m_wiiwewxr() {
+      DataComponentMap.Builder lv = DataComponentMap.builder();
       this.m_yrvcizjn(lv);
-      return lv.m_ilbrroua();
+      return lv.build();
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/CampfireBlockEntity.java namedSrc/net/minecraft/block/entity/CampfireBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CampfireBlockEntity.java	2024-03-11 03:07:30.975476646 +0000
+++ namedSrc/net/minecraft/block/entity/CampfireBlockEntity.java	2024-03-11 03:06:22.502409498 +0000
@@ -4,6 +4,8 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.CampfireBlock;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.inventory.Inventories;
 import net.minecraft.inventory.Inventory;
@@ -18,8 +20,6 @@
 import net.minecraft.recipe.RecipeManager;
 import net.minecraft.recipe.RecipeType;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.unmapped.C_tmeipioo;
 import net.minecraft.util.Clearable;
 import net.minecraft.util.ItemScatterer;
@@ -274,16 +274,16 @@
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
-      arg.m_ueulfbom(C_icwdaizi.CONTAINER, C_tmeipioo.f_poyutggn).m_ckoviecg(this.getItemsBeingCooked());
+   public void m_kdfbpbpy(DataComponentMap arg) {
+      arg.getOrDefault(DataComponentTypes.CONTAINER, C_tmeipioo.f_poyutggn).m_ckoviecg(this.getItemsBeingCooked());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
-      arg.m_zuepxtcm(C_icwdaizi.CONTAINER, C_tmeipioo.m_bcwvkaaa(this.getItemsBeingCooked()));
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
+      arg.put(DataComponentTypes.CONTAINER, C_tmeipioo.m_bcwvkaaa(this.getItemsBeingCooked()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.java namedSrc/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.java	2024-03-11 03:07:31.175479775 +0000
+++ namedSrc/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.java	2024-03-11 03:06:22.726412964 +0000
@@ -6,6 +6,8 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.ChiseledBookshelfBlock;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.Inventories;
 import net.minecraft.inventory.Inventory;
@@ -14,8 +16,6 @@
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.state.property.BooleanProperty;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.unmapped.C_tmeipioo;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.math.BlockPos;
@@ -222,16 +222,16 @@
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
-      arg.m_ueulfbom(C_icwdaizi.CONTAINER, C_tmeipioo.f_poyutggn).m_ckoviecg(this.inventory);
+   public void m_kdfbpbpy(DataComponentMap arg) {
+      arg.getOrDefault(DataComponentTypes.CONTAINER, C_tmeipioo.f_poyutggn).m_ckoviecg(this.inventory);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
-      arg.m_zuepxtcm(C_icwdaizi.CONTAINER, C_tmeipioo.m_bcwvkaaa(this.inventory));
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
+      arg.put(DataComponentTypes.CONTAINER, C_tmeipioo.m_bcwvkaaa(this.inventory));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/CommandBlockBlockEntity.java namedSrc/net/minecraft/block/entity/CommandBlockBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CommandBlockBlockEntity.java	2024-03-11 03:07:31.135479149 +0000
+++ namedSrc/net/minecraft/block/entity/CommandBlockBlockEntity.java	2024-03-11 03:06:22.686412346 +0000
@@ -4,12 +4,12 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.CommandBlock;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec2f;
@@ -265,17 +265,17 @@
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
-      this.commandExecutor.m_tsrtcdlu(arg.m_ryahtcyv(C_icwdaizi.CUSTOM_NAME));
+   public void m_kdfbpbpy(DataComponentMap arg) {
+      this.commandExecutor.m_tsrtcdlu(arg.get(DataComponentTypes.CUSTOM_NAME));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
       super.m_yrvcizjn(arg);
-      arg.m_zuepxtcm(C_icwdaizi.CUSTOM_NAME, this.commandExecutor.m_jsqrpbnk());
+      arg.put(DataComponentTypes.CUSTOM_NAME, this.commandExecutor.m_jsqrpbnk());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-03-11 03:07:31.207480275 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-03-11 03:06:22.754413397 +0000
@@ -2,6 +2,8 @@
 
 import java.util.List;
 import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.inventory.LootableInventory;
 import net.minecraft.inventory.SingleStackInventory;
 import net.minecraft.item.ItemStack;
@@ -12,8 +14,6 @@
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.state.property.Properties;
 import net.minecraft.unmapped.C_cpmlbyix;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.unmapped.C_tmeipioo;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
@@ -147,7 +147,7 @@
     * @mapping {@literal named readNbt Lnet/minecraft/block/entity/DecoratedPotBlockEntity;readNbt(Lnet/minecraft/item/ItemStack;)V}
     */
    public void readNbt(ItemStack stack) {
-      this.m_kdfbpbpy(stack.m_eutadtlw());
+      this.m_kdfbpbpy(stack.getComponents());
    }
 
    /**
@@ -161,11 +161,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_qjeeptjd Lnet/minecraft/unmapped/C_snnddtnv;m_qjeeptjd(Lnet/minecraft/unmapped/C_cpmlbyix;)Lnet/minecraft/unmapped/C_sddaxwyk;}
+    * @mapping {@literal named m_qjeeptjd Lnet/minecraft/block/entity/DecoratedPotBlockEntity;m_qjeeptjd(Lnet/minecraft/unmapped/C_cpmlbyix;)Lnet/minecraft/item/ItemStack;}
     */
-   public static ItemStack m_qjeeptjd(C_cpmlbyix arg) {
+   public static ItemStack m_qjeeptjd(C_cpmlbyix value) {
       ItemStack lv = Items.DECORATED_POT.getDefaultStack();
-      lv.m_zakagwqa(C_icwdaizi.POT_DECORATIONS, arg);
+      lv.m_zakagwqa(DataComponentTypes.POT_DECORATIONS, value);
       return lv;
    }
 
@@ -206,18 +207,18 @@
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
-      arg.m_zuepxtcm(C_icwdaizi.POT_DECORATIONS, this.sherds);
-      arg.m_zuepxtcm(C_icwdaizi.CONTAINER, C_tmeipioo.m_bcwvkaaa(List.of(this.stack)));
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
+      arg.put(DataComponentTypes.POT_DECORATIONS, this.sherds);
+      arg.put(DataComponentTypes.CONTAINER, C_tmeipioo.m_bcwvkaaa(List.of(this.stack)));
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
-      this.sherds = arg.m_ueulfbom(C_icwdaizi.POT_DECORATIONS, C_cpmlbyix.f_gautzvog);
-      this.stack = arg.m_ueulfbom(C_icwdaizi.CONTAINER, C_tmeipioo.f_poyutggn).m_fxmbjjsj();
+   public void m_kdfbpbpy(DataComponentMap arg) {
+      this.sherds = arg.getOrDefault(DataComponentTypes.POT_DECORATIONS, C_cpmlbyix.f_gautzvog);
+      this.stack = arg.getOrDefault(DataComponentTypes.CONTAINER, C_tmeipioo.f_poyutggn).m_fxmbjjsj();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java namedSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java	2024-03-11 03:07:31.155479462 +0000
+++ namedSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java	2024-03-11 03:06:22.710412717 +0000
@@ -1,13 +1,13 @@
 package net.minecraft.block.entity;
 
 import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.util.Nameable;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
@@ -203,16 +203,16 @@
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
-      this.customName = arg.m_ryahtcyv(C_icwdaizi.CUSTOM_NAME);
+   public void m_kdfbpbpy(DataComponentMap arg) {
+      this.customName = arg.get(DataComponentTypes.CUSTOM_NAME);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
-      arg.m_zuepxtcm(C_icwdaizi.CUSTOM_NAME, this.customName);
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
+      arg.put(DataComponentTypes.CUSTOM_NAME, this.customName);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/LecternBlockEntity.java namedSrc/net/minecraft/block/entity/LecternBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LecternBlockEntity.java	2024-03-11 03:07:31.163479587 +0000
+++ namedSrc/net/minecraft/block/entity/LecternBlockEntity.java	2024-03-11 03:06:22.714412779 +0000
@@ -2,6 +2,7 @@
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LecternBlock;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.Inventory;
@@ -20,7 +21,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_caqjiyos;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_xfpcozbo;
 import net.minecraft.util.Clearable;
 import net.minecraft.util.math.BlockPos;
@@ -388,11 +388,11 @@
     * @mapping {@literal named m_vzujzdhr Lnet/minecraft/block/entity/LecternBlockEntity;m_vzujzdhr(Lnet/minecraft/item/ItemStack;)I}
     */
    private static int m_vzujzdhr(ItemStack stack) {
-      C_xfpcozbo lv = stack.m_dnvbhafp(C_icwdaizi.WRITTEN_BOOK_CONTENT);
+      C_xfpcozbo lv = stack.get(DataComponentTypes.WRITTEN_BOOK_CONTENT);
       if (lv != null) {
          return lv.pages().size();
       } else {
-         C_caqjiyos lv2 = stack.m_dnvbhafp(C_icwdaizi.WRITABLE_BOOK_CONTENT);
+         C_caqjiyos lv2 = stack.get(DataComponentTypes.WRITABLE_BOOK_CONTENT);
          return lv2 != null ? lv2.pages().size() : 0;
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-03-11 03:07:31.199480149 +0000
+++ namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-03-11 03:06:22.746413274 +0000
@@ -1,6 +1,8 @@
 package net.minecraft.block.entity;
 
 import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.ContainerLock;
@@ -15,8 +17,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.unmapped.C_tmeipioo;
 import net.minecraft.util.Nameable;
 import net.minecraft.util.collection.DefaultedList;
@@ -227,23 +227,23 @@
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
-      this.customName = arg.m_ryahtcyv(C_icwdaizi.CUSTOM_NAME);
-      this.lock = arg.m_ueulfbom(C_icwdaizi.LOCK, ContainerLock.EMPTY);
-      arg.m_ueulfbom(C_icwdaizi.CONTAINER, C_tmeipioo.f_poyutggn).m_ckoviecg(this.getInvStack());
+   public void m_kdfbpbpy(DataComponentMap arg) {
+      this.customName = arg.get(DataComponentTypes.CUSTOM_NAME);
+      this.lock = arg.getOrDefault(DataComponentTypes.LOCK, ContainerLock.EMPTY);
+      arg.getOrDefault(DataComponentTypes.CONTAINER, C_tmeipioo.f_poyutggn).m_ckoviecg(this.getInvStack());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
-      arg.m_zuepxtcm(C_icwdaizi.CUSTOM_NAME, this.customName);
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
+      arg.put(DataComponentTypes.CUSTOM_NAME, this.customName);
       if (!this.lock.equals(ContainerLock.EMPTY)) {
-         arg.m_zuepxtcm(C_icwdaizi.LOCK, this.lock);
+         arg.put(DataComponentTypes.LOCK, this.lock);
       }
 
-      arg.m_zuepxtcm(C_icwdaizi.CONTAINER, C_tmeipioo.m_bcwvkaaa(this.getInvStack()));
+      arg.put(DataComponentTypes.CONTAINER, C_tmeipioo.m_bcwvkaaa(this.getInvStack()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-03-11 03:07:31.051477835 +0000
+++ namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-03-11 03:06:22.618411294 +0000
@@ -1,15 +1,15 @@
 package net.minecraft.block.entity;
 
 import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.LootableInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.screen.ScreenHandler;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_jnvhjiwc;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import org.jetbrains.annotations.Nullable;
@@ -144,9 +144,9 @@
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
+   public void m_kdfbpbpy(DataComponentMap arg) {
       super.m_kdfbpbpy(arg);
-      C_jnvhjiwc lv = arg.m_ryahtcyv(C_icwdaizi.CONTAINER_LOOT);
+      C_jnvhjiwc lv = arg.get(DataComponentTypes.CONTAINER_LOOT);
       if (lv != null) {
          this.lootTableId = lv.lootTable();
          this.lootTableSeed = lv.seed();
@@ -157,10 +157,10 @@
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
       super.m_yrvcizjn(arg);
       if (this.lootTableId != null) {
-         arg.m_zuepxtcm(C_icwdaizi.CONTAINER_LOOT, new C_jnvhjiwc(this.lootTableId, this.lootTableSeed));
+         arg.put(DataComponentTypes.CONTAINER_LOOT, new C_jnvhjiwc(this.lootTableId, this.lootTableSeed));
       }
    }
 
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-11 03:07:31.279481401 +0000
+++ namedSrc/net/minecraft/block/entity/SignBlockEntity.java	2024-03-11 03:06:22.814414326 +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-11 03:07:31.275481339 +0000
+++ namedSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-03-11 03:06:22.810414264 +0000
@@ -14,6 +14,8 @@
 import java.util.function.BooleanSupplier;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.SkullBlock;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtOps;
@@ -21,9 +23,7 @@
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.server.Services;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_iqgmrwok;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.util.ChatUtil;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -294,27 +294,27 @@
     */
    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());
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_kdfbpbpy(C_kouhnfig arg) {
-      this.setOwner(arg.m_ryahtcyv(C_icwdaizi.PROFILE));
-      this.noteBlockSound = arg.m_ryahtcyv(C_icwdaizi.NOTE_BLOCK_SOUND);
-      this.f_vvhynfvk = arg.m_ryahtcyv(C_icwdaizi.CUSTOM_NAME);
+   public void m_kdfbpbpy(DataComponentMap arg) {
+      this.setOwner(arg.get(DataComponentTypes.PROFILE));
+      this.noteBlockSound = arg.get(DataComponentTypes.NOTE_BLOCK_SOUND);
+      this.f_vvhynfvk = arg.get(DataComponentTypes.CUSTOM_NAME);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void m_yrvcizjn(C_kouhnfig.C_vfzyoahz arg) {
-      arg.m_zuepxtcm(C_icwdaizi.PROFILE, this.owner);
-      arg.m_zuepxtcm(C_icwdaizi.NOTE_BLOCK_SOUND, this.noteBlockSound);
-      arg.m_zuepxtcm(C_icwdaizi.CUSTOM_NAME, this.f_vvhynfvk);
+   public void m_yrvcizjn(DataComponentMap.Builder arg) {
+      arg.put(DataComponentTypes.PROFILE, this.owner);
+      arg.put(DataComponentTypes.NOTE_BLOCK_SOUND, this.noteBlockSound);
+      arg.put(DataComponentTypes.CUSTOM_NAME, this.f_vvhynfvk);
    }
 
    /**
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-11 03:07:31.135479149 +0000
+++ namedSrc/net/minecraft/block/entity/VaultBlockEntity.java	2024-03-11 03:06:22.686412346 +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/block/JukeboxBlock.java namedSrc/net/minecraft/block/JukeboxBlock.java
--- namedTargetSrc/net/minecraft/block/JukeboxBlock.java	2024-03-11 03:07:31.059477960 +0000
+++ namedSrc/net/minecraft/block/JukeboxBlock.java	2024-03-11 03:06:22.630411479 +0000
@@ -5,6 +5,7 @@
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.JukeboxBlockEntity;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -12,7 +13,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.hit.BlockHitResult;
@@ -61,7 +61,7 @@
    @Override
    public void onPlaced(World world, BlockPos pos, BlockState state, @Nullable LivingEntity placer, ItemStack stack) {
       super.onPlaced(world, pos, state, placer, stack);
-      C_incrreuu lv = stack.m_bcdzwasi(C_icwdaizi.BLOCK_ENTITY_DATA, C_incrreuu.f_egifbhdk);
+      C_incrreuu lv = stack.getOrDefault(DataComponentTypes.BLOCK_ENTITY_DATA, C_incrreuu.f_egifbhdk);
       if (lv.m_ongxyjew("RecordItem")) {
          world.setBlockState(pos, state.with(HAS_RECORD, Boolean.valueOf(true)), Block.NOTIFY_LISTENERS);
       }
diff -bur namedTargetSrc/net/minecraft/block/LecternBlock.java namedSrc/net/minecraft/block/LecternBlock.java
--- namedTargetSrc/net/minecraft/block/LecternBlock.java	2024-03-11 03:07:31.135479149 +0000
+++ namedSrc/net/minecraft/block/LecternBlock.java	2024-03-11 03:06:22.686412346 +0000
@@ -3,6 +3,7 @@
 import com.mojang.serialization.MapCodec;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.LecternBlockEntity;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.ai.pathing.NavigationType;
@@ -19,7 +20,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.DirectionProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
@@ -187,7 +187,7 @@
       PlayerEntity lv3 = ctx.getPlayer();
       boolean bl = false;
       if (!lv.isClient && lv3 != null && lv3.isCreativeLevelTwoOp()) {
-         C_incrreuu lv4 = lv2.m_bcdzwasi(C_icwdaizi.BLOCK_ENTITY_DATA, C_incrreuu.f_egifbhdk);
+         C_incrreuu lv4 = lv2.getOrDefault(DataComponentTypes.BLOCK_ENTITY_DATA, C_incrreuu.f_egifbhdk);
          if (lv4.m_ongxyjew("Book")) {
             bl = true;
          }
diff -bur namedTargetSrc/net/minecraft/block/LightBlock.java namedSrc/net/minecraft/block/LightBlock.java
--- namedTargetSrc/net/minecraft/block/LightBlock.java	2024-03-11 03:07:31.151479399 +0000
+++ namedSrc/net/minecraft/block/LightBlock.java	2024-03-11 03:06:22.706412655 +0000
@@ -2,6 +2,7 @@
 
 import com.mojang.serialization.MapCodec;
 import java.util.function.ToIntFunction;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
@@ -11,7 +12,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.state.property.Properties;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_snokizpi;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.hit.BlockHitResult;
@@ -162,7 +162,7 @@
     */
    public static ItemStack appendLevelNbt(ItemStack stack, int lightLevel) {
       if (lightLevel != 15) {
-         stack.m_zakagwqa(C_icwdaizi.BLOCK_STATE, C_snokizpi.f_fxqtkqgw.m_pmxqilvg(LEVEL_15, lightLevel));
+         stack.m_zakagwqa(DataComponentTypes.BLOCK_STATE, C_snokizpi.f_fxqtkqgw.m_pmxqilvg(LEVEL_15, lightLevel));
       }
 
       return stack;
diff -bur namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java namedSrc/net/minecraft/block/ShulkerBoxBlock.java
--- namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-03-11 03:07:31.171479712 +0000
+++ namedSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-03-11 03:06:22.722412902 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.entity.ShulkerBoxBlockEntity;
 import net.minecraft.client.item.TooltipContext;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.mob.PiglinBrain;
 import net.minecraft.entity.mob.ShulkerEntity;
@@ -26,7 +27,6 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.EnumProperty;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_tmeipioo;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.BlockMirror;
@@ -282,14 +282,14 @@
       ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options, @Nullable DynamicRegistryManager registryManager
    ) {
       super.appendTooltip(stack, world, tooltip, options, registryManager);
-      if (stack.m_pqplbapb(C_icwdaizi.CONTAINER_LOOT)) {
+      if (stack.contains(DataComponentTypes.CONTAINER_LOOT)) {
          tooltip.add(f_ihshplar);
       }
 
       int i = 0;
       int j = 0;
 
-      for (ItemStack lv : stack.m_bcdzwasi(C_icwdaizi.CONTAINER, C_tmeipioo.f_poyutggn)) {
+      for (ItemStack lv : stack.getOrDefault(DataComponentTypes.CONTAINER, C_tmeipioo.f_poyutggn)) {
          j++;
          if (i <= 4) {
             i++;
diff -bur namedTargetSrc/net/minecraft/block/Spawner.java namedSrc/net/minecraft/block/Spawner.java
--- namedTargetSrc/net/minecraft/block/Spawner.java	2024-03-11 03:07:31.179479837 +0000
+++ namedSrc/net/minecraft/block/Spawner.java	2024-03-11 03:06:22.730413026 +0000
@@ -1,6 +1,7 @@
 package net.minecraft.block;
 
 import java.util.List;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.EntityType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
@@ -8,7 +9,6 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -47,7 +47,7 @@
     */
    @Nullable
    static Text getEntityFromNbt(ItemStack stack, String dataKey) {
-      NbtCompound lv = stack.m_bcdzwasi(C_icwdaizi.BLOCK_ENTITY_DATA, C_incrreuu.f_egifbhdk).m_tpafhgjl();
+      NbtCompound lv = stack.getOrDefault(DataComponentTypes.BLOCK_ENTITY_DATA, C_incrreuu.f_egifbhdk).m_tpafhgjl();
       Identifier lv2 = getEntityFromNbt(lv, dataKey);
       return lv2 != null
          ? (Text)Registries.ENTITY_TYPE
diff -bur namedTargetSrc/net/minecraft/client/color/item/ItemColors.java namedSrc/net/minecraft/client/color/item/ItemColors.java
--- namedTargetSrc/net/minecraft/client/color/item/ItemColors.java	2024-03-11 03:07:31.095478523 +0000
+++ namedSrc/net/minecraft/client/color/item/ItemColors.java	2024-03-11 03:06:22.666412036 +0000
@@ -9,6 +9,7 @@
 import net.minecraft.client.color.world.FoliageColors;
 import net.minecraft.client.color.world.GrassColors;
 import net.minecraft.client.util.ColorUtil;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemConvertible;
@@ -17,7 +18,6 @@
 import net.minecraft.item.SpawnEggItem;
 import net.minecraft.registry.Registries;
 import net.minecraft.unmapped.C_ibwugxba;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_jclgxtxp;
 import net.minecraft.unmapped.C_jlijuwug;
 import net.minecraft.unmapped.C_xpqegwnr;
@@ -60,7 +60,7 @@
          if (tintIndex != 1) {
             return -1;
          } else {
-            C_ibwugxba lvx = stack.m_dnvbhafp(C_icwdaizi.FIREWORK_EXPLOSION);
+            C_ibwugxba lvx = stack.get(DataComponentTypes.FIREWORK_EXPLOSION);
             IntList intList = lvx != null ? lvx.colors() : IntList.of();
             int j = intList.size();
             if (j == 0) {
@@ -86,7 +86,7 @@
       lv.register(
          (stack, tintIndex) -> tintIndex > 0
                ? -1
-               : ColorUtil.ARGB32.m_xrcgvmaq(stack.m_bcdzwasi(C_icwdaizi.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq).m_nlaiylfj()),
+               : ColorUtil.ARGB32.m_xrcgvmaq(stack.getOrDefault(DataComponentTypes.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq).m_nlaiylfj()),
          Items.POTION,
          Items.SPLASH_POTION,
          Items.LINGERING_POTION,
@@ -116,7 +116,8 @@
       );
       lv.register((stack, tintIndex) -> FoliageColors.getMangroveColor(), Blocks.MANGROVE_LEAVES);
       lv.register(
-         (stack, i) -> i == 0 ? -1 : ColorUtil.ARGB32.m_xrcgvmaq(stack.m_bcdzwasi(C_icwdaizi.MAP_COLOR, C_jclgxtxp.f_xzwyocii).rgb()), Items.FILLED_MAP
+         (stack, i) -> i == 0 ? -1 : ColorUtil.ARGB32.m_xrcgvmaq(stack.getOrDefault(DataComponentTypes.MAP_COLOR, C_jclgxtxp.f_xzwyocii).rgb()),
+         Items.FILLED_MAP
       );
       return lv;
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/GuiGraphics.java namedSrc/net/minecraft/client/gui/GuiGraphics.java
--- namedTargetSrc/net/minecraft/client/gui/GuiGraphics.java	2024-03-11 03:07:30.987476834 +0000
+++ namedSrc/net/minecraft/client/gui/GuiGraphics.java	2024-03-11 03:06:22.526409870 +0000
@@ -882,7 +882,7 @@
             CrashReport lv2 = CrashReport.create(var12, "Rendering item");
             CrashReportSection lv3 = lv2.addElement("Item being rendered");
             lv3.add("Item Type", (CrashCallable<String>)(() -> String.valueOf(stack.getItem())));
-            lv3.add("Item Components", (CrashCallable<String>)(() -> String.valueOf(stack.m_eutadtlw())));
+            lv3.add("Item Components", (CrashCallable<String>)(() -> String.valueOf(stack.getComponents())));
             lv3.add("Item Foil", (CrashCallable<String>)(() -> String.valueOf(stack.hasGlint())));
             throw new CrashException(lv2);
          }
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-03-11 03:07:31.095478523 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-03-11 03:06:22.666412036 +0000
@@ -30,6 +30,7 @@
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.texture.StatusEffectSpriteManager;
 import net.minecraft.client.util.ColorUtil;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.JumpingMount;
 import net.minecraft.entity.LivingEntity;
@@ -53,7 +54,6 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.Arm;
 import net.minecraft.util.ChatUtil;
 import net.minecraft.util.Formatting;
@@ -1035,7 +1035,7 @@
       this.client.getProfiler().push("selectedItemName");
       if (this.heldItemTooltipFade > 0 && !this.currentStack.isEmpty()) {
          MutableText lv = Text.empty().append(this.currentStack.getName()).formatted(this.currentStack.getRarity().formatting);
-         if (this.currentStack.m_pqplbapb(C_icwdaizi.CUSTOM_NAME)) {
+         if (this.currentStack.contains(DataComponentTypes.CUSTOM_NAME)) {
             lv.formatted(Formatting.ITALIC);
          }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java	2024-03-11 03:07:31.239480776 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java	2024-03-11 03:06:22.782413831 +0000
@@ -5,6 +5,7 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.ItemStack;
@@ -13,7 +14,6 @@
 import net.minecraft.screen.ScreenHandler;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.Identifier;
 import org.lwjgl.glfw.GLFW;
 
@@ -126,7 +126,7 @@
       Slot lv = this.handler.getSlot(0);
       if (lv.hasStack()) {
          String string2 = name;
-         if (!lv.getStack().m_pqplbapb(C_icwdaizi.CUSTOM_NAME) && name.equals(lv.getStack().getName().getString())) {
+         if (!lv.getStack().contains(DataComponentTypes.CUSTOM_NAME) && name.equals(lv.getStack().getName().getString())) {
             string2 = "";
          }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java	2024-03-11 03:07:31.191480025 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java	2024-03-11 03:06:22.738413150 +0000
@@ -20,6 +20,7 @@
 import net.minecraft.client.util.ChatNarratorManager;
 import net.minecraft.client.util.SelectionManager;
 import net.minecraft.client.util.math.Rect2i;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.network.packet.c2s.play.BookUpdateC2SPacket;
@@ -29,7 +30,6 @@
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_caqjiyos;
 import net.minecraft.unmapped.C_cihikqyk;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.ChatUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
@@ -214,7 +214,7 @@
       this.player = player;
       this.itemStack = itemStack;
       this.hand = hand;
-      C_caqjiyos lv = itemStack.m_dnvbhafp(C_icwdaizi.WRITABLE_BOOK_CONTENT);
+      C_caqjiyos lv = itemStack.get(DataComponentTypes.WRITABLE_BOOK_CONTENT);
       if (lv != null) {
          lv.m_ydlifigh(MinecraftClient.getInstance().shouldFilterText()).forEach(this.pages::add);
       }
@@ -370,7 +370,7 @@
     * @mapping {@literal named writeNbtData Lnet/minecraft/client/gui/screen/ingame/BookEditScreen;writeNbtData()V}
     */
    private void writeNbtData() {
-      this.itemStack.m_zakagwqa(C_icwdaizi.WRITABLE_BOOK_CONTENT, new C_caqjiyos(this.pages.stream().map(C_cihikqyk::m_pmbopdmp).toList()));
+      this.itemStack.m_zakagwqa(DataComponentTypes.WRITABLE_BOOK_CONTENT, new C_caqjiyos(this.pages.stream().map(C_cihikqyk::m_pmbopdmp).toList()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/BookScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/BookScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/BookScreen.java	2024-03-11 03:07:31.091478461 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BookScreen.java	2024-03-11 03:06:22.662411974 +0000
@@ -10,6 +10,7 @@
 import net.minecraft.client.gui.widget.button.ButtonWidget;
 import net.minecraft.client.gui.widget.button.PageTurnButtonWidget;
 import net.minecraft.client.util.ChatNarratorManager;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.ClickEvent;
 import net.minecraft.text.CommonTexts;
@@ -18,7 +19,6 @@
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_caqjiyos;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_xfpcozbo;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
@@ -419,11 +419,11 @@
       @Nullable
       public static BookScreen.Contents create(ItemStack stack) {
          boolean bl = MinecraftClient.getInstance().shouldFilterText();
-         C_xfpcozbo lv = stack.m_dnvbhafp(C_icwdaizi.WRITTEN_BOOK_CONTENT);
+         C_xfpcozbo lv = stack.get(DataComponentTypes.WRITTEN_BOOK_CONTENT);
          if (lv != null) {
             return new BookScreen.Contents(lv.m_hvzjkpvt(bl));
          } else {
-            C_caqjiyos lv2 = stack.m_dnvbhafp(C_icwdaizi.WRITABLE_BOOK_CONTENT);
+            C_caqjiyos lv2 = stack.get(DataComponentTypes.WRITABLE_BOOK_CONTENT);
             return lv2 != null ? new BookScreen.Contents(lv2.m_ydlifigh(bl).map(Text::literal).toList()) : null;
          }
       }

github-actions · 2024-03-11T03:07:34Z

View the diff here (2/3):

diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2024-03-11 03:07:31.011477209 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2024-03-11 03:06:22.574410613 +0000
@@ -3,6 +3,7 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.FilledMapItem;
 import net.minecraft.item.ItemStack;
@@ -11,7 +12,6 @@
 import net.minecraft.item.map.MapState;
 import net.minecraft.screen.CartographyTableScreenHandler;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 
@@ -83,7 +83,7 @@
       boolean bl2 = lv.isOf(Items.PAPER);
       boolean bl3 = lv.isOf(Items.GLASS_PANE);
       ItemStack lv2 = this.handler.getSlot(0).getStack();
-      MapId lv3 = lv2.m_dnvbhafp(C_icwdaizi.MAP_ID);
+      MapId lv3 = lv2.get(DataComponentTypes.MAP_ID);
       boolean bl4 = false;
       MapState lv4;
       if (lv3 != null) {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-03-11 03:07:31.027477460 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-03-11 03:06:22.598410984 +0000
@@ -22,6 +22,7 @@
 import net.minecraft.client.option.HotbarStorageEntry;
 import net.minecraft.client.search.SearchManager;
 import net.minecraft.client.search.Searcher;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
@@ -41,7 +42,6 @@
 import net.minecraft.screen.slot.SlotActionType;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Unit;
@@ -692,10 +692,10 @@
                for (int j = 0; j < 9; j++) {
                   if (j == i) {
                      ItemStack lv4 = new ItemStack(Items.PAPER);
-                     lv4.m_zakagwqa(C_icwdaizi.CREATIVE_SLOT_LOCK, Unit.INSTANCE);
+                     lv4.m_zakagwqa(DataComponentTypes.CREATIVE_SLOT_LOCK, Unit.INSTANCE);
                      Text lv5 = this.client.options.hotbarKeys[i].getKeyName();
                      Text lv6 = this.client.options.saveToolbarActivatorKey.getKeyName();
-                     lv4.m_zakagwqa(C_icwdaizi.CUSTOM_NAME, Text.translatable("inventory.hotbarInfo", lv6, lv5));
+                     lv4.m_zakagwqa(DataComponentTypes.CUSTOM_NAME, Text.translatable("inventory.hotbarInfo", lv6, lv5));
                      this.handler.itemList.add(lv4);
                   } else {
                      this.handler.itemList.add(ItemStack.EMPTY);
@@ -1350,7 +1350,7 @@
       public boolean canTakeItems(PlayerEntity player) {
          ItemStack lv = this.getStack();
          return super.canTakeItems(player) && !lv.isEmpty()
-            ? lv.isEnabled(player.getWorld().getEnabledFlags()) && !lv.m_pqplbapb(C_icwdaizi.CREATIVE_SLOT_LOCK)
+            ? lv.isEnabled(player.getWorld().getEnabledFlags()) && !lv.contains(DataComponentTypes.CREATIVE_SLOT_LOCK)
             : lv.isEmpty();
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/LoomScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/LoomScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/LoomScreen.java	2024-03-11 03:07:31.203480213 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/LoomScreen.java	2024-03-11 03:06:22.750413336 +0000
@@ -14,6 +14,7 @@
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.BannerItem;
 import net.minecraft.item.ItemStack;
@@ -22,7 +23,6 @@
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_wwbphpbp;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
@@ -413,13 +413,13 @@
       if (lv.isEmpty()) {
          this.bannerPatterns = null;
       } else {
-         this.bannerPatterns = lv.m_bcdzwasi(C_icwdaizi.BANNER_PATTERNS, C_wwbphpbp.f_hnnrbutf);
+         this.bannerPatterns = lv.getOrDefault(DataComponentTypes.BANNER_PATTERNS, C_wwbphpbp.f_hnnrbutf);
       }
 
       ItemStack lv2 = this.handler.getBannerSlot().getStack();
       ItemStack lv3 = this.handler.getDyeSlot().getStack();
       ItemStack lv4 = this.handler.getPatternSlot().getStack();
-      C_wwbphpbp lv5 = lv2.m_bcdzwasi(C_icwdaizi.BANNER_PATTERNS, C_wwbphpbp.f_hnnrbutf);
+      C_wwbphpbp lv5 = lv2.getOrDefault(DataComponentTypes.BANNER_PATTERNS, C_wwbphpbp.f_hnnrbutf);
       this.hasTooManyPatterns = lv5.layers().size() >= 6;
       if (this.hasTooManyPatterns) {
          this.bannerPatterns = null;
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-11 03:07:31.007477147 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-03-11 03:06:22.574410613 +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/item/ModelPredicateProviderRegistry.java namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java
--- namedTargetSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2024-03-11 03:07:31.167479649 +0000
+++ namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2024-03-11 03:06:22.718412841 +0000
@@ -6,6 +6,8 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.block.LightBlock;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.CustomModelDataComponent;
 import net.minecraft.data.client.ItemModelGenerator;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
@@ -19,10 +21,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.item.trim.ArmorTrimPermutation;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_lukqwasx;
 import net.minecraft.unmapped.C_mkgnfzob;
-import net.minecraft.unmapped.C_qtexserh;
 import net.minecraft.unmapped.C_snokizpi;
 import net.minecraft.unmapped.C_zkuaenoq;
 import net.minecraft.util.Arm;
@@ -133,11 +133,13 @@
                : 0.0F
       );
       UnclampedModelPredicateProvider lv = (stack, world, entity, seed) -> {
-         ArmorTrimPermutation lvx = stack.m_dnvbhafp(C_icwdaizi.TRIM);
+         ArmorTrimPermutation lvx = stack.get(DataComponentTypes.TRIM);
          return lvx != null ? lvx.getMaterial().value().itemModelIndex() : Float.NEGATIVE_INFINITY;
       };
       register(ItemModelGenerator.TRIM_TYPE, lv);
-      registerCustomModelData((stack, world, entity, seed) -> (float)stack.m_bcdzwasi(C_icwdaizi.CUSTOM_MODEL_DATA, C_qtexserh.f_uikorosh).value());
+      registerCustomModelData(
+         (stack, world, entity, seed) -> (float)stack.getOrDefault(DataComponentTypes.CUSTOM_MODEL_DATA, CustomModelDataComponent.DEFAULT).value()
+      );
       register(Items.BOW, new Identifier("pull"), (stack, world, entity, seed) -> {
          if (entity == null) {
             return 0.0F;
@@ -225,7 +227,7 @@
          }
       );
       register(Items.COMPASS, new Identifier("angle"), new C_mkgnfzob((world, stack, entity) -> {
-         C_zkuaenoq lvx = stack.m_dnvbhafp(C_icwdaizi.LODESTONE_TRACKER);
+         C_zkuaenoq lvx = stack.get(DataComponentTypes.LODESTONE_TRACKER);
          return lvx != null ? (GlobalPos)lvx.target().orElse(null) : CompassItem.getSpawnPosition(world);
       }));
       register(
@@ -249,7 +251,7 @@
       );
       register(Items.CROSSBOW, new Identifier("charged"), (stack, world, entity, seed) -> CrossbowItem.isCharged(stack) ? 1.0F : 0.0F);
       register(Items.CROSSBOW, new Identifier("firework"), (stack, world, entity, seed) -> {
-         C_lukqwasx lvx = stack.m_dnvbhafp(C_icwdaizi.CHARGED_PROJECTILES);
+         C_lukqwasx lvx = stack.get(DataComponentTypes.CHARGED_PROJECTILES);
          return lvx != null && lvx.m_xdmvwenh(Items.FIREWORK_ROCKET) ? 1.0F : 0.0F;
       });
       register(Items.ELYTRA, new Identifier("broken"), (stack, world, entity, seed) -> ElytraItem.isUsable(stack) ? 0.0F : 1.0F);
@@ -277,7 +279,7 @@
          (stack, world, entity, seed) -> entity != null && entity.isUsingItem() && entity.getActiveItem() == stack ? 1.0F : 0.0F
       );
       register(Items.LIGHT, new Identifier("level"), (stack, world, entity, seed) -> {
-         C_snokizpi lvx = stack.m_bcdzwasi(C_icwdaizi.BLOCK_STATE, C_snokizpi.f_fxqtkqgw);
+         C_snokizpi lvx = stack.getOrDefault(DataComponentTypes.BLOCK_STATE, C_snokizpi.f_fxqtkqgw);
          Integer integer = lvx.m_dkddhtzv(LightBlock.LEVEL_15);
          return integer != null ? (float)integer.intValue() / 16.0F : 1.0F;
       });
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-03-11 03:07:31.047477773 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-03-11 03:06:22.614411232 +0000
@@ -172,6 +172,7 @@
 import net.minecraft.client.util.telemetry.event.GameLoadTimesEvent;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.command.CommandHistory;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.datafixer.Schemas;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
@@ -212,7 +213,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.text.component.KeyBindTextResolver;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_tkoofxmf;
 import net.minecraft.unmapped.C_yfulyots;
 import net.minecraft.unmapped.C_zzkbopci;
@@ -3416,7 +3416,7 @@
       blockEntity.m_pcgjfrqh(lv);
       BlockItem.writeBlockEntityNbtToStack(stack, blockEntity.getType(), lv);
       stack.m_vchnqfkp(blockEntity.m_wiiwewxr());
-      stack.m_iaantrnc(C_icwdaizi.LORE, C_zzkbopci.f_blgpljun, f_ecdhbfvc, C_zzkbopci::m_ajemqxcn);
+      stack.m_iaantrnc(DataComponentTypes.LORE, C_zzkbopci.f_blgpljun, f_ecdhbfvc, C_zzkbopci::m_ajemqxcn);
    }
 
    /**
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-11 03:07:30.979476709 +0000
+++ namedSrc/net/minecraft/client/option/HotbarStorageEntry.java	2024-03-11 03:06:22.510409622 +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/client/render/entity/feature/ArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-03-11 03:07:31.011477209 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-03-11 03:06:22.578410675 +0000
@@ -15,6 +15,7 @@
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.ColorUtil;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ArmorItem;
@@ -23,7 +24,6 @@
 import net.minecraft.item.trim.ArmorTrimPermutation;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.tag.ItemTags;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_jlijuwug;
 import net.minecraft.util.Identifier;
 
@@ -107,7 +107,7 @@
                this.renderArmorParts(matrices, vertexConsumers, light, model, f, g, h, lv5.texture(bl));
             }
 
-            ArmorTrimPermutation lv6 = lv.m_dnvbhafp(C_icwdaizi.TRIM);
+            ArmorTrimPermutation lv6 = lv.get(DataComponentTypes.TRIM);
             if (lv6 != null) {
                this.renderArmor(lv2.getMaterial(), matrices, vertexConsumers, light, lv6, model, bl);
             }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.java	2024-03-11 03:07:31.055477898 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.java	2024-03-11 03:06:22.626411417 +0000
@@ -15,6 +15,7 @@
 import net.minecraft.client.render.item.HeldItemRenderer;
 import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LimbData;
 import net.minecraft.entity.LivingEntity;
@@ -24,7 +25,6 @@
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_iqgmrwok;
 import net.minecraft.util.math.Axis;
 
@@ -110,7 +110,7 @@
                matrices.translate(0.0F, 0.0625F, 0.0F);
             }
 
-            C_iqgmrwok lv3 = lv.m_dnvbhafp(C_icwdaizi.PROFILE);
+            C_iqgmrwok lv3 = lv.get(DataComponentTypes.PROFILE);
             matrices.translate(-0.5, 0.0, -0.5);
             SkullBlock.SkullType lv4 = ((AbstractSkullBlock)((BlockItem)lv2).getBlock()).getSkullType();
             AbstractSkullBlockEntityModel lv5 = (AbstractSkullBlockEntityModel)this.headModels.get(lv4);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/ItemFrameEntityRenderer.java namedSrc/net/minecraft/client/render/entity/ItemFrameEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/ItemFrameEntityRenderer.java	2024-03-11 03:07:31.063478023 +0000
+++ namedSrc/net/minecraft/client/render/entity/ItemFrameEntityRenderer.java	2024-03-11 03:06:22.634411541 +0000
@@ -14,6 +14,7 @@
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.client.util.ModelIdentifier;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.decoration.ItemFrameEntity;
 import net.minecraft.item.FilledMapItem;
@@ -22,7 +23,6 @@
 import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.Axis;
 import net.minecraft.util.math.BlockPos;
@@ -206,7 +206,7 @@
    protected boolean hasLabel(T arg) {
       if (MinecraftClient.isHudEnabled()
          && !arg.getHeldItemStack().isEmpty()
-         && arg.getHeldItemStack().m_pqplbapb(C_icwdaizi.CUSTOM_NAME)
+         && arg.getHeldItemStack().contains(DataComponentTypes.CUSTOM_NAME)
          && this.dispatcher.targetedEntity == arg) {
          double d = this.dispatcher.getSquaredDistanceToCamera(arg);
          float f = arg.isSneaky() ? 32.0F : 64.0F;
diff -bur namedTargetSrc/net/minecraft/client/render/item/BuiltinModelItemRenderer.java namedSrc/net/minecraft/client/render/item/BuiltinModelItemRenderer.java
--- namedTargetSrc/net/minecraft/client/render/item/BuiltinModelItemRenderer.java	2024-03-11 03:07:31.031477522 +0000
+++ namedSrc/net/minecraft/client/render/item/BuiltinModelItemRenderer.java	2024-03-11 03:06:22.598410984 +0000
@@ -39,13 +39,13 @@
 import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.resource.Material;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.resource.SynchronousResourceReloader;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_iqgmrwok;
 import net.minecraft.unmapped.C_wwbphpbp;
 import net.minecraft.util.DyeColor;
@@ -161,10 +161,10 @@
       if (lv instanceof BlockItem) {
          Block lv2 = ((BlockItem)lv).getBlock();
          if (lv2 instanceof AbstractSkullBlock lv3) {
-            C_iqgmrwok lv4 = stack.m_dnvbhafp(C_icwdaizi.PROFILE);
+            C_iqgmrwok lv4 = stack.get(DataComponentTypes.PROFILE);
             if (lv4 != null && !lv4.m_pnmdffid()) {
-               stack.m_kdmqavat(C_icwdaizi.PROFILE);
-               lv4.m_frcmbhum().thenAcceptAsync(arg2 -> stack.m_zakagwqa(C_icwdaizi.PROFILE, arg2), MinecraftClient.getInstance());
+               stack.m_kdmqavat(DataComponentTypes.PROFILE);
+               lv4.m_frcmbhum().thenAcceptAsync(arg2 -> stack.m_zakagwqa(DataComponentTypes.PROFILE, arg2), MinecraftClient.getInstance());
                lv4 = null;
             }
 
@@ -208,8 +208,8 @@
          }
       } else {
          if (stack.isOf(Items.SHIELD)) {
-            C_wwbphpbp lv19 = stack.m_bcdzwasi(C_icwdaizi.BANNER_PATTERNS, C_wwbphpbp.f_hnnrbutf);
-            DyeColor lv20 = stack.m_dnvbhafp(C_icwdaizi.BASE_COLOR);
+            C_wwbphpbp lv19 = stack.getOrDefault(DataComponentTypes.BANNER_PATTERNS, C_wwbphpbp.f_hnnrbutf);
+            DyeColor lv20 = stack.get(DataComponentTypes.BASE_COLOR);
             boolean bl = !lv19.layers().isEmpty() || lv20 != null;
             matrices.push();
             matrices.scale(1.0F, -1.0F, -1.0F);
diff -bur namedTargetSrc/net/minecraft/client/render/item/HeldItemRenderer.java namedSrc/net/minecraft/client/render/item/HeldItemRenderer.java
--- namedTargetSrc/net/minecraft/client/render/item/HeldItemRenderer.java	2024-03-11 03:07:31.067478085 +0000
+++ namedSrc/net/minecraft/client/render/item/HeldItemRenderer.java	2024-03-11 03:06:22.642411665 +0000
@@ -15,6 +15,7 @@
 import net.minecraft.client.render.entity.PlayerEntityRenderer;
 import net.minecraft.client.render.model.json.ModelTransformationMode;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.CrossbowItem;
 import net.minecraft.item.FilledMapItem;
@@ -22,7 +23,6 @@
 import net.minecraft.item.Items;
 import net.minecraft.item.map.MapId;
 import net.minecraft.item.map.MapState;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
 import net.minecraft.util.Identifier;
@@ -581,7 +581,7 @@
       matrices.scale(0.38F, 0.38F, 0.38F);
       matrices.translate(-0.5F, -0.5F, 0.0F);
       matrices.scale(0.0078125F, 0.0078125F, 0.0078125F);
-      MapId lv = stack.m_dnvbhafp(C_icwdaizi.MAP_ID);
+      MapId lv = stack.get(DataComponentTypes.MAP_ID);
       MapState lv2 = FilledMapItem.getMapState(lv, this.client.world);
       VertexConsumer lv3 = vertexConsumers.getBuffer(lv2 == null ? MAP_BACKGROUND : MAP_BACKGROUND_CHECKERBOARD);
       Matrix4f matrix4f = matrices.peek().getModel();
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-11 03:07:31.199480149 +0000
+++ namedSrc/net/minecraft/command/argument/ItemStackArgument.java	2024-03-11 03:06:22.746413274 +0000
@@ -6,6 +6,8 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentType;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtElement;
@@ -15,8 +17,6 @@
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_kouhnfig;
-import net.minecraft.unmapped.C_pscqxfcs;
 import net.minecraft.util.Identifier;
 
 /**
@@ -39,13 +39,13 @@
    /**
     * Mapping not found
     */
-   private final C_kouhnfig f_oggohapd;
+   private final DataComponentMap f_oggohapd;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_pkrtwper;<init>(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_kouhnfig;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/command/argument/ItemStackArgument;<init>(Lnet/minecraft/registry/Holder;Lnet/minecraft/unmapped/C_kouhnfig;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/command/argument/ItemStackArgument;<init>(Lnet/minecraft/registry/Holder;Lnet/minecraft/component/DataComponentMap;)V}
     */
-   public ItemStackArgument(Holder<Item> item, C_kouhnfig arg2) {
+   public ItemStackArgument(Holder<Item> item, DataComponentMap arg2) {
       this.item = item;
       this.f_oggohapd = arg2;
    }
@@ -92,11 +92,11 @@
     * Mapping not found
     */
    private String m_wxinkgmq(HolderLookup.Provider arg) {
-      DynamicOps<NbtElement> dynamicOps = arg.m_uwaazyzq(NbtOps.INSTANCE);
-      return (String)this.f_oggohapd.m_qpbbhvpw().flatMap(argx -> {
-         C_pscqxfcs<?> lv = argx.type();
+      DynamicOps<NbtElement> dynamicOps = arg.createSerializationContext(NbtOps.INSTANCE);
+      return (String)this.f_oggohapd.stream().flatMap(argx -> {
+         DataComponentType<?> lv = argx.type();
          Identifier lv2 = Registries.DATA_COMPONENT_TYPE.getId(lv);
-         Optional<NbtElement> optional = argx.m_fhpcixsw(dynamicOps).result();
+         Optional<NbtElement> optional = argx.encodeValue(dynamicOps).result();
          return lv2 != null && !optional.isEmpty() ? Stream.of(lv2.toString() + "=" + optional.get()) : Stream.empty();
       }).collect(Collectors.joining(String.valueOf(',')));
    }
diff -bur namedTargetSrc/net/minecraft/command/argument/ItemStringReader.java namedSrc/net/minecraft/command/argument/ItemStringReader.java
--- namedTargetSrc/net/minecraft/command/argument/ItemStringReader.java	2024-03-11 03:07:31.191480025 +0000
+++ namedSrc/net/minecraft/command/argument/ItemStringReader.java	2024-03-11 03:06:22.738413150 +0000
@@ -6,15 +6,15 @@
 import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentType;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.Item;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.HolderLookup;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.unmapped.C_ppnqjqhp;
-import net.minecraft.unmapped.C_pscqxfcs;
 import org.apache.commons.lang3.mutable.MutableObject;
 
 /**
@@ -40,7 +40,7 @@
     */
    public ItemStringReader.ItemResult consume(StringReader reader) throws CommandSyntaxException {
       final MutableObject<Holder<Item>> mutableObject = new MutableObject<>();
-      final C_kouhnfig.C_vfzyoahz lv = C_kouhnfig.m_invvxtoq();
+      final DataComponentMap.Builder lv = DataComponentMap.builder();
       this.f_vshcqgzl.m_uaepmshk(reader, new C_ppnqjqhp.C_tbzwemjf() {
          /**
           * Mapping not found
@@ -54,8 +54,8 @@
           * Mapping not found
           */
          @Override
-         public <T> void m_gsmlqrni(C_pscqxfcs<T> arg, T object) {
-            lv.m_zuepxtcm(arg, object);
+         public <T> void m_gsmlqrni(DataComponentType<T> arg, T object) {
+            lv.put(arg, object);
          }
 
          /**
@@ -63,10 +63,10 @@
           */
          @Override
          public void m_uucqbkkx(NbtCompound arg) {
-            lv.m_zuepxtcm(C_icwdaizi.CUSTOM_DATA, C_incrreuu.m_rqhxtept(arg));
+            lv.put(DataComponentTypes.CUSTOM_DATA, C_incrreuu.m_rqhxtept(arg));
          }
       });
-      return new ItemStringReader.ItemResult((Holder<Item>)Objects.requireNonNull(mutableObject.getValue(), "Parser gave no item"), lv.m_ilbrroua());
+      return new ItemStringReader.ItemResult((Holder<Item>)Objects.requireNonNull(mutableObject.getValue(), "Parser gave no item"), lv.build());
    }
 
    /**
@@ -81,6 +81,6 @@
     * @mapping {@literal hashed net/minecraft/unmapped/C_aggscjva$C_rktfpfda}
     * @mapping {@literal named net/minecraft/command/argument/ItemStringReader$ItemResult}
     */
-   public static record ItemResult(Holder<Item> item, C_kouhnfig components) {
+   public static record ItemResult(Holder<Item> item, DataComponentMap components) {
    }
 }
Only in namedSrc/net/minecraft: component
diff -bur namedTargetSrc/net/minecraft/data/DataProvider.java namedSrc/net/minecraft/data/DataProvider.java
--- namedTargetSrc/net/minecraft/data/DataProvider.java	2024-03-11 03:07:31.071478148 +0000
+++ namedSrc/net/minecraft/data/DataProvider.java	2024-03-11 03:06:22.642411665 +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-11 03:07:30.975476646 +0000
+++ namedSrc/net/minecraft/data/report/BiomeParametersProvider.java	2024-03-11 03:06:22.502409498 +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-11 03:07:31.031477522 +0000
+++ namedSrc/net/minecraft/data/report/BlockListProvider.java	2024-03-11 03:06:22.598410984 +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-11 03:07:31.235480713 +0000
+++ namedSrc/net/minecraft/data/report/RegistriesDataPackProvider.java	2024-03-11 03:06:22.778413769 +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/data/server/advancement/HusbandryAdvancementTabGenerator.java namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java
--- namedTargetSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2024-03-11 03:07:31.027477460 +0000
+++ namedSrc/net/minecraft/data/server/advancement/HusbandryAdvancementTabGenerator.java	2024-03-11 03:06:22.594410922 +0000
@@ -355,8 +355,7 @@
          .putCriteria(
             "wax_on",
             ItemUsedOnLocationCriterionTrigger.Conditions.createUseOnBlock(
-               LocationPredicate.Builder.create()
-                  .block(BlockPredicate.Builder.create().m_nypiocvl(((BiMap)HoneycombItem.UNWAXED_TO_WAXED_BLOCKS.get()).keySet())),
+               LocationPredicate.Builder.create().block(BlockPredicate.Builder.create().blocks(((BiMap)HoneycombItem.UNWAXED_TO_WAXED_BLOCKS.get()).keySet())),
                ItemPredicate.Builder.create().items(Items.HONEYCOMB)
             )
          )
@@ -376,8 +375,7 @@
          .putCriteria(
             "wax_off",
             ItemUsedOnLocationCriterionTrigger.Conditions.createUseOnBlock(
-               LocationPredicate.Builder.create()
-                  .block(BlockPredicate.Builder.create().m_nypiocvl(((BiMap)HoneycombItem.WAXED_TO_UNWAXED_BLOCKS.get()).keySet())),
+               LocationPredicate.Builder.create().block(BlockPredicate.Builder.create().blocks(((BiMap)HoneycombItem.WAXED_TO_UNWAXED_BLOCKS.get()).keySet())),
                ItemPredicate.Builder.create().items(AXES)
             )
          )
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-03-11 03:07:30.983476771 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/BlockLootTableGenerator.java	2024-03-11 03:06:22.518409747 +0000
@@ -23,6 +23,7 @@
 import net.minecraft.block.TallPlantBlock;
 import net.minecraft.block.enums.DoubleBlockHalf;
 import net.minecraft.block.enums.SlabType;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
 import net.minecraft.item.Item;
@@ -62,7 +63,6 @@
 import net.minecraft.registry.HolderLookup;
 import net.minecraft.registry.Registries;
 import net.minecraft.state.property.Property;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_mbgfajkg;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.StringIdentifiable;
@@ -314,7 +314,7 @@
                drop,
                LootPool.builder()
                   .rolls(ConstantLootNumberProvider.create(1.0F))
-                  .with(ItemEntry.builder(drop).apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(C_icwdaizi.CUSTOM_NAME)))
+                  .with(ItemEntry.builder(drop).apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.CUSTOM_NAME)))
             )
          );
    }
@@ -334,10 +334,10 @@
                      ItemEntry.builder(drop)
                         .apply(
                            C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY)
-                              .m_oxbhxepz(C_icwdaizi.CUSTOM_NAME)
-                              .m_oxbhxepz(C_icwdaizi.CONTAINER)
-                              .m_oxbhxepz(C_icwdaizi.LOCK)
-                              .m_oxbhxepz(C_icwdaizi.CONTAINER_LOOT)
+                              .m_oxbhxepz(DataComponentTypes.CUSTOM_NAME)
+                              .m_oxbhxepz(DataComponentTypes.CONTAINER)
+                              .m_oxbhxepz(DataComponentTypes.LOCK)
+                              .m_oxbhxepz(DataComponentTypes.CONTAINER_LOOT)
                         )
                   )
             )
@@ -406,7 +406,9 @@
                   .with(
                      ItemEntry.builder(drop)
                         .apply(
-                           C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(C_icwdaizi.CUSTOM_NAME).m_oxbhxepz(C_icwdaizi.BANNER_PATTERNS)
+                           C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY)
+                              .m_oxbhxepz(DataComponentTypes.CUSTOM_NAME)
+                              .m_oxbhxepz(DataComponentTypes.BANNER_PATTERNS)
                         )
                   )
             )
@@ -425,7 +427,7 @@
                .rolls(ConstantLootNumberProvider.create(1.0F))
                .with(
                   ItemEntry.builder(drop)
-                     .apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(C_icwdaizi.BEES))
+                     .apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.BEES))
                      .apply(CopyStateFunction.getBuilder(drop).addProperty(BeehiveBlock.HONEY_LEVEL))
                )
          );
@@ -443,7 +445,7 @@
                .with(
                   ItemEntry.builder(drop)
                      .conditionally(WITH_SILK_TOUCH)
-                     .apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(C_icwdaizi.BEES))
+                     .apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.BEES))
                      .apply(CopyStateFunction.getBuilder(drop).addProperty(BeehiveBlock.HONEY_LEVEL))
                      .alternatively(ItemEntry.builder(drop))
                )
diff -bur namedTargetSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java namedSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java
--- namedTargetSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java	2024-03-11 03:07:31.155479462 +0000
+++ namedSrc/net/minecraft/data/server/loot_table/VanillaBlockLootTableGenerator.java	2024-03-11 03:06:22.710412717 +0000
@@ -24,6 +24,7 @@
 import net.minecraft.block.TntBlock;
 import net.minecraft.block.enums.BedPart;
 import net.minecraft.block.enums.DoubleBlockHalf;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.feature_flags.FeatureFlags;
 import net.minecraft.item.Item;
@@ -52,7 +53,6 @@
 import net.minecraft.predicate.StatePredicate;
 import net.minecraft.predicate.item.ItemPredicate;
 import net.minecraft.registry.tag.ItemTags;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_mbgfajkg;
 
 /**
@@ -1001,9 +1001,9 @@
                            ItemEntry.builder(block)
                               .apply(
                                  C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY)
-                                    .m_oxbhxepz(C_icwdaizi.PROFILE)
-                                    .m_oxbhxepz(C_icwdaizi.NOTE_BLOCK_SOUND)
-                                    .m_oxbhxepz(C_icwdaizi.CUSTOM_NAME)
+                                    .m_oxbhxepz(DataComponentTypes.PROFILE)
+                                    .m_oxbhxepz(DataComponentTypes.NOTE_BLOCK_SOUND)
+                                    .m_oxbhxepz(DataComponentTypes.CUSTOM_NAME)
                               )
                         )
                   )
@@ -1467,7 +1467,7 @@
                         BlockStatePropertyLootCondition.builder(pot).properties(StatePredicate.Builder.create().exactMatch(DecoratedPotBlock.CRACKED, true))
                      )
                      .alternatively(
-                        ItemEntry.builder(pot).apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(C_icwdaizi.POT_DECORATIONS))
+                        ItemEntry.builder(pot).apply(C_mbgfajkg.m_tzmfkrqo(C_mbgfajkg.C_zcqyfuyv.BLOCK_ENTITY).m_oxbhxepz(DataComponentTypes.POT_DECORATIONS))
                      )
                )
          );
diff -bur namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java namedSrc/net/minecraft/enchantment/EnchantmentHelper.java
--- namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-03-11 03:07:31.159479524 +0000
+++ namedSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-03-11 03:06:22.714412779 +0000
@@ -7,6 +7,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
+import net.minecraft.component.DataComponentType;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.ItemEnchantmentsComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
@@ -18,9 +21,6 @@
 import net.minecraft.item.Items;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.Registries;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_pscqxfcs;
-import net.minecraft.unmapped.C_qlclfxvn;
 import net.minecraft.util.Util;
 import net.minecraft.util.collection.Weighting;
 import net.minecraft.util.math.MathHelper;
@@ -47,23 +47,23 @@
     * @mapping {@literal named getLevel Lnet/minecraft/enchantment/EnchantmentHelper;getLevel(Lnet/minecraft/enchantment/Enchantment;Lnet/minecraft/item/ItemStack;)I}
     */
    public static int getLevel(Enchantment enchantment, ItemStack stack) {
-      C_qlclfxvn lv = stack.m_bcdzwasi(C_icwdaizi.ENCHANTMENTS, C_qlclfxvn.f_osezxuts);
-      return lv.m_ugcgsgdf(enchantment);
+      ItemEnchantmentsComponent lv = stack.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
+      return lv.getLevel(enchantment);
    }
 
    /**
     * @mapping {@literal hashed m_iefpfmdo Lnet/minecraft/unmapped/C_jakrppis;m_iefpfmdo(Lnet/minecraft/unmapped/C_sddaxwyk;Ljava/util/function/Consumer;)Lnet/minecraft/unmapped/C_qlclfxvn;}
-    * @mapping {@literal named m_iefpfmdo Lnet/minecraft/enchantment/EnchantmentHelper;m_iefpfmdo(Lnet/minecraft/item/ItemStack;Ljava/util/function/Consumer;)Lnet/minecraft/unmapped/C_qlclfxvn;}
+    * @mapping {@literal named m_iefpfmdo Lnet/minecraft/enchantment/EnchantmentHelper;m_iefpfmdo(Lnet/minecraft/item/ItemStack;Ljava/util/function/Consumer;)Lnet/minecraft/component/type/ItemEnchantmentsComponent;}
     */
-   public static C_qlclfxvn m_iefpfmdo(ItemStack stack, java.util.function.Consumer<C_qlclfxvn.C_vbojeisc> consumer) {
-      C_pscqxfcs<C_qlclfxvn> lv = m_fbcdwuju(stack);
-      C_qlclfxvn lv2 = stack.m_dnvbhafp(lv);
+   public static ItemEnchantmentsComponent m_iefpfmdo(ItemStack stack, java.util.function.Consumer<ItemEnchantmentsComponent.Builder> consumer) {
+      DataComponentType<ItemEnchantmentsComponent> lv = m_fbcdwuju(stack);
+      ItemEnchantmentsComponent lv2 = stack.get(lv);
       if (lv2 == null) {
-         return C_qlclfxvn.f_osezxuts;
+         return ItemEnchantmentsComponent.DEFAULT;
       } else {
-         C_qlclfxvn.C_vbojeisc lv3 = new C_qlclfxvn.C_vbojeisc(lv2);
+         ItemEnchantmentsComponent.Builder lv3 = new ItemEnchantmentsComponent.Builder(lv2);
          consumer.accept(lv3);
-         C_qlclfxvn lv4 = lv3.m_gmievggf();
+         ItemEnchantmentsComponent lv4 = lv3.build();
          stack.m_zakagwqa(lv, lv4);
          return lv4;
       }
@@ -74,7 +74,7 @@
     * @mapping {@literal named m_mimuzvcl Lnet/minecraft/enchantment/EnchantmentHelper;m_mimuzvcl(Lnet/minecraft/item/ItemStack;)Z}
     */
    public static boolean m_mimuzvcl(ItemStack stack) {
-      return stack.m_pqplbapb(m_fbcdwuju(stack));
+      return stack.contains(m_fbcdwuju(stack));
    }
 
    /**
@@ -84,26 +84,26 @@
     * stored enchantments than regular enchantments.
     * 
     * @mapping {@literal hashed m_ybhxtwqv Lnet/minecraft/unmapped/C_jakrppis;m_ybhxtwqv(Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_qlclfxvn;)V}
-    * @mapping {@literal named set Lnet/minecraft/enchantment/EnchantmentHelper;set(Lnet/minecraft/item/ItemStack;Lnet/minecraft/unmapped/C_qlclfxvn;)V}
+    * @mapping {@literal named set Lnet/minecraft/enchantment/EnchantmentHelper;set(Lnet/minecraft/item/ItemStack;Lnet/minecraft/component/type/ItemEnchantmentsComponent;)V}
     */
-   public static void set(ItemStack stack, C_qlclfxvn arg2) {
-      stack.m_zakagwqa(m_fbcdwuju(stack), arg2);
+   public static void set(ItemStack stack, ItemEnchantmentsComponent value) {
+      stack.m_zakagwqa(m_fbcdwuju(stack), value);
    }
 
    /**
     * @mapping {@literal hashed m_uyoiclvv Lnet/minecraft/unmapped/C_jakrppis;m_uyoiclvv(Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_qlclfxvn;}
-    * @mapping {@literal named m_uyoiclvv Lnet/minecraft/enchantment/EnchantmentHelper;m_uyoiclvv(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/unmapped/C_qlclfxvn;}
+    * @mapping {@literal named m_uyoiclvv Lnet/minecraft/enchantment/EnchantmentHelper;m_uyoiclvv(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/component/type/ItemEnchantmentsComponent;}
     */
-   public static C_qlclfxvn m_uyoiclvv(ItemStack stack) {
-      return stack.m_bcdzwasi(m_fbcdwuju(stack), C_qlclfxvn.f_osezxuts);
+   public static ItemEnchantmentsComponent m_uyoiclvv(ItemStack stack) {
+      return stack.getOrDefault(m_fbcdwuju(stack), ItemEnchantmentsComponent.DEFAULT);
    }
 
    /**
     * @mapping {@literal hashed m_fbcdwuju Lnet/minecraft/unmapped/C_jakrppis;m_fbcdwuju(Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_pscqxfcs;}
-    * @mapping {@literal named m_fbcdwuju Lnet/minecraft/enchantment/EnchantmentHelper;m_fbcdwuju(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/unmapped/C_pscqxfcs;}
+    * @mapping {@literal named m_fbcdwuju Lnet/minecraft/enchantment/EnchantmentHelper;m_fbcdwuju(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/component/DataComponentType;}
     */
-   private static C_pscqxfcs<C_qlclfxvn> m_fbcdwuju(ItemStack stack) {
-      return stack.isOf(Items.ENCHANTED_BOOK) ? C_icwdaizi.STORED_ENCHANTMENTS : C_icwdaizi.ENCHANTMENTS;
+   private static DataComponentType<ItemEnchantmentsComponent> m_fbcdwuju(ItemStack stack) {
+      return stack.isOf(Items.ENCHANTED_BOOK) ? DataComponentTypes.STORED_ENCHANTMENTS : DataComponentTypes.ENCHANTMENTS;
    }
 
    /**
@@ -111,8 +111,8 @@
     * @mapping {@literal named m_koeurtnx Lnet/minecraft/enchantment/EnchantmentHelper;m_koeurtnx(Lnet/minecraft/item/ItemStack;)Z}
     */
    public static boolean m_koeurtnx(ItemStack stack) {
-      return !stack.m_bcdzwasi(C_icwdaizi.ENCHANTMENTS, C_qlclfxvn.f_osezxuts).m_gpefdzxc()
-         || !stack.m_bcdzwasi(C_icwdaizi.STORED_ENCHANTMENTS, C_qlclfxvn.f_osezxuts).m_gpefdzxc();
+      return !stack.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT).isEmpty()
+         || !stack.getOrDefault(DataComponentTypes.STORED_ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT).isEmpty();
    }
 
    /**
@@ -120,9 +120,9 @@
     * @mapping {@literal named forEachEnchantment Lnet/minecraft/enchantment/EnchantmentHelper;forEachEnchantment(Lnet/minecraft/enchantment/EnchantmentHelper$Consumer;Lnet/minecraft/item/ItemStack;)V}
     */
    private static void forEachEnchantment(EnchantmentHelper.Consumer consumer, ItemStack stack) {
-      C_qlclfxvn lv = stack.m_bcdzwasi(C_icwdaizi.ENCHANTMENTS, C_qlclfxvn.f_osezxuts);
+      ItemEnchantmentsComponent lv = stack.getOrDefault(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
 
-      for (Entry<Holder<Enchantment>> entry : lv.m_szyctegw()) {
+      for (Entry<Holder<Enchantment>> entry : lv.getEnchantmentEntries()) {
          consumer.accept((Enchantment)((Holder)entry.getKey()).value(), entry.getIntValue());
       }
    }
diff -bur namedTargetSrc/net/minecraft/enchantment/UnbreakingEnchantment.java namedSrc/net/minecraft/enchantment/UnbreakingEnchantment.java
--- namedTargetSrc/net/minecraft/enchantment/UnbreakingEnchantment.java	2024-03-11 03:07:31.263481151 +0000
+++ namedSrc/net/minecraft/enchantment/UnbreakingEnchantment.java	2024-03-11 03:06:22.802414140 +0000
@@ -1,10 +1,10 @@
 package net.minecraft.enchantment;
 
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.tag.ItemTags;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.random.RandomGenerator;
 
 /**
@@ -49,7 +49,7 @@
     */
    @Override
    public boolean isAcceptableItem(ItemStack stack) {
-      return stack.m_pqplbapb(C_icwdaizi.UNBREAKABLE) ? false : super.isAcceptableItem(stack);
+      return stack.contains(DataComponentTypes.UNBREAKABLE) ? false : super.isAcceptableItem(stack);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java namedSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java	2024-03-11 03:07:31.015477271 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/CelebrateRaidWinTask.java	2024-03-11 03:06:22.582410737 +0000
@@ -3,6 +3,7 @@
 import com.google.common.collect.ImmutableMap;
 import it.unimi.dsi.fastutil.ints.IntList;
 import java.util.List;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.passive.VillagerEntity;
 import net.minecraft.entity.projectile.FireworkRocketEntity;
 import net.minecraft.item.ItemStack;
@@ -10,7 +11,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.unmapped.C_gzacfpmb;
 import net.minecraft.unmapped.C_ibwugxba;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.BlockPos;
@@ -91,7 +91,7 @@
    private ItemStack createFirework(DyeColor color, int flight) {
       ItemStack lv = new ItemStack(Items.FIREWORK_ROCKET);
       lv.m_zakagwqa(
-         C_icwdaizi.FIREWORKS,
+         DataComponentTypes.FIREWORKS,
          new C_gzacfpmb((byte)flight, List.of(new C_ibwugxba(C_ibwugxba.C_zzjguyly.BURST, IntList.of(color.getFireworkColor()), IntList.of(), false, false)))
       );
       return lv;
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.java namedSrc/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.java	2024-03-11 03:07:31.091478461 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/CrossbowAttackTask.java	2024-03-11 03:06:22.662411974 +0000
@@ -1,6 +1,7 @@
 package net.minecraft.entity.ai.brain.task;
 
 import com.google.common.collect.ImmutableMap;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.CrossbowUser;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.brain.EntityLookTarget;
@@ -12,7 +13,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_lukqwasx;
 
 /**
@@ -81,7 +81,7 @@
 
       if (arg2.isHolding(Items.CROSSBOW)) {
          arg2.setCharging(false);
-         arg2.getActiveItem().m_zakagwqa(C_icwdaizi.CHARGED_PROJECTILES, C_lukqwasx.f_rwwhxkdd);
+         arg2.getActiveItem().m_zakagwqa(DataComponentTypes.CHARGED_PROJECTILES, C_lukqwasx.f_rwwhxkdd);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/CrossbowAttackGoal.java namedSrc/net/minecraft/entity/ai/goal/CrossbowAttackGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/CrossbowAttackGoal.java	2024-03-11 03:07:31.091478461 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/CrossbowAttackGoal.java	2024-03-11 03:06:22.662411974 +0000
@@ -1,6 +1,7 @@
 package net.minecraft.entity.ai.goal;
 
 import java.util.EnumSet;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.CrossbowUser;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.ai.RangedAttackMob;
@@ -9,7 +10,6 @@
 import net.minecraft.item.CrossbowItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_lukqwasx;
 import net.minecraft.util.TimeHelper;
 import net.minecraft.util.math.int_provider.UniformIntProvider;
@@ -115,7 +115,7 @@
       if (this.actor.isUsingItem()) {
          this.actor.clearActiveItem();
          this.actor.setCharging(false);
-         this.actor.getActiveItem().m_zakagwqa(C_icwdaizi.CHARGED_PROJECTILES, C_lukqwasx.f_rwwhxkdd);
+         this.actor.getActiveItem().m_zakagwqa(DataComponentTypes.CHARGED_PROJECTILES, C_lukqwasx.f_rwwhxkdd);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java namedSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java	2024-03-11 03:07:31.259481088 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java	2024-03-11 03:06:22.798414078 +0000
@@ -1,5 +1,7 @@
 package net.minecraft.entity.ai.goal;
 
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.ItemEnchantmentsComponent;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
@@ -11,8 +13,6 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_qlclfxvn;
 import net.minecraft.world.LocalDifficulty;
 import org.jetbrains.annotations.Nullable;
 
@@ -143,7 +143,7 @@
     * @mapping {@literal named removeEnchantments Lnet/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal;removeEnchantments(Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;}
     */
    private ItemStack removeEnchantments(ItemStack stack) {
-      stack.m_zakagwqa(C_icwdaizi.ENCHANTMENTS, C_qlclfxvn.f_osezxuts);
+      stack.m_zakagwqa(DataComponentTypes.ENCHANTMENTS, ItemEnchantmentsComponent.DEFAULT);
       return stack;
    }
 }
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-11 03:07:31.075478210 +0000
+++ namedSrc/net/minecraft/entity/attribute/EntityAttributeModifier.java	2024-03-11 03:06:22.650411789 +0000
@@ -29,29 +29,32 @@
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bfacrmpa Lnet/minecraft/unmapped/C_hdbqsqsm;f_bfacrmpa:Lcom/mojang/serialization/MapCodec;}
+    * @mapping {@literal named MAP_CODEC Lnet/minecraft/entity/attribute/EntityAttributeModifier;MAP_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   public static final MapCodec<EntityAttributeModifier> f_bfacrmpa = RecordCodecBuilder.mapCodec(
+   public static final MapCodec<EntityAttributeModifier> MAP_CODEC = RecordCodecBuilder.mapCodec(
       instance -> instance.group(
                UuidUtil.INT_STREAM_CODEC.fieldOf("uuid").forGetter(EntityAttributeModifier::id),
-               Codec.STRING.fieldOf("name").forGetter(arg -> arg.name),
+               Codec.STRING.fieldOf("name").forGetter(modifier -> modifier.name),
                Codec.DOUBLE.fieldOf("amount").forGetter(EntityAttributeModifier::amount),
                EntityAttributeModifier.Operation.CODEC.fieldOf("operation").forGetter(EntityAttributeModifier::operation)
             )
             .apply(instance, EntityAttributeModifier::new)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_qcjtagbu Lnet/minecraft/unmapped/C_hdbqsqsm;f_qcjtagbu:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/entity/attribute/EntityAttributeModifier;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<EntityAttributeModifier> f_qcjtagbu = f_bfacrmpa.codec();
+   public static final Codec<EntityAttributeModifier> CODEC = MAP_CODEC.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,
-      arg -> arg.name,
+      modifier -> modifier.name,
       PacketCodecs.DOUBLE,
       EntityAttributeModifier::amount,
       EntityAttributeModifier.Operation.PACKET_CODEC,
@@ -88,7 +91,7 @@
    public static EntityAttributeModifier fromNbt(NbtCompound nbt) {
       try {
          UUID uUID = nbt.getUuid("UUID");
-         EntityAttributeModifier.Operation lv = (EntityAttributeModifier.Operation)EntityAttributeModifier.Operation.f_qrkmptcr.apply(nbt.getInt("Operation"));
+         EntityAttributeModifier.Operation lv = (EntityAttributeModifier.Operation)EntityAttributeModifier.Operation.BY_ID.apply(nbt.getInt("Operation"));
          return new EntityAttributeModifier(uUID, nbt.getString("Name"), nbt.getDouble("Amount"), lv);
       } catch (Exception var3) {
          LOGGER.warn("Unable to create attribute: {}", var3.getMessage());
@@ -136,17 +139,18 @@
       ADD_MULTIPLIED_TOTAL("add_multiplied_total", 2);
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_qrkmptcr Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;f_qrkmptcr:Ljava/util/function/IntFunction;}
+       * @mapping {@literal named BY_ID Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;BY_ID:Ljava/util/function/IntFunction;}
        */
-      public static final IntFunction<EntityAttributeModifier.Operation> f_qrkmptcr = IdListUtil.sortArray(
+      public static final IntFunction<EntityAttributeModifier.Operation> BY_ID = IdListUtil.sortArray(
          EntityAttributeModifier.Operation::getId, values(), IdListUtil.OutOfBoundsHandler.ZERO
       );
       /**
        * @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(
-         f_qrkmptcr, EntityAttributeModifier.Operation::getId
+      public static final PacketCodec<ByteBuf, EntityAttributeModifier.Operation> PACKET_CODEC = PacketCodecs.indexed(
+         BY_ID, EntityAttributeModifier.Operation::getId
       );
       /**
        * @mapping {@literal hashed f_wzjuqzpc Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;f_wzjuqzpc:Lcom/mojang/serialization/Codec;}
@@ -156,21 +160,23 @@
          EntityAttributeModifier.Operation::values
       );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ztrdibur Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;f_ztrdibur:Ljava/lang/String;}
+       * @mapping {@literal named name Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;name:Ljava/lang/String;}
        */
-      private final String f_ztrdibur;
+      private final String name;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_dqfeqgfg Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;f_dqfeqgfg:I}
+       * @mapping {@literal named id Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;id:I}
        */
-      private final int f_dqfeqgfg;
+      private final int id;
 
       /**
        * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;<init>(Ljava/lang/String;ILjava/lang/String;I)V}
        * @mapping {@literal named <init> Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;<init>(Ljava/lang/String;ILjava/lang/String;I)V}
        */
       private Operation(String name, int id) {
-         this.f_ztrdibur = name;
-         this.f_dqfeqgfg = id;
+         this.name = name;
+         this.id = id;
       }
 
       /**
@@ -178,7 +184,7 @@
        * @mapping {@literal named getId Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;getId()I}
        */
       public int getId() {
-         return this.f_dqfeqgfg;
+         return this.id;
       }
 
       /**
@@ -186,7 +192,7 @@
        */
       @Override
       public String asString() {
-         return this.f_ztrdibur;
+         return this.name;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/Bucketable.java namedSrc/net/minecraft/entity/Bucketable.java
--- namedTargetSrc/net/minecraft/entity/Bucketable.java	2024-03-11 03:07:31.143479274 +0000
+++ namedSrc/net/minecraft/entity/Bucketable.java	2024-03-11 03:06:22.694412469 +0000
@@ -2,6 +2,7 @@
 
 import java.util.Optional;
 import net.minecraft.advancement.criterion.Criteria;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.mob.MobEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -11,7 +12,6 @@
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -64,8 +64,8 @@
     */
    @Deprecated
    static void copyDataToStack(MobEntity entity, ItemStack stack) {
-      stack.m_zakagwqa(C_icwdaizi.CUSTOM_NAME, entity.getCustomName());
-      C_incrreuu.m_tloyyfvn(C_icwdaizi.BUCKET_ENTITY_DATA, stack, arg2 -> {
+      stack.m_zakagwqa(DataComponentTypes.CUSTOM_NAME, entity.getCustomName());
+      C_incrreuu.m_tloyyfvn(DataComponentTypes.BUCKET_ENTITY_DATA, stack, arg2 -> {
          if (entity.isAiDisabled()) {
             arg2.putBoolean("NoAI", entity.isAiDisabled());
          }
diff -bur namedTargetSrc/net/minecraft/entity/damage/DamageSource.java namedSrc/net/minecraft/entity/damage/DamageSource.java
--- namedTargetSrc/net/minecraft/entity/damage/DamageSource.java	2024-03-11 03:07:30.983476771 +0000
+++ namedSrc/net/minecraft/entity/damage/DamageSource.java	2024-03-11 03:06:22.518409747 +0000
@@ -1,5 +1,6 @@
 package net.minecraft.entity.damage;
 
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -8,7 +9,6 @@
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.math.Vec3d;
 import org.jetbrains.annotations.Nullable;
 
@@ -141,7 +141,7 @@
       } else {
          Text lv = this.attacker == null ? this.source.getDisplayName() : this.attacker.getDisplayName();
          ItemStack lv3 = this.attacker instanceof LivingEntity lv2 ? lv2.getMainHandStack() : ItemStack.EMPTY;
-         return !lv3.isEmpty() && lv3.m_pqplbapb(C_icwdaizi.CUSTOM_NAME)
+         return !lv3.isEmpty() && lv3.contains(DataComponentTypes.CUSTOM_NAME)
             ? Text.translatable(string + ".item", entity.getDisplayName(), lv, lv3.toHoverableText())
             : Text.translatable(string, entity.getDisplayName(), lv);
       }

github-actions · 2024-03-11T03:07:35Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/entity/damage/DamageTracker.java namedSrc/net/minecraft/entity/damage/DamageTracker.java
--- namedTargetSrc/net/minecraft/entity/damage/DamageTracker.java	2024-03-11 03:07:31.211480338 +0000
+++ namedSrc/net/minecraft/entity/damage/DamageTracker.java	2024-03-11 03:06:22.754413397 +0000
@@ -3,6 +3,7 @@
 import com.google.common.collect.Lists;
 import java.util.List;
 import java.util.Objects;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
@@ -12,7 +13,6 @@
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
 import net.minecraft.text.Texts;
-import net.minecraft.unmapped.C_icwdaizi;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -112,7 +112,7 @@
     */
    private Text m_lagkuzok(Entity arg, Text arg2, String string, String string2) {
       ItemStack lv2 = arg instanceof LivingEntity lv ? lv.getMainHandStack() : ItemStack.EMPTY;
-      return !lv2.isEmpty() && lv2.m_pqplbapb(C_icwdaizi.CUSTOM_NAME)
+      return !lv2.isEmpty() && lv2.contains(DataComponentTypes.CUSTOM_NAME)
          ? Text.translatable(string, this.entity.getDisplayName(), arg2, lv2.toHoverableText())
          : Text.translatable(string2, this.entity.getDisplayName(), arg2);
    }
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-11 03:07:30.987476834 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandler.java	2024-03-11 03:06:22.522409808 +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-11 03:07:31.139479212 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-03-11 03:06:22.690412407 +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/decoration/ArmorStandEntity.java namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-03-11 03:07:31.171479712 +0000
+++ namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-03-11 03:06:22.722412902 +0000
@@ -4,6 +4,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.piston.PistonBehavior;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityDimensions;
 import net.minecraft.entity.EntityPose;
@@ -32,7 +33,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
@@ -757,7 +757,7 @@
     */
    private void breakAndDropItem(DamageSource damageSource) {
       ItemStack lv = new ItemStack(Items.ARMOR_STAND);
-      lv.m_zakagwqa(C_icwdaizi.CUSTOM_NAME, this.getCustomName());
+      lv.m_zakagwqa(DataComponentTypes.CUSTOM_NAME, this.getCustomName());
       Block.dropStack(this.getWorld(), this.getBlockPos(), lv);
       this.onBreak(damageSource);
    }
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-03-11 03:07:31.055477898 +0000
+++ namedSrc/net/minecraft/entity/decoration/ItemFrameEntity.java	2024-03-11 03:06:22.626411417 +0000
@@ -4,6 +4,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.RedstoneDiodeBlock;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.MovementType;
@@ -26,7 +27,6 @@
 import net.minecraft.registry.tag.DamageTypeTags;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
@@ -364,7 +364,7 @@
     */
    @Nullable
    public MapId getMapId() {
-      return this.getHeldItemStack().m_dnvbhafp(C_icwdaizi.MAP_ID);
+      return this.getHeldItemStack().get(DataComponentTypes.MAP_ID);
    }
 
    /**
@@ -372,7 +372,7 @@
     * @mapping {@literal named hasMap Lnet/minecraft/entity/decoration/ItemFrameEntity;hasMap()Z}
     */
    public boolean hasMap() {
-      return this.getHeldItemStack().m_pqplbapb(C_icwdaizi.MAP_ID);
+      return this.getHeldItemStack().contains(DataComponentTypes.MAP_ID);
    }
 
    /**
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-11 03:07:31.163479587 +0000
+++ namedSrc/net/minecraft/entity/effect/StatusEffectInstance.java	2024-03-11 03:06:22.714412779 +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-11 03:07:31.027477460 +0000
+++ namedSrc/net/minecraft/entity/EntityPose.java	2024-03-11 03:06:22.594410922 +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/EntityType.java namedSrc/net/minecraft/entity/EntityType.java
--- namedTargetSrc/net/minecraft/entity/EntityType.java	2024-03-11 03:07:31.011477209 +0000
+++ namedSrc/net/minecraft/entity/EntityType.java	2024-03-11 03:06:22.574410613 +0000
@@ -12,6 +12,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.datafixer.TypeReferences;
 import net.minecraft.entity.ai.pathing.PathNodeMaker;
 import net.minecraft.entity.boss.WitherEntity;
@@ -147,7 +148,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_biqpbxns;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
 import net.minecraft.unmapped.C_pubtmkke;
 import net.minecraft.unmapped.C_uqkupzdc;
@@ -1678,7 +1678,7 @@
     * @mapping {@literal named appendCustomNameSpawnConfig Lnet/minecraft/entity/EntityType;appendCustomNameSpawnConfig(Ljava/util/function/Consumer;Lnet/minecraft/item/ItemStack;)Ljava/util/function/Consumer;}
     */
    public static <T extends Entity> Consumer<T> appendCustomNameSpawnConfig(Consumer<T> previous, ItemStack stack) {
-      Text lv = stack.m_dnvbhafp(C_icwdaizi.CUSTOM_NAME);
+      Text lv = stack.get(DataComponentTypes.CUSTOM_NAME);
       return lv != null ? previous.andThen(entity -> entity.setCustomName(lv)) : previous;
    }
 
@@ -1689,7 +1689,7 @@
    public static <T extends Entity> Consumer<T> appendCustomEntityStackSpawnConfig(
       Consumer<T> previous, ServerWorld world, ItemStack stack, @Nullable PlayerEntity player
    ) {
-      C_incrreuu lv = stack.m_bcdzwasi(C_icwdaizi.ENTITY_DATA, C_incrreuu.f_egifbhdk);
+      C_incrreuu lv = stack.getOrDefault(DataComponentTypes.ENTITY_DATA, C_incrreuu.f_egifbhdk);
       return !lv.m_fcottrvr() ? previous.andThen(entity -> loadFromEntityNbt(world, player, entity, lv)) : previous;
    }
 
Only in namedSrc/net/minecraft/entity: EquipmentSlotGroup.java
diff -bur namedTargetSrc/net/minecraft/entity/LivingEntity.java namedSrc/net/minecraft/entity/LivingEntity.java
--- namedTargetSrc/net/minecraft/entity/LivingEntity.java	2024-03-11 03:07:31.183479900 +0000
+++ namedSrc/net/minecraft/entity/LivingEntity.java	2024-03-11 03:06:22.734413088 +0000
@@ -3125,9 +3125,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xcvctlld Lnet/minecraft/unmapped/C_usxaxydn;m_xcvctlld(Lnet/minecraft/unmapped/C_yuycoehb;)Z}
+    * @mapping {@literal named m_xcvctlld Lnet/minecraft/entity/LivingEntity;m_xcvctlld(Lnet/minecraft/entity/EquipmentSlot;)Z}
     */
-   public boolean m_xcvctlld(EquipmentSlot arg) {
+   public boolean m_xcvctlld(EquipmentSlot slot) {
       return false;
    }
 
@@ -3146,7 +3147,7 @@
     * @mapping {@literal hashed m_kzhoqled Lnet/minecraft/unmapped/C_usxaxydn;m_kzhoqled(Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_sddaxwyk;)V}
     * @mapping {@literal named m_kzhoqled Lnet/minecraft/entity/LivingEntity;m_kzhoqled(Lnet/minecraft/entity/EquipmentSlot;Lnet/minecraft/item/ItemStack;)V}
     */
-   public abstract void m_kzhoqled(EquipmentSlot arg, ItemStack stack);
+   public abstract void m_kzhoqled(EquipmentSlot slot, ItemStack stack);
 
    /**
     * Mapping not found
diff -bur namedTargetSrc/net/minecraft/entity/mob/EndermanEntity.java namedSrc/net/minecraft/entity/mob/EndermanEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/EndermanEntity.java	2024-03-11 03:07:30.995476959 +0000
+++ namedSrc/net/minecraft/entity/mob/EndermanEntity.java	2024-03-11 03:06:22.558410365 +0000
@@ -7,6 +7,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
@@ -48,7 +49,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_hahxxnjs;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_xpqegwnr;
 import net.minecraft.util.TimeHelper;
 import net.minecraft.util.hit.BlockHitResult;
@@ -535,7 +535,7 @@
     */
    private boolean hurtWithWaterPotion(DamageSource source, PotionEntity potionEntity, float amount) {
       ItemStack lv = potionEntity.getStack();
-      C_xpqegwnr lv2 = lv.m_bcdzwasi(C_icwdaizi.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
+      C_xpqegwnr lv2 = lv.getOrDefault(DataComponentTypes.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
       return lv2.m_njngtrku(Potions.WATER) ? super.damage(source, amount) : false;
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/mob/MobEntity.java namedSrc/net/minecraft/entity/mob/MobEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/MobEntity.java	2024-03-11 03:07:31.147479337 +0000
+++ namedSrc/net/minecraft/entity/mob/MobEntity.java	2024-03-11 03:06:22.698412531 +0000
@@ -10,6 +10,9 @@
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Predicate;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.AttributeModifiersComponent;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityData;
@@ -62,10 +65,7 @@
 import net.minecraft.server.network.DebugInfoSender;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.unmapped.C_azfkqhlm;
 import net.minecraft.unmapped.C_hahxxnjs;
-import net.minecraft.unmapped.C_icwdaizi;
-import net.minecraft.unmapped.C_kouhnfig;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Arm;
 import net.minecraft.util.Hand;
@@ -1052,8 +1052,8 @@
     * @mapping {@literal named m_akuajlxu Lnet/minecraft/entity/mob/MobEntity;m_akuajlxu(Lnet/minecraft/item/ItemStack;)D}
     */
    private double m_akuajlxu(ItemStack stack) {
-      C_azfkqhlm lv = stack.m_bcdzwasi(C_icwdaizi.ATTRIBUTE_MODIFIERS, C_azfkqhlm.f_bnpkfncg);
-      return lv.m_addoqghi(this.getAttributeBaseValue(EntityAttributes.GENERIC_ATTACK_DAMAGE), EquipmentSlot.MAINHAND);
+      AttributeModifiersComponent lv = stack.getOrDefault(DataComponentTypes.ATTRIBUTE_MODIFIERS, AttributeModifiersComponent.DEFAULT);
+      return lv.compute(this.getAttributeBaseValue(EntityAttributes.GENERIC_ATTACK_DAMAGE), EquipmentSlot.MAINHAND);
    }
 
    /**
@@ -1069,9 +1069,9 @@
     * @mapping {@literal named m_lgazseuq Lnet/minecraft/entity/mob/MobEntity;m_lgazseuq(Lnet/minecraft/item/ItemStack;)Z}
     */
    private static boolean m_lgazseuq(ItemStack stack) {
-      C_kouhnfig lv = stack.m_eutadtlw();
-      int i = lv.m_ekwvemme();
-      return i > 1 || i == 1 && !lv.m_cqycvonb(C_icwdaizi.DAMAGE);
+      DataComponentMap lv = stack.getComponents();
+      int i = lv.size();
+      return i > 1 || i == 1 && !lv.contains(DataComponentTypes.DAMAGE);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/mob/WitchEntity.java namedSrc/net/minecraft/entity/mob/WitchEntity.java
--- namedTargetSrc/net/minecraft/entity/mob/WitchEntity.java	2024-03-11 03:07:31.123478961 +0000
+++ namedSrc/net/minecraft/entity/mob/WitchEntity.java	2024-03-11 03:06:22.674412160 +0000
@@ -1,6 +1,7 @@
 package net.minecraft.entity.mob;
 
 import java.util.UUID;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.EntityStatuses;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
@@ -36,7 +37,6 @@
 import net.minecraft.registry.tag.FluidTags;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_xpqegwnr;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
@@ -181,7 +181,7 @@
                this.setDrinking(false);
                ItemStack lv = this.getMainHandStack();
                this.m_kzhoqled(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
-               C_xpqegwnr lv2 = lv.m_dnvbhafp(C_icwdaizi.POTION_CONTENTS);
+               C_xpqegwnr lv2 = lv.get(DataComponentTypes.POTION_CONTENTS);
                if (lv.isOf(Items.POTION) && lv2 != null) {
                   lv2.m_rmuyvqjh(this::addStatusEffect);
                }
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-11 03:07:31.235480713 +0000
+++ namedSrc/net/minecraft/entity/mob/ZombieVillagerEntity.java	2024-03-11 03:06:22.778413769 +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/AllayEntity.java namedSrc/net/minecraft/entity/passive/AllayEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/AllayEntity.java	2024-03-11 03:07:31.243480838 +0000
+++ namedSrc/net/minecraft/entity/passive/AllayEntity.java	2024-03-11 03:06:22.786413893 +0000
@@ -9,6 +9,7 @@
 import java.util.function.BiConsumer;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityStatuses;
@@ -51,7 +52,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_xpqegwnr;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -563,8 +563,8 @@
     * Mapping not found
     */
    private boolean m_rajypowm(ItemStack arg, ItemStack arg2) {
-      C_xpqegwnr lv = arg.m_dnvbhafp(C_icwdaizi.POTION_CONTENTS);
-      C_xpqegwnr lv2 = arg2.m_dnvbhafp(C_icwdaizi.POTION_CONTENTS);
+      C_xpqegwnr lv = arg.get(DataComponentTypes.POTION_CONTENTS);
+      C_xpqegwnr lv2 = arg2.get(DataComponentTypes.POTION_CONTENTS);
       return !Objects.equals(lv, lv2);
    }
 
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-11 03:07:31.211480338 +0000
+++ namedSrc/net/minecraft/entity/passive/ArmadilloEntity.java	2024-03-11 03:06:22.758413459 +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/AxolotlEntity.java namedSrc/net/minecraft/entity/passive/AxolotlEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/AxolotlEntity.java	2024-03-11 03:07:31.007477147 +0000
+++ namedSrc/net/minecraft/entity/passive/AxolotlEntity.java	2024-03-11 03:06:22.570410551 +0000
@@ -8,6 +8,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.IntFunction;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.AngledModelEntity;
 import net.minecraft.entity.Bucketable;
 import net.minecraft.entity.Entity;
@@ -45,7 +46,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_hahxxnjs;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -547,7 +547,7 @@
    @Override
    public void copyDataToStack(ItemStack stack) {
       Bucketable.copyDataToStack(this, stack);
-      C_incrreuu.m_tloyyfvn(C_icwdaizi.BUCKET_ENTITY_DATA, stack, arg -> {
+      C_incrreuu.m_tloyyfvn(DataComponentTypes.BUCKET_ENTITY_DATA, stack, arg -> {
          arg.putInt("Variant", this.getVariant().id());
          arg.putInt("Age", this.getBreedingAge());
          Brain<?> lv = this.getBrain();
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-11 03:07:31.227480588 +0000
+++ namedSrc/net/minecraft/entity/passive/MerchantEntity.java	2024-03-11 03:06:22.770413645 +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/MooshroomEntity.java namedSrc/net/minecraft/entity/passive/MooshroomEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/MooshroomEntity.java	2024-03-11 03:07:30.983476771 +0000
+++ namedSrc/net/minecraft/entity/passive/MooshroomEntity.java	2024-03-11 03:06:22.518409747 +0000
@@ -4,6 +4,7 @@
 import java.util.UUID;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.LightningEntity;
@@ -29,7 +30,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_ceasgpks;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.StringIdentifiable;
@@ -130,7 +130,7 @@
          if (this.f_eliiipao != null) {
             bl = true;
             lv2 = new ItemStack(Items.SUSPICIOUS_STEW);
-            lv2.m_zakagwqa(C_icwdaizi.SUSPICIOUS_STEW_EFFECTS, this.f_eliiipao);
+            lv2.m_zakagwqa(DataComponentTypes.SUSPICIOUS_STEW_EFFECTS, this.f_eliiipao);
             this.f_eliiipao = null;
          } else {
             lv2 = new ItemStack(Items.MUSHROOM_STEW);
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-11 03:07:31.139479212 +0000
+++ namedSrc/net/minecraft/entity/passive/SnifferEntity.java	2024-03-11 03:06:22.690412407 +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/entity/passive/TadpoleEntity.java namedSrc/net/minecraft/entity/passive/TadpoleEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/TadpoleEntity.java	2024-03-11 03:07:31.099478586 +0000
+++ namedSrc/net/minecraft/entity/passive/TadpoleEntity.java	2024-03-11 03:06:22.670412098 +0000
@@ -3,6 +3,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.mojang.serialization.Dynamic;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Bucketable;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnReason;
@@ -27,7 +28,6 @@
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
@@ -257,7 +257,7 @@
    @Override
    public void copyDataToStack(ItemStack stack) {
       Bucketable.copyDataToStack(this, stack);
-      C_incrreuu.m_tloyyfvn(C_icwdaizi.BUCKET_ENTITY_DATA, stack, arg -> arg.putInt("Age", this.getTadpoleAge()));
+      C_incrreuu.m_tloyyfvn(DataComponentTypes.BUCKET_ENTITY_DATA, stack, arg -> arg.putInt("Age", this.getTadpoleAge()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/passive/TropicalFishEntity.java namedSrc/net/minecraft/entity/passive/TropicalFishEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/TropicalFishEntity.java	2024-03-11 03:07:31.179479837 +0000
+++ namedSrc/net/minecraft/entity/passive/TropicalFishEntity.java	2024-03-11 03:06:22.730413026 +0000
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.function.IntFunction;
 import net.minecraft.block.Blocks;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.EntityData;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.SpawnReason;
@@ -22,7 +23,6 @@
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.StringIdentifiable;
@@ -225,7 +225,7 @@
    @Override
    public void copyDataToStack(ItemStack stack) {
       super.copyDataToStack(stack);
-      C_incrreuu.m_tloyyfvn(C_icwdaizi.BUCKET_ENTITY_DATA, stack, arg -> arg.putInt("BucketVariantTag", this.getVariantId()));
+      C_incrreuu.m_tloyyfvn(DataComponentTypes.BUCKET_ENTITY_DATA, stack, arg -> arg.putInt("BucketVariantTag", this.getVariantId()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/player/PlayerInventory.java namedSrc/net/minecraft/entity/player/PlayerInventory.java
--- namedTargetSrc/net/minecraft/entity/player/PlayerInventory.java	2024-03-11 03:07:31.271481276 +0000
+++ namedSrc/net/minecraft/entity/player/PlayerInventory.java	2024-03-11 03:06:22.806414202 +0000
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.function.Predicate;
 import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.inventory.Inventories;
 import net.minecraft.inventory.Inventory;
 import net.minecraft.item.Item;
@@ -15,7 +16,6 @@
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.Nameable;
 import net.minecraft.util.collection.DefaultedList;
 import net.minecraft.util.crash.CrashCallable;
@@ -239,7 +239,7 @@
             && ItemStack.itemsAndComponentsMatch(stack, this.main.get(i))
             && !this.main.get(i).isDamaged()
             && !lv.hasEnchantments()
-            && !lv.m_pqplbapb(C_icwdaizi.CUSTOM_NAME)) {
+            && !lv.contains(DataComponentTypes.CUSTOM_NAME)) {
             return i;
          }
       }
diff -bur namedTargetSrc/net/minecraft/entity/projectile/ArrowEntity.java namedSrc/net/minecraft/entity/projectile/ArrowEntity.java
--- namedTargetSrc/net/minecraft/entity/projectile/ArrowEntity.java	2024-03-11 03:07:31.083478335 +0000
+++ namedSrc/net/minecraft/entity/projectile/ArrowEntity.java	2024-03-11 03:06:22.654411850 +0000
@@ -1,5 +1,6 @@
 package net.minecraft.entity.projectile;
 
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
@@ -12,7 +13,6 @@
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.potion.Potion;
 import net.minecraft.registry.Holder;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_xpqegwnr;
 import net.minecraft.world.World;
 
@@ -72,14 +72,15 @@
     * Mapping not found
     */
    private C_xpqegwnr m_iefuffrx() {
-      return this.m_wznrraqn().m_bcdzwasi(C_icwdaizi.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
+      return this.m_wznrraqn().getOrDefault(DataComponentTypes.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eiscdqiq Lnet/minecraft/unmapped/C_otvmxtwh;m_eiscdqiq(Lnet/minecraft/unmapped/C_xpqegwnr;)V}
+    * @mapping {@literal named m_eiscdqiq Lnet/minecraft/entity/projectile/ArrowEntity;m_eiscdqiq(Lnet/minecraft/unmapped/C_xpqegwnr;)V}
     */
-   private void m_eiscdqiq(C_xpqegwnr arg) {
-      this.m_wznrraqn().m_zakagwqa(C_icwdaizi.POTION_CONTENTS, arg);
+   private void m_eiscdqiq(C_xpqegwnr value) {
+      this.m_wznrraqn().m_zakagwqa(DataComponentTypes.POTION_CONTENTS, value);
       this.initColor();
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/projectile/FireworkRocketEntity.java namedSrc/net/minecraft/entity/projectile/FireworkRocketEntity.java
--- namedTargetSrc/net/minecraft/entity/projectile/FireworkRocketEntity.java	2024-03-11 03:07:31.271481276 +0000
+++ namedSrc/net/minecraft/entity/projectile/FireworkRocketEntity.java	2024-03-11 03:06:22.806414202 +0000
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.OptionalInt;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityStatuses;
 import net.minecraft.entity.EntityType;
@@ -20,7 +21,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.unmapped.C_gzacfpmb;
 import net.minecraft.unmapped.C_ibwugxba;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.EntityHitResult;
 import net.minecraft.util.hit.HitResult;
@@ -88,7 +88,7 @@
       this.setPosition(x, y, z);
       this.dataTracker.set(ITEM, stack.copy());
       int i = 1;
-      C_gzacfpmb lv = stack.m_dnvbhafp(C_icwdaizi.FIREWORKS);
+      C_gzacfpmb lv = stack.get(DataComponentTypes.FIREWORKS);
       if (lv != null) {
          i += lv.flightDuration();
       }
@@ -388,7 +388,7 @@
     */
    private List<C_ibwugxba> m_xvaoylqq() {
       ItemStack lv = this.dataTracker.get(ITEM);
-      C_gzacfpmb lv2 = lv.m_dnvbhafp(C_icwdaizi.FIREWORKS);
+      C_gzacfpmb lv2 = lv.get(DataComponentTypes.FIREWORKS);
       return lv2 != null ? lv2.explosions() : List.of();
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/projectile/PersistentProjectileEntity.java namedSrc/net/minecraft/entity/projectile/PersistentProjectileEntity.java
--- namedTargetSrc/net/minecraft/entity/projectile/PersistentProjectileEntity.java	2024-03-11 03:07:31.035477585 +0000
+++ namedSrc/net/minecraft/entity/projectile/PersistentProjectileEntity.java	2024-03-11 03:06:22.602411046 +0000
@@ -7,6 +7,7 @@
 import net.minecraft.advancement.criterion.Criteria;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
@@ -30,7 +31,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Unit;
 import net.minecraft.util.hit.BlockHitResult;
@@ -159,8 +159,8 @@
    protected PersistentProjectileEntity(EntityType<? extends PersistentProjectileEntity> arg, World world, ItemStack stack) {
       this(arg, world);
       this.stack = stack.copy();
-      this.setCustomName(stack.m_dnvbhafp(C_icwdaizi.CUSTOM_NAME));
-      Unit lv = stack.m_kdmqavat(C_icwdaizi.INTANGIBLE_PROJECTILE);
+      this.setCustomName(stack.get(DataComponentTypes.CUSTOM_NAME));
+      Unit lv = stack.m_kdmqavat(DataComponentTypes.INTANGIBLE_PROJECTILE);
       if (lv != null) {
          this.pickupType = PersistentProjectileEntity.PickupPermission.CREATIVE_ONLY;
       }
diff -bur namedTargetSrc/net/minecraft/entity/projectile/thrown/PotionEntity.java namedSrc/net/minecraft/entity/projectile/thrown/PotionEntity.java
--- namedTargetSrc/net/minecraft/entity/projectile/thrown/PotionEntity.java	2024-03-11 03:07:31.079478273 +0000
+++ namedSrc/net/minecraft/entity/projectile/thrown/PotionEntity.java	2024-03-11 03:06:22.658411912 +0000
@@ -5,6 +5,7 @@
 import net.minecraft.block.AbstractCandleBlock;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.CampfireBlock;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.AreaEffectCloudEntity;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
@@ -20,7 +21,6 @@
 import net.minecraft.potion.Potions;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.tag.BlockTags;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_xpqegwnr;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.hit.EntityHitResult;
@@ -104,7 +104,7 @@
          Direction lv2 = result.getSide();
          BlockPos lv3 = result.getBlockPos();
          BlockPos lv4 = lv3.offset(lv2);
-         C_xpqegwnr lv5 = lv.m_bcdzwasi(C_icwdaizi.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
+         C_xpqegwnr lv5 = lv.getOrDefault(DataComponentTypes.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
          if (lv5.m_njngtrku(Potions.WATER)) {
             this.extinguishFire(lv4);
             this.extinguishFire(lv4.offset(lv2.getOpposite()));
@@ -124,7 +124,7 @@
       super.onCollision(hitResult);
       if (!this.getWorld().isClient) {
          ItemStack lv = this.getStack();
-         C_xpqegwnr lv2 = lv.m_bcdzwasi(C_icwdaizi.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
+         C_xpqegwnr lv2 = lv.getOrDefault(DataComponentTypes.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
          if (lv2.m_njngtrku(Potions.WATER)) {
             this.applyWaterEffects();
          } else if (lv2.m_wiewnncq()) {
diff -bur namedTargetSrc/net/minecraft/inventory/ContainerLock.java namedSrc/net/minecraft/inventory/ContainerLock.java
--- namedTargetSrc/net/minecraft/inventory/ContainerLock.java	2024-03-11 03:07:31.251480963 +0000
+++ namedSrc/net/minecraft/inventory/ContainerLock.java	2024-03-11 03:06:22.790413954 +0000
@@ -1,11 +1,11 @@
 package net.minecraft.inventory;
 
 import com.mojang.serialization.Codec;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_jptzfwcb}
@@ -45,7 +45,7 @@
       if (this.key.isEmpty()) {
          return true;
       } else {
-         Text lv = stack.m_dnvbhafp(C_icwdaizi.CUSTOM_NAME);
+         Text lv = stack.get(DataComponentTypes.CUSTOM_NAME);
          return lv != null && this.key.equals(lv.getString());
       }
    }
Only in namedSrc/net/minecraft/item: AdventureModePredicate.java
diff -bur namedTargetSrc/net/minecraft/item/AnimalArmorItem.java namedSrc/net/minecraft/item/AnimalArmorItem.java
--- namedTargetSrc/net/minecraft/item/AnimalArmorItem.java	2024-03-11 03:07:31.159479524 +0000
+++ namedSrc/net/minecraft/item/AnimalArmorItem.java	2024-03-11 03:06:22.710412717 +0000
@@ -74,7 +74,7 @@
     * Mapping not found
     */
    @Override
-   public SoundEvent m_jcukmzxf() {
+   public SoundEvent getBreakSound() {
       return this.type.f_vzmqsxzm;
    }
 
diff -bur namedTargetSrc/net/minecraft/item/BannerItem.java namedSrc/net/minecraft/item/BannerItem.java
--- namedTargetSrc/net/minecraft/item/BannerItem.java	2024-03-11 03:07:31.087478398 +0000
+++ namedSrc/net/minecraft/item/BannerItem.java	2024-03-11 03:06:22.662411974 +0000
@@ -4,8 +4,8 @@
 import net.minecraft.block.AbstractBannerBlock;
 import net.minecraft.block.Block;
 import net.minecraft.client.item.TooltipContext;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_wwbphpbp;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Formatting;
@@ -34,7 +34,7 @@
     * @mapping {@literal named appendBannerTooltip Lnet/minecraft/item/BannerItem;appendBannerTooltip(Lnet/minecraft/item/ItemStack;Ljava/util/List;)V}
     */
    public static void appendBannerTooltip(ItemStack stack, List<Text> tooltip) {
-      C_wwbphpbp lv = stack.m_dnvbhafp(C_icwdaizi.BANNER_PATTERNS);
+      C_wwbphpbp lv = stack.get(DataComponentTypes.BANNER_PATTERNS);
       if (lv != null) {
          for (int i = 0; i < Math.min(lv.layers().size(), 6); i++) {
             C_wwbphpbp.C_mhdqkjqk lv2 = (C_wwbphpbp.C_mhdqkjqk)lv.layers().get(i);
diff -bur namedTargetSrc/net/minecraft/item/BlockItem.java namedSrc/net/minecraft/item/BlockItem.java
--- namedTargetSrc/net/minecraft/item/BlockItem.java	2024-03-11 03:07:31.271481276 +0000
+++ namedSrc/net/minecraft/item/BlockItem.java	2024-03-11 03:06:22.806414202 +0000
@@ -10,6 +10,7 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.client.item.TooltipContext;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
@@ -20,7 +21,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_incrreuu;
 import net.minecraft.unmapped.C_snokizpi;
 import net.minecraft.unmapped.C_tmeipioo;
@@ -137,7 +137,7 @@
    private static void m_qdsiagsk(World world, BlockPos pos, ItemStack stack) {
       BlockEntity lv = world.getBlockEntity(pos);
       if (lv != null) {
-         lv.m_kdfbpbpy(stack.m_eutadtlw());
+         lv.m_kdfbpbpy(stack.getComponents());
       }
    }
 
@@ -164,7 +164,7 @@
     * @mapping {@literal named placeFromTag Lnet/minecraft/item/BlockItem;placeFromTag(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;Lnet/minecraft/item/ItemStack;Lnet/minecraft/block/BlockState;)Lnet/minecraft/block/BlockState;}
     */
    private BlockState placeFromTag(BlockPos pos, World world, ItemStack stack, BlockState state) {
-      C_snokizpi lv = stack.m_bcdzwasi(C_icwdaizi.BLOCK_STATE, C_snokizpi.f_fxqtkqgw);
+      C_snokizpi lv = stack.getOrDefault(DataComponentTypes.BLOCK_STATE, C_snokizpi.f_fxqtkqgw);
       if (lv.m_xjtfjxwu()) {
          return state;
       } else {
@@ -213,7 +213,7 @@
       if (minecraftServer == null) {
          return false;
       } else {
-         C_incrreuu lv = stack.m_bcdzwasi(C_icwdaizi.BLOCK_ENTITY_DATA, C_incrreuu.f_egifbhdk);
+         C_incrreuu lv = stack.getOrDefault(DataComponentTypes.BLOCK_ENTITY_DATA, C_incrreuu.f_egifbhdk);
          if (!lv.m_fcottrvr()) {
             BlockEntity lv2 = world.getBlockEntity(pos);
             if (lv2 != null) {
@@ -275,7 +275,7 @@
     */
    @Override
    public void onItemEntityDestroyed(ItemEntity entity) {
-      C_tmeipioo lv = entity.getStack().m_zakagwqa(C_icwdaizi.CONTAINER, C_tmeipioo.f_poyutggn);
+      C_tmeipioo lv = entity.getStack().m_zakagwqa(DataComponentTypes.CONTAINER, C_tmeipioo.f_poyutggn);
       if (lv != null) {
          ItemUsage.spawnItemContents(entity, lv.m_lfzvkncb());
       }
@@ -288,10 +288,10 @@
    public static void writeBlockEntityNbtToStack(ItemStack stack, BlockEntityType<?> type, NbtCompound nbt) {
       nbt.remove("id");
       if (nbt.isEmpty()) {
-         stack.m_kdmqavat(C_icwdaizi.BLOCK_ENTITY_DATA);
+         stack.m_kdmqavat(DataComponentTypes.BLOCK_ENTITY_DATA);
       } else {
          BlockEntity.writeIdentifyingData(nbt, type);
-         stack.m_zakagwqa(C_icwdaizi.BLOCK_ENTITY_DATA, C_incrreuu.m_rqhxtept(nbt));
+         stack.m_zakagwqa(DataComponentTypes.BLOCK_ENTITY_DATA, C_incrreuu.m_rqhxtept(nbt));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/item/BundleItem.java namedSrc/net/minecraft/item/BundleItem.java
--- namedTargetSrc/net/minecraft/item/BundleItem.java	2024-03-11 03:07:31.275481339 +0000
+++ namedSrc/net/minecraft/item/BundleItem.java	2024-03-11 03:06:22.810414264 +0000
@@ -5,6 +5,7 @@
 import net.minecraft.client.item.BundleTooltipData;
 import net.minecraft.client.item.TooltipContext;
 import net.minecraft.client.item.TooltipData;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -14,7 +15,6 @@
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.stat.Stats;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_rdabfjzm;
 import net.minecraft.util.ClickType;
 import net.minecraft.util.Formatting;
@@ -46,7 +46,7 @@
     * @mapping {@literal named getAmountFilled Lnet/minecraft/item/BundleItem;getAmountFilled(Lnet/minecraft/item/ItemStack;)F}
     */
    public static float getAmountFilled(ItemStack stack) {
-      C_rdabfjzm lv = stack.m_bcdzwasi(C_icwdaizi.BUNDLE_CONTENTS, C_rdabfjzm.f_jpdcvazc);
+      C_rdabfjzm lv = stack.getOrDefault(DataComponentTypes.BUNDLE_CONTENTS, C_rdabfjzm.f_jpdcvazc);
       return (float)lv.m_dbhmfful() / 64.0F;
    }
 
@@ -58,7 +58,7 @@
       if (clickType != ClickType.RIGHT) {
          return false;
       } else {
-         C_rdabfjzm lv = stack.m_dnvbhafp(C_icwdaizi.BUNDLE_CONTENTS);
+         C_rdabfjzm lv = stack.get(DataComponentTypes.BUNDLE_CONTENTS);
          if (lv == null) {
             return false;
          } else {
@@ -78,7 +78,7 @@
                }
             }
 
-            stack.m_zakagwqa(C_icwdaizi.BUNDLE_CONTENTS, lv3.m_lrhhcvgk());
+            stack.m_zakagwqa(DataComponentTypes.BUNDLE_CONTENTS, lv3.m_lrhhcvgk());
             return true;
          }
       }
@@ -92,7 +92,7 @@
       ItemStack thisStack, ItemStack otherStack, Slot thisSlot, ClickType clickType, PlayerEntity player, StackReference cursorStackReference
    ) {
       if (clickType == ClickType.RIGHT && thisSlot.canTakePartial(player)) {
-         C_rdabfjzm lv = thisStack.m_dnvbhafp(C_icwdaizi.BUNDLE_CONTENTS);
+         C_rdabfjzm lv = thisStack.get(DataComponentTypes.BUNDLE_CONTENTS);
          if (lv == null) {
             return false;
          } else {
@@ -110,7 +110,7 @@
                }
             }
 
-            thisStack.m_zakagwqa(C_icwdaizi.BUNDLE_CONTENTS, lv2.m_lrhhcvgk());
+            thisStack.m_zakagwqa(DataComponentTypes.BUNDLE_CONTENTS, lv2.m_lrhhcvgk());
             return true;
          }
       } else {
@@ -138,7 +138,7 @@
     */
    @Override
    public boolean isItemBarVisible(ItemStack stack) {
-      C_rdabfjzm lv = stack.m_bcdzwasi(C_icwdaizi.BUNDLE_CONTENTS, C_rdabfjzm.f_jpdcvazc);
+      C_rdabfjzm lv = stack.getOrDefault(DataComponentTypes.BUNDLE_CONTENTS, C_rdabfjzm.f_jpdcvazc);
       return lv.m_dbhmfful() > 0;
    }
 
@@ -147,7 +147,7 @@
     */
    @Override
    public int getItemBarStep(ItemStack stack) {
-      C_rdabfjzm lv = stack.m_bcdzwasi(C_icwdaizi.BUNDLE_CONTENTS, C_rdabfjzm.f_jpdcvazc);
+      C_rdabfjzm lv = stack.getOrDefault(DataComponentTypes.BUNDLE_CONTENTS, C_rdabfjzm.f_jpdcvazc);
       return Math.min(1 + 12 * lv.m_dbhmfful() / 64, 13);
    }
 
@@ -164,9 +164,9 @@
     * @mapping {@literal named dropAllBundledItems Lnet/minecraft/item/BundleItem;dropAllBundledItems(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/player/PlayerEntity;)Z}
     */
    private static boolean dropAllBundledItems(ItemStack stack, PlayerEntity player) {
-      C_rdabfjzm lv = stack.m_dnvbhafp(C_icwdaizi.BUNDLE_CONTENTS);
+      C_rdabfjzm lv = stack.get(DataComponentTypes.BUNDLE_CONTENTS);
       if (lv != null && !lv.m_kfcysouj()) {
-         stack.m_zakagwqa(C_icwdaizi.BUNDLE_CONTENTS, C_rdabfjzm.f_jpdcvazc);
+         stack.m_zakagwqa(DataComponentTypes.BUNDLE_CONTENTS, C_rdabfjzm.f_jpdcvazc);
          if (player instanceof ServerPlayerEntity) {
             lv.m_ofbuniku().forEach(stackx -> player.dropItem(stackx, true));
          }
@@ -182,7 +182,7 @@
     */
    @Override
    public Optional<TooltipData> getTooltipData(ItemStack stack) {
-      return Optional.ofNullable(stack.m_dnvbhafp(C_icwdaizi.BUNDLE_CONTENTS)).map(BundleTooltipData::new);
+      return Optional.ofNullable(stack.get(DataComponentTypes.BUNDLE_CONTENTS)).map(BundleTooltipData::new);
    }
 
    /**
@@ -190,7 +190,7 @@
     */
    @Override
    public void appendTooltip(ItemStack stack, World world, List<Text> tooltip, TooltipContext context) {
-      C_rdabfjzm lv = stack.m_dnvbhafp(C_icwdaizi.BUNDLE_CONTENTS);
+      C_rdabfjzm lv = stack.get(DataComponentTypes.BUNDLE_CONTENTS);
       if (lv != null) {
          tooltip.add(Text.translatable("item.minecraft.bundle.fullness", lv.m_dbhmfful(), 64).formatted(Formatting.GRAY));
       }
@@ -201,9 +201,9 @@
     */
    @Override
    public void onItemEntityDestroyed(ItemEntity entity) {
-      C_rdabfjzm lv = entity.getStack().m_dnvbhafp(C_icwdaizi.BUNDLE_CONTENTS);
+      C_rdabfjzm lv = entity.getStack().get(DataComponentTypes.BUNDLE_CONTENTS);
       if (lv != null) {
-         entity.getStack().m_zakagwqa(C_icwdaizi.BUNDLE_CONTENTS, C_rdabfjzm.f_jpdcvazc);
+         entity.getStack().m_zakagwqa(DataComponentTypes.BUNDLE_CONTENTS, C_rdabfjzm.f_jpdcvazc);
          ItemUsage.spawnItemContents(entity, lv.m_ofbuniku());
       }
    }
diff -bur namedTargetSrc/net/minecraft/item/CompassItem.java namedSrc/net/minecraft/item/CompassItem.java
--- namedTargetSrc/net/minecraft/item/CompassItem.java	2024-03-11 03:07:31.071478148 +0000
+++ namedSrc/net/minecraft/item/CompassItem.java	2024-03-11 03:06:22.642411665 +0000
@@ -2,12 +2,12 @@
 
 import java.util.Optional;
 import net.minecraft.block.Blocks;
+import net.minecraft.component.DataComponentTypes;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_icwdaizi;
 import net.minecraft.unmapped.C_zkuaenoq;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.dynamic.GlobalPos;
@@ -41,7 +41,7 @@
     */
    @Override
    public boolean hasGlint(ItemStack stack) {
-      return stack.m_pqplbapb(C_icwdaizi.LODESTONE_TRACKER) || super.hasGlint(stack);
+      return stack.contains(DataComponentTypes.LODESTONE_TRACKER) || super.hasGlint(stack);
    }
 
    /**
@@ -50,11 +50,11 @@
    @Override
    public void inventoryTick(ItemStack stack, World world, Entity entity, int slot, boolean selected) {
       if (world instanceof ServerWorld lv) {
-         C_zkuaenoq lv2 = stack.m_dnvbhafp(C_icwdaizi.LODESTONE_TRACKER);
+         C_zkuaenoq lv2 = stack.get(DataComponentTypes.LODESTONE_TRACKER);
          if (lv2 != null) {
             C_zkuaenoq lv3 = lv2.m_jprghkrt(lv);
             if (lv3 != lv2) {
-               stack.m_zakagwqa(C_icwdaizi.LODESTONE_TRACKER, lv3);
+               stack.m_zakagwqa(DataComponentTypes.LODESTONE_TRACKER, lv3);
             }
          }
       }
@@ -76,11 +76,11 @@
          boolean bl = !lv3.m_wunuznfv() && lv4.getCount() == 1;
          C_zkuaenoq lv5 = new C_zkuaenoq(Optional.of(GlobalPos.create(lv2.getRegistryKey(), lv)), true);
          if (bl) {
-            lv4.m_zakagwqa(C_icwdaizi.LODESTONE_TRACKER, lv5);
+            lv4.m_zakagwqa(DataComponentTypes.LODESTONE_TRACKER, lv5);
          } else {
             ItemStack lv6 = lv4.m_yqsxbejh(Items.COMPASS, 1);
             lv4.m_tyuugrfg(1, lv3);
-            lv6.m_zakagwqa(C_icwdaizi.LODESTONE_TRACKER, lv5);
+            lv6.m_zakagwqa(DataComponentTypes.LODESTONE_TRACKER, lv5);
             if (!lv3.getInventory().insertStack(lv6)) {
                lv3.dropItem(lv6, false);
             }
@@ -95,6 +95,6 @@
     */
    @Override
    public String getTranslationKey(ItemStack stack) {
-      return stack.m_pqplbapb(C_icwdaizi.LODESTONE_TRACKER) ? "item.minecraft.lodestone_compass" : super.getTranslationKey(stack);
+      return stack.contains(DataComponentTypes.LODESTONE_TRACKER) ? "item.minecraft.lodestone_compass" : super.getTranslationKey(stack);
    }
 }


The remaining diff is too long!

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    CLASS net/minecraft/unmapped/C_qkjwbfhx net/minecraft/component/DataComponent
+    	METHOD m_fhpcixsw encodeValue (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DataResult;
+    	METHOD m_ghmvhwvz create (Ljava/util/Map$Entry;)Lnet/minecraft/unmapped/C_qkjwbfhx;
+    		ARG 0 entry
+    	METHOD m_lwsakcbf create (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_qkjwbfhx;
+    	METHOD m_wdaivxti applyTo (Lnet/minecraft/unmapped/C_jvfovkxa;)V
+    		ARG 1 map
+    	CLASS C_romndzjk
+    		METHOD m_jxhoiopf decode (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_pscqxfcs;)Lnet/minecraft/unmapped/C_qkjwbfhx;
+    			ARG 0 buf
+    			ARG 1 type
+    		METHOD m_rsudiiuv encodeInternal (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_qkjwbfhx;)V
+    			ARG 0 buf
+    			ARG 1 component

-Original file line number
+Diff line change
@@ -0,0 +1,5 @@
+    CLASS net/minecraft/unmapped/C_xzoqrxvu net/minecraft/component/DataComponentHolder
+    	METHOD m_bcdzwasi getOrDefault (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Ljava/lang/Object;
+    	METHOD m_dnvbhafp get (Lnet/minecraft/unmapped/C_pscqxfcs;)Ljava/lang/Object;
+    	METHOD m_eutadtlw getComponents ()Lnet/minecraft/unmapped/C_kouhnfig;
+    	METHOD m_pqplbapb contains (Lnet/minecraft/unmapped/C_pscqxfcs;)Z

-Original file line number
+Diff line change
@@ -0,0 +1,26 @@
+    CLASS net/minecraft/unmapped/C_kouhnfig net/minecraft/component/DataComponentMap
+    	FIELD f_lzueiati EMPTY Lnet/minecraft/unmapped/C_kouhnfig;
+    	METHOD iterator iterator ()Ljava/util/Iterator;
+    	METHOD m_cqycvonb contains (Lnet/minecraft/unmapped/C_pscqxfcs;)Z
+    	METHOD m_ekwvemme size ()I
+    	METHOD m_invvxtoq builder ()Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz;
+    	METHOD m_jiswgnde filter (Ljava/util/function/Predicate;)Lnet/minecraft/unmapped/C_kouhnfig;
+    		ARG 1 predicate
+    	METHOD m_necyzwbs getKeys ()Ljava/util/Set;
+    	METHOD m_qpbbhvpw stream ()Ljava/util/stream/Stream;
+    	METHOD m_rqdfnawl isEmpty ()Z
+    	METHOD m_ryahtcyv get (Lnet/minecraft/unmapped/C_pscqxfcs;)Ljava/lang/Object;
+    		ARG 1 type
+    	METHOD m_tsvdhilo getTyped (Lnet/minecraft/unmapped/C_pscqxfcs;)Lnet/minecraft/unmapped/C_qkjwbfhx;
+    		ARG 1 type
+    	METHOD m_ueulfbom getOrDefault (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Ljava/lang/Object;
+    		ARG 2 defaultValue
+    	CLASS C_vfzyoahz Builder
+    		FIELD f_qqvwpxtm components Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap;
+    		METHOD m_ahyovmev putAll (Lnet/minecraft/unmapped/C_kouhnfig;)Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz;
+    			ARG 1 map
+    		METHOD m_ilbrroua build ()Lnet/minecraft/unmapped/C_kouhnfig;
+    		METHOD m_zuepxtcm put (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz;
+    			ARG 1 type
+    			ARG 2 value
+    		CLASS C_ucishuvq SimpleMap

-Original file line number
+Diff line change
@@ -0,0 +1,32 @@
+    CLASS net/minecraft/unmapped/C_jqyoylib net/minecraft/component/DataComponentPatch
+    	FIELD f_ddzjqron patchedComponents Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap;
+    	FIELD f_hfqkylly EMPTY Lnet/minecraft/unmapped/C_jqyoylib;
+    	FIELD f_xdjqkddv REMOVED_PREFIX Ljava/lang/String;
+    	METHOD m_gvzwygqe get (Lnet/minecraft/unmapped/C_pscqxfcs;)Ljava/util/Optional;
+    		ARG 1 type
+    	METHOD m_jbaewuyi toString (Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap;)Ljava/lang/String;
+    		ARG 0 components
+    	METHOD m_jxzjlqnn entrySet ()Ljava/util/Set;
+    	METHOD m_mmqaewwd isEmpty ()Z
+    	METHOD m_nonvnbuh builder ()Lnet/minecraft/unmapped/C_jqyoylib$C_dkdhcgqw;
+    	METHOD m_ogqcghcj size ()I
+    	CLASS C_dkdhcgqw Builder
+    		FIELD f_sbbdjqom components Lit/unimi/dsi/fastutil/objects/Reference2ObjectMap;
+    		METHOD m_atrtmrrv put (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jqyoylib$C_dkdhcgqw;
+    			ARG 1 type
+    		METHOD m_ipmpsmcm remove (Lnet/minecraft/unmapped/C_pscqxfcs;)Lnet/minecraft/unmapped/C_jqyoylib$C_dkdhcgqw;
+    			ARG 1 type
+    		METHOD m_scnaxosf put (Lnet/minecraft/unmapped/C_qkjwbfhx;)Lnet/minecraft/unmapped/C_jqyoylib$C_dkdhcgqw;
+    			ARG 1 type
+    		METHOD m_ygywjrqh build ()Lnet/minecraft/unmapped/C_jqyoylib;
+    	CLASS C_jagtrxxu PatchKey
+    		METHOD m_dmexkshy (Lnet/minecraft/unmapped/C_jqyoylib$C_jagtrxxu;)Lcom/mojang/serialization/DataResult;
+    			ARG 0 key
+    		METHOD m_ilbieqwt getValueCodec ()Lcom/mojang/serialization/Codec;
+    		METHOD m_ylnjxmun (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
+    			ARG 0 string
+    	CLASS C_lxdxrtfi
+    		METHOD m_yynahmft encode (Lnet/minecraft/unmapped/C_bngyzsts;Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)V
+    			ARG 0 buf
+    			ARG 1 type
+    			ARG 2 value

-Original file line number
+Diff line change
@@ -0,0 +1,12 @@
+    CLASS net/minecraft/unmapped/C_pscqxfcs net/minecraft/component/DataComponentType
+    	METHOD m_dxcqrmbb getPacketCodec ()Lnet/minecraft/unmapped/C_qsrmwluu;
+    	METHOD m_lmuzailu isTransient ()Z
+    	METHOD m_nuhzpkbr builder ()Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+    	METHOD m_vuiayjln getCodecOrThrow ()Lcom/mojang/serialization/Codec;
+    	METHOD m_xbswjdjj getCodec ()Lcom/mojang/serialization/Codec;
+    	CLASS C_pevyyrle Builder
+    		METHOD m_eplzdqam build ()Lnet/minecraft/unmapped/C_pscqxfcs;
+    		METHOD m_eqzfihwo packetCodec (Lnet/minecraft/unmapped/C_qsrmwluu;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+    		METHOD m_hudogumh codec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_pscqxfcs$C_pevyyrle;
+    		CLASS C_ffrnpwhn SimpleType
+    			FIELD f_betrvukv packetCodec Lnet/minecraft/unmapped/C_qsrmwluu;

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

3 comments on commit `9ad8065`

github-actions bot commented on `9ad8065` Mar 11, 2024

github-actions bot commented on `9ad8065` Mar 11, 2024

github-actions bot commented on `9ad8065` Mar 11, 2024

Commit

There are no files selected for viewing

3 comments on commit 9ad8065

github-actions bot commented on 9ad8065 Mar 11, 2024

Choose a reason for hiding this comment

github-actions bot commented on 9ad8065 Mar 11, 2024

Choose a reason for hiding this comment

github-actions bot commented on 9ad8065 Mar 11, 2024

Choose a reason for hiding this comment

3 comments on commit `9ad8065`

github-actions bot commented on `9ad8065` Mar 11, 2024

github-actions bot commented on `9ad8065` Mar 11, 2024

github-actions bot commented on `9ad8065` Mar 11, 2024