Skip to content

Commit

Permalink
Merge branch '24w10a' into item-component
Browse files Browse the repository at this point in the history 
# Conflicts:
#	mappings/net/minecraft/util/dynamic/Codecs.mapping
  • Loading branch information
@ix0rai
ix0rai committed Mar 14, 2024
2 parents 61cd8e5 + 8fbfc2f commit 5d425ba
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
6 changes: 6 additions & 0 deletions mappings/net/minecraft/network/PacketByteBuf.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ CLASS net/minecraft/unmapped/C_idfydwco net/minecraft/network/PacketByteBuf
COMMENT <tr>
COMMENT <td>{@link BitSet}</td><td>{@link #readBitSet()}</td><td>{@link #writeBitSet(BitSet)}</td>
COMMENT </tr>
COMMENT <tr>
COMMENT <td>{@link Optional}</td><td>{@link #readOptional(PacketByteBuf.PacketReader)}</td><td>{@link #writeOptional(Optional, PacketByteBuf.PacketWriter)}</td>
COMMENT </tr>
COMMENT <tr>
COMMENT <td>Nullable value</td><td>{@link #readNullable(PacketByteBuf.PacketReader)}</td><td>{@link #writeNullable(Object, PacketByteBuf.PacketWriter)}</td>
COMMENT </tr>
COMMENT </table></div>
COMMENT
COMMENT <p>All {@code read} and {@code write} methods throw {@link
Expand Down
8 changes: 4 additions & 4 deletions mappings/net/minecraft/util/dynamic/Codecs.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
METHOD m_gcywmtgx (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
ARG 0 list
METHOD m_gglkhqew (Lorg/joml/Matrix4f;)Ljava/util/List;
ARG 0 matrix4f
ARG 0 matrix
METHOD m_gtuotoel createStrictUnboundedMap (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lnet/minecraft/unmapped/C_tyjpezxh$C_psivvwhx;
ARG 0 keyCodec
ARG 1 elementCodec
Expand Down Expand Up @@ -111,7 +111,7 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
METHOD m_kbffjffi exceptionCatchingDecoder (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
ARG 0 codec
METHOD m_kcbwhxls (Lorg/joml/AxisAngle4f;)Ljava/lang/Float;
ARG 0 axisAngle4f
ARG 0 axisAngle
METHOD m_kcyhqcjs xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
COMMENT Returns an exclusive-or codec for {@link Either} instances.
COMMENT
Expand Down Expand Up @@ -167,7 +167,7 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
METHOD m_mcwzjvkz (Ljava/util/List;)Lcom/mojang/serialization/DataResult;
ARG 0 list
METHOD m_mfpnjepb (Lorg/joml/Vector3f;)Ljava/util/List;
ARG 0 vector3f
ARG 0 vector
METHOD m_mgvopkql (Lcom/mojang/authlib/properties/PropertyMap;Ljava/util/List;)V
ARG 1 list
METHOD m_mhgxozyd (Ljava/lang/String;)Lcom/mojang/serialization/DataResult;
Expand Down Expand Up @@ -246,7 +246,7 @@ CLASS net/minecraft/unmapped/C_tyjpezxh net/minecraft/util/dynamic/Codecs
METHOD m_tjbitvra (Ljava/lang/Integer;)Ljava/lang/String;
ARG 0 value
METHOD m_traryqmn (Lorg/joml/Quaternionf;)Ljava/util/List;
ARG 0 quaternionf
ARG 0 quaternion
METHOD m_ttlzdlzb (ILjava/util/Map;)Lcom/mojang/serialization/DataResult;
ARG 1 map
METHOD m_tuzltnkq (Ljava/lang/Integer;)Ljava/lang/String;
Expand Down
2 changes: 1 addition & 1 deletion mappings/net/minecraft/village/Merchant.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ CLASS net/minecraft/unmapped/C_mmbfvtpb net/minecraft/village/Merchant
METHOD m_cmgdubfr isClient ()Z
METHOD m_gsxtjpks sendOffers (Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_rdaqiwdt;I)V
ARG 1 player
ARG 2 test
ARG 2 merchantName
ARG 3 levelProgress
METHOD m_hlreeqnr setCurrentCustomer (Lnet/minecraft/unmapped/C_jzrpycqo;)V
ARG 1 customer
Expand Down

3 comments on commit 5d425ba

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit 5d425ba, 431 file(s) were updated with 3017 line(s) added and 2695 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/com/mojang/blaze3d/texture/NativeImage.java namedSrc/com/mojang/blaze3d/texture/NativeImage.java
--- namedTargetSrc/com/mojang/blaze3d/texture/NativeImage.java	2024-03-14 03:09:57.690085643 +0000
+++ namedSrc/com/mojang/blaze3d/texture/NativeImage.java	2024-03-14 03:08:48.770859220 +0000
@@ -544,7 +544,7 @@
          for (int i = 0; i < this.getHeight(); i++) {
             for (int j = 0; j < this.getWidth(); j++) {
                int k = this.getPixelColor(j, i);
-               is[j + i * this.getWidth()] = ColorUtil.ARGB32.m_jslmgbyf(
+               is[j + i * this.getWidth()] = ColorUtil.ARGB32.getArgb(
                   ColorUtil.ABGR32.getAlpha(k), ColorUtil.ABGR32.getRed(k), ColorUtil.ABGR32.getGreen(k), ColorUtil.ABGR32.getBlue(k)
                );
             }
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementHolder.java namedSrc/net/minecraft/advancement/AdvancementHolder.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementHolder.java	2024-03-14 03:09:57.842083935 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementHolder.java	2024-03-14 03:08:48.982856832 +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-14 03:09:57.734085148 +0000
+++ namedSrc/net/minecraft/advancement/Advancement.java	2024-03-14 03:08:48.846858364 +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-14 03:09:57.722085283 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CriterionProgress.java	2024-03-14 03:08:48.826858589 +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-14 03:09:57.810084294 +0000
+++ namedSrc/net/minecraft/block/BeehiveBlock.java	2024-03-14 03:08:48.950857192 +0000
@@ -7,6 +7,8 @@
 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.component.type.BlockStateComponent;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
@@ -35,8 +37,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;
 import net.minecraft.util.Hand;
@@ -366,8 +366,8 @@
          boolean bl = !lv2.hasNoBees();
          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.applyComponents(lv2.m_wiiwewxr());
+            lv3.set(DataComponentTypes.BLOCK_STATE, BlockStateComponent.DEFAULT.with(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/CampfireBlock.java namedSrc/net/minecraft/block/CampfireBlock.java
--- namedTargetSrc/net/minecraft/block/CampfireBlock.java	2024-03-14 03:09:57.822084159 +0000
+++ namedSrc/net/minecraft/block/CampfireBlock.java	2024-03-14 03:08:48.962857057 +0000
@@ -149,7 +149,9 @@
          Optional<RecipeHolder<CampfireCookingRecipe>> optional = lv2.getRecipeFor(lv3);
          if (optional.isPresent()) {
             if (!world.isClient
-               && lv2.addItem(player, player.m_wunuznfv() ? lv3.copy() : lv3, ((CampfireCookingRecipe)((RecipeHolder)optional.get()).value()).getCookTime())) {
+               && lv2.addItem(
+                  player, player.isInCreativeMode() ? lv3.copy() : lv3, ((CampfireCookingRecipe)((RecipeHolder)optional.get()).value()).getCookTime()
+               )) {
                player.incrementStat(Stats.INTERACT_WITH_CAMPFIRE);
                return InteractionResult.SUCCESS;
             }
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-14 03:09:57.690085643 +0000
+++ namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2024-03-14 03:08:48.774859175 +0000
@@ -9,6 +9,9 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
 import net.minecraft.block.ShulkerBoxBlock;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.BannerPatternsComponent;
+import net.minecraft.component.type.PotionContentsComponent;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -20,9 +23,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;
 import net.minecraft.util.InteractionResult;
 import net.minecraft.util.dynamic.Codecs;
@@ -108,7 +108,7 @@
          return InteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
       } else {
          if (!world.isClient) {
-            player.setStackInHand(hand, stack.m_yqsxbejh(Blocks.SHULKER_BOX, 1));
+            player.setStackInHand(hand, stack.transmuteCopy(Blocks.SHULKER_BOX, 1));
             player.incrementStat(Stats.CLEAN_SHULKER_BOX);
             LeveledCauldronBlock.decrementFluidLevel(state, world, pos);
          }
@@ -121,14 +121,14 @@
     * @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);
+      BannerPatternsComponent lv = stack.getOrDefault(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
       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());
-            stack.m_tyuugrfg(1, player);
+            lv2.set(DataComponentTypes.BANNER_PATTERNS, lv.removeLastLayer());
+            stack.consume(1, player);
             if (stack.isEmpty()) {
                player.setStackInHand(hand, lv2);
             } else if (player.getInventory().insertStack(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.remove(DataComponentTypes.DYED_COLOR);
             player.incrementStat(Stats.CLEAN_ARMOR);
             LeveledCauldronBlock.decrementFluidLevel(state, world, pos);
          }
@@ -190,8 +190,8 @@
       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);
-         if (lv != null && lv.m_njngtrku(Potions.WATER)) {
+         PotionContentsComponent lv = stack.get(DataComponentTypes.POTION_CONTENTS);
+         if (lv != null && lv.matches(Potions.WATER)) {
             if (!world.isClient) {
                Item lv2 = stack.getItem();
                player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, new ItemStack(Items.GLASS_BOTTLE)));
@@ -226,7 +226,7 @@
       map2.put(Items.GLASS_BOTTLE, (CauldronBehavior)(state, world, pos, player, hand, stack) -> {
          if (!world.isClient) {
             Item lv = stack.getItem();
-            player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, C_xpqegwnr.m_hcngmcff(Items.POTION, Potions.WATER)));
+            player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, PotionContentsComponent.createStack(Items.POTION, Potions.WATER)));
             player.incrementStat(Stats.USE_CAULDRON);
             player.incrementStat(Stats.USED.getOrCreateStat(lv));
             LeveledCauldronBlock.decrementFluidLevel(state, world, pos);
@@ -240,8 +240,8 @@
          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);
-            if (lv != null && lv.m_njngtrku(Potions.WATER)) {
+            PotionContentsComponent lv = stack.get(DataComponentTypes.POTION_CONTENTS);
+            if (lv != null && lv.matches(Potions.WATER)) {
                if (!world.isClient) {
                   player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, new ItemStack(Items.GLASS_BOTTLE)));
                   player.incrementStat(Stats.USE_CAULDRON);
diff -bur namedTargetSrc/net/minecraft/block/CommandBlock.java namedSrc/net/minecraft/block/CommandBlock.java
--- namedTargetSrc/net/minecraft/block/CommandBlock.java	2024-03-14 03:09:57.806084339 +0000
+++ namedSrc/net/minecraft/block/CommandBlock.java	2024-03-14 03:08:48.950857192 +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/ComposterBlock.java namedSrc/net/minecraft/block/ComposterBlock.java
--- namedTargetSrc/net/minecraft/block/ComposterBlock.java	2024-03-14 03:09:57.798084429 +0000
+++ namedSrc/net/minecraft/block/ComposterBlock.java	2024-03-14 03:08:48.938857327 +0000
@@ -313,7 +313,7 @@
             BlockState lv = addToComposter(player, state, world, pos, stack);
             world.syncWorldEvent(WorldEvents.COMPOSTER_USED, pos, state != lv ? 1 : 0);
             player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem()));
-            stack.m_tyuugrfg(1, player);
+            stack.consume(1, player);
          }
 
          return InteractionResult.of(world.isClient);
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-03-14 03:09:57.690085643 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-03-14 03:08:48.774859175 +0000
@@ -5,7 +5,9 @@
 import java.util.stream.Stream;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.DecoratedPotBlockEntity;
+import net.minecraft.block.entity.Sherds;
 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;
@@ -34,8 +36,6 @@
 import net.minecraft.state.property.Properties;
 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;
@@ -241,7 +241,7 @@
       BlockEntity lv = lootParameterBuilder.getOptionalParameter(LootContextParameters.BLOCK_ENTITY);
       if (lv instanceof DecoratedPotBlockEntity lv2) {
          lootParameterBuilder.withDynamicDrop(SHERDS, consumer -> {
-            for (Item lvx : lv2.getSherds().m_nbxpfcaq()) {
+            for (Item lvx : lv2.getSherds().ordered()) {
                consumer.accept(lvx.getDefaultStack());
             }
          });
@@ -290,8 +290,8 @@
       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);
-      if (!lv.equals(C_cpmlbyix.f_gautzvog)) {
+      Sherds lv = stack.getOrDefault(DataComponentTypes.POT_DECORATIONS, Sherds.DEFAULT);
+      if (!lv.equals(Sherds.DEFAULT)) {
          tooltip.add(CommonTexts.EMPTY);
          Stream.of(lv.front(), lv.left(), lv.right(), lv.back())
             .forEach(
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-14 03:09:57.786084564 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-03-14 03:08:48.926857463 +0000
@@ -22,6 +22,8 @@
 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.component.type.PotionContentsComponent;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.Saddleable;
@@ -61,8 +63,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;
 import net.minecraft.util.math.BlockPointer;
@@ -741,7 +741,7 @@
                   return this.m_eqevfesw(pointer, stack, new ItemStack(Items.HONEY_BOTTLE));
                } else if (lv.getFluidState(lv2).isIn(FluidTags.WATER)) {
                   this.setSuccess(true);
-                  return this.m_eqevfesw(pointer, stack, C_xpqegwnr.m_hcngmcff(Items.POTION, Potions.WATER));
+                  return this.m_eqevfesw(pointer, stack, PotionContentsComponent.createStack(Items.POTION, Potions.WATER));
                } else {
                   return super.dispenseSilently(pointer, stack);
                }
@@ -836,8 +836,8 @@
              */
             @Override
             public ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
-               C_xpqegwnr lv = stack.m_bcdzwasi(C_icwdaizi.POTION_CONTENTS, C_xpqegwnr.f_ujtaryrq);
-               if (!lv.m_njngtrku(Potions.WATER)) {
+               PotionContentsComponent lv = stack.getOrDefault(DataComponentTypes.POTION_CONTENTS, PotionContentsComponent.DEFAULT);
+               if (!lv.matches(Potions.WATER)) {
                   return this.f_hupyxnsp.dispense(pointer, stack);
                } else {
                   ServerWorld lv2 = pointer.world();
diff -bur namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-03-14 03:09:57.718085328 +0000
+++ namedSrc/net/minecraft/block/entity/AbstractFurnaceBlockEntity.java	2024-03-14 03:08:48.818858679 +0000
@@ -356,10 +356,10 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
-      Inventories.readNbt(nbt, this.inventory, arg2);
+      Inventories.readNbt(nbt, this.inventory, lookupProvider);
       this.burnTime = nbt.getShort("BurnTime");
       this.cookTime = nbt.getShort("CookTime");
       this.cookTimeTotal = nbt.getShort("CookTimeTotal");
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-14 03:09:57.766084789 +0000
+++ namedSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-03-14 03:08:48.898857778 +0000
@@ -4,6 +4,9 @@
 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.component.type.BannerPatternsComponent;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
@@ -11,9 +14,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;
 import net.minecraft.util.Util;
@@ -55,7 +55,7 @@
    /**
     * Mapping not found
     */
-   private C_wwbphpbp f_yqkmzniy = C_wwbphpbp.f_hnnrbutf;
+   private BannerPatternsComponent f_yqkmzniy = BannerPatternsComponent.DEFAULT;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_mwamopji;<init>(Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;)V}
@@ -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());
    }
 
    /**
@@ -107,8 +107,13 @@
    @Override
    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));
+      if (!this.f_yqkmzniy.equals(BannerPatternsComponent.DEFAULT)) {
+         nbt.put(
+            "patterns",
+            Util.getOrThrow(
+               BannerPatternsComponent.CODEC.encodeStart(arg2.createSerializationContext(NbtOps.INSTANCE), this.f_yqkmzniy), IllegalStateException::new
+            )
+         );
       }
 
       if (this.customName != null) {
@@ -120,15 +125,15 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), arg2);
+         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), lookupProvider);
       }
 
       if (nbt.contains("patterns")) {
-         C_wwbphpbp.CODEC
-            .parse(arg2.m_uwaazyzq(NbtOps.INSTANCE), nbt.get("patterns"))
+         BannerPatternsComponent.CODEC
+            .parse(lookupProvider.createSerializationContext(NbtOps.INSTANCE), nbt.get("patterns"))
             .resultOrPartial(string -> LOGGER.error("Failed to parse banner patterns: '{}'", string))
             .ifPresent(arg -> this.f_yqkmzniy = arg);
       }
@@ -153,7 +158,7 @@
    /**
     * Mapping not found
     */
-   public C_wwbphpbp m_kmayejyb() {
+   public BannerPatternsComponent m_kmayejyb() {
       return this.f_yqkmzniy;
    }
 
@@ -163,7 +168,7 @@
     */
    public ItemStack getPickStack() {
       ItemStack lv = new ItemStack(BannerBlock.getForColor(this.baseColor));
-      lv.m_vchnqfkp(this.m_wiiwewxr());
+      lv.applyComponents(this.m_wiiwewxr());
       return lv;
    }
 
@@ -179,18 +184,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, BannerPatternsComponent.DEFAULT);
+      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-14 03:09:57.726085238 +0000
+++ namedSrc/net/minecraft/block/entity/BannerPattern.java	2024-03-14 03:08:48.834858499 +0000
@@ -16,9 +16,10 @@
  */
 public record BannerPattern(Identifier assetId, String translationKey) {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cfazaqwg Lnet/minecraft/unmapped/C_fjtvwotb;f_cfazaqwg:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named DIRECT_CODEC Lnet/minecraft/block/entity/BannerPattern;DIRECT_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<BannerPattern> f_cfazaqwg = RecordCodecBuilder.create(
+   public static final Codec<BannerPattern> DIRECT_CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
                Identifier.CODEC.fieldOf("asset_id").forGetter(BannerPattern::assetId),
                Codec.STRING.fieldOf("translation_key").forGetter(BannerPattern::translationKey)
@@ -26,17 +27,20 @@
             .apply(instance, BannerPattern::new)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ntxvrihf Lnet/minecraft/unmapped/C_fjtvwotb;f_ntxvrihf:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named DIRECT_PACKET_CODEC Lnet/minecraft/block/entity/BannerPattern;DIRECT_PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, BannerPattern> f_ntxvrihf = PacketCodec.create(
+   public static final PacketCodec<RegistryByteBuf, BannerPattern> DIRECT_PACKET_CODEC = PacketCodec.tuple(
       Identifier.PACKET_CODEC, BannerPattern::assetId, PacketCodecs.STRING, BannerPattern::translationKey, BannerPattern::new
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vfvqwjbc Lnet/minecraft/unmapped/C_fjtvwotb;f_vfvqwjbc:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/block/entity/BannerPattern;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<Holder<BannerPattern>> f_vfvqwjbc = RegistryElementCodec.of(RegistryKeys.BANNER_PATTERN, f_cfazaqwg);
+   public static final Codec<Holder<BannerPattern>> CODEC = RegistryElementCodec.of(RegistryKeys.BANNER_PATTERN, DIRECT_CODEC);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zfnqliun Lnet/minecraft/unmapped/C_fjtvwotb;f_zfnqliun:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/block/entity/BannerPattern;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, Holder<BannerPattern>> f_zfnqliun = PacketCodecs.registryEntry(RegistryKeys.BANNER_PATTERN, f_ntxvrihf);
+   public static final PacketCodec<RegistryByteBuf, Holder<BannerPattern>> PACKET_CODEC = PacketCodecs.holder(RegistryKeys.BANNER_PATTERN, DIRECT_PACKET_CODEC);
 }
diff -bur namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-03-14 03:09:57.862083710 +0000
+++ namedSrc/net/minecraft/block/entity/BarrelBlockEntity.java	2024-03-14 03:08:49.002856606 +0000
@@ -99,11 +99,11 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
       if (!this.readLootTableNbt(nbt)) {
-         Inventories.readNbt(nbt, this.inventory, arg2);
+         Inventories.readNbt(nbt, this.inventory, lookupProvider);
       }
    }
 
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-14 03:09:57.762084834 +0000
+++ namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-03-14 03:08:48.894857823 +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;
@@ -441,12 +441,12 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.primary = readStatusEffect(nbt, "primary_effect");
       this.secondary = readStatusEffect(nbt, "secondary_effect");
       if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), arg2);
+         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), lookupProvider);
       }
 
       this.lock = ContainerLock.fromNbt(nbt);
@@ -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-14 03:09:57.782084609 +0000
+++ namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-03-14 03:08:48.922857508 +0000
@@ -12,6 +12,9 @@
 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.component.type.NbtComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.passive.BeeEntity;
@@ -28,9 +31,6 @@
 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;
@@ -208,7 +208,7 @@
     */
    private List<Entity> tryReleaseBee(BlockState state, BeehiveBlockEntity.BeeState beeState) {
       List<Entity> list = Lists.<Entity>newArrayList();
-      this.bees.removeIf(bee -> releaseBee(this.world, this.pos, state, bee.m_dhblhaks(), list, beeState, this.flowerPos));
+      this.bees.removeIf(bee -> releaseBee(this.world, this.pos, state, bee.toOccupant(), list, beeState, this.flowerPos));
       if (!list.isEmpty()) {
          super.markDirty();
       }
@@ -250,7 +250,7 @@
       if (this.bees.size() < 3) {
          entity.stopRiding();
          entity.removeAllPassengers();
-         this.addBee(BeehiveBlockEntity.C_cakykluc.m_vlpkfwxg(entity));
+         this.addBee(BeehiveBlockEntity.Occupant.m_vlpkfwxg(entity));
          if (this.world != null) {
             if (entity instanceof BeeEntity lv && lv.hasFlower() && (!this.hasFlowerPos() || this.world.random.nextBoolean())) {
                this.flowerPos = lv.getFlowerPos();
@@ -269,21 +269,21 @@
 
    /**
     * @mapping {@literal hashed m_czgkogzg Lnet/minecraft/unmapped/C_cyniebsl;m_czgkogzg(Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;)V}
-    * @mapping {@literal named addBee Lnet/minecraft/block/entity/BeehiveBlockEntity;addBee(Lnet/minecraft/block/entity/BeehiveBlockEntity$C_cakykluc;)V}
+    * @mapping {@literal named addBee Lnet/minecraft/block/entity/BeehiveBlockEntity;addBee(Lnet/minecraft/block/entity/BeehiveBlockEntity$Occupant;)V}
     */
-   public void addBee(BeehiveBlockEntity.C_cakykluc arg) {
-      this.bees.add(new BeehiveBlockEntity.Bee(arg));
+   public void addBee(BeehiveBlockEntity.Occupant occupant) {
+      this.bees.add(new BeehiveBlockEntity.Bee(occupant));
    }
 
    /**
     * @mapping {@literal hashed m_agcjqyju Lnet/minecraft/unmapped/C_cyniebsl;m_agcjqyju(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;Ljava/util/List;Lnet/minecraft/unmapped/C_cyniebsl$C_ajqcctan;Lnet/minecraft/unmapped/C_hynzadkk;)Z}
-    * @mapping {@literal named releaseBee Lnet/minecraft/block/entity/BeehiveBlockEntity;releaseBee(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/entity/BeehiveBlockEntity$C_cakykluc;Ljava/util/List;Lnet/minecraft/block/entity/BeehiveBlockEntity$BeeState;Lnet/minecraft/util/math/BlockPos;)Z}
+    * @mapping {@literal named releaseBee Lnet/minecraft/block/entity/BeehiveBlockEntity;releaseBee(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/entity/BeehiveBlockEntity$Occupant;Ljava/util/List;Lnet/minecraft/block/entity/BeehiveBlockEntity$BeeState;Lnet/minecraft/util/math/BlockPos;)Z}
     */
    private static boolean releaseBee(
       World world,
       BlockPos pos,
       BlockState state,
-      BeehiveBlockEntity.C_cakykluc arg4,
+      BeehiveBlockEntity.Occupant occupant,
       @Nullable List<Entity> entities,
       BeehiveBlockEntity.BeeState beeState,
       @Nullable BlockPos flowerPos
@@ -297,7 +297,7 @@
          if (bl && beeState != BeehiveBlockEntity.BeeState.EMERGENCY) {
             return false;
          } else {
-            Entity lv3 = arg4.m_hzrqymrb(world, pos);
+            Entity lv3 = occupant.m_hzrqymrb(world, pos);
             if (lv3 != null) {
                if (lv3 instanceof BeeEntity lv4) {
                   if (flowerPos != null && !lv4.hasFlower() && world.random.nextFloat() < 0.9F) {
@@ -359,9 +359,9 @@
 
       while (iterator.hasNext()) {
          BeehiveBlockEntity.Bee lv = (BeehiveBlockEntity.Bee)iterator.next();
-         if (lv.m_bhatzkqu()) {
-            BeehiveBlockEntity.BeeState lv2 = lv.m_vzehkgql() ? BeehiveBlockEntity.BeeState.HONEY_DELIVERED : BeehiveBlockEntity.BeeState.BEE_RELEASED;
-            if (releaseBee(world, pos, state, lv.m_dhblhaks(), null, lv2, flowerPos)) {
+         if (lv.tick()) {
+            BeehiveBlockEntity.BeeState lv2 = lv.hasNectar() ? BeehiveBlockEntity.BeeState.HONEY_DELIVERED : BeehiveBlockEntity.BeeState.BEE_RELEASED;
+            if (releaseBee(world, pos, state, lv.toOccupant(), null, lv2, flowerPos)) {
                bl = true;
                iterator.remove();
             }
@@ -393,11 +393,11 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.bees.clear();
       if (nbt.contains("bees")) {
-         BeehiveBlockEntity.C_cakykluc.f_mffcrvpw
+         BeehiveBlockEntity.Occupant.LIST_CODEC
             .parse(NbtOps.INSTANCE, nbt.get("bees"))
             .resultOrPartial(string -> LOGGER.error("Failed to parse bees: '{}'", string))
             .ifPresent(list -> list.forEach(this::addBee));
@@ -412,7 +412,7 @@
    @Override
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.writeNbt(nbt, arg2);
-      nbt.put("bees", Util.getOrThrow(BeehiveBlockEntity.C_cakykluc.f_mffcrvpw.encodeStart(NbtOps.INSTANCE, this.m_qwlovmrg()), IllegalStateException::new));
+      nbt.put("bees", Util.getOrThrow(BeehiveBlockEntity.Occupant.LIST_CODEC.encodeStart(NbtOps.INSTANCE, this.m_qwlovmrg()), IllegalStateException::new));
       if (this.hasFlowerPos()) {
          nbt.put("flower_pos", NbtHelper.fromBlockPos(this.flowerPos));
       }
@@ -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.Occupant> 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());
    }
 
    /**
@@ -450,8 +450,8 @@
    /**
     * Mapping not found
     */
-   private List<BeehiveBlockEntity.C_cakykluc> m_qwlovmrg() {
-      return this.bees.stream().map(BeehiveBlockEntity.Bee::m_dhblhaks).toList();
+   private List<BeehiveBlockEntity.Occupant> m_qwlovmrg() {
+      return this.bees.stream().map(BeehiveBlockEntity.Bee::toOccupant).toList();
    }
 
    /**
@@ -462,7 +462,7 @@
       /**
        * Mapping not found
        */
-      private final BeehiveBlockEntity.C_cakykluc f_phfczzkq;
+      private final BeehiveBlockEntity.Occupant f_phfczzkq;
       /**
        * @mapping {@literal hashed f_rrbvfqoq Lnet/minecraft/unmapped/C_cyniebsl$C_idqjupol;f_rrbvfqoq:I}
        * @mapping {@literal named ticksInHive Lnet/minecraft/block/entity/BeehiveBlockEntity$Bee;ticksInHive:I}
@@ -470,32 +470,38 @@
       private int ticksInHive;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_cyniebsl$C_idqjupol;<init>(Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/block/entity/BeehiveBlockEntity$Bee;<init>(Lnet/minecraft/block/entity/BeehiveBlockEntity$Occupant;)V}
        */
-      Bee(BeehiveBlockEntity.C_cakykluc arg) {
-         this.f_phfczzkq = arg;
-         this.ticksInHive = arg.ticksInHive();
+      Bee(BeehiveBlockEntity.Occupant occupant) {
+         this.f_phfczzkq = occupant;
+         this.ticksInHive = occupant.ticksInHive();
       }
 
       /**
-       * Mapping not found
+       * {@return whether the bee can leave the hive}
+       * 
+       * @mapping {@literal hashed m_bhatzkqu Lnet/minecraft/unmapped/C_cyniebsl$C_idqjupol;m_bhatzkqu()Z}
+       * @mapping {@literal named tick Lnet/minecraft/block/entity/BeehiveBlockEntity$Bee;tick()Z}
        */
-      public boolean m_bhatzkqu() {
+      public boolean tick() {
          return this.ticksInHive++ > this.f_phfczzkq.minTicksInHive;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_dhblhaks Lnet/minecraft/unmapped/C_cyniebsl$C_idqjupol;m_dhblhaks()Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;}
+       * @mapping {@literal named toOccupant Lnet/minecraft/block/entity/BeehiveBlockEntity$Bee;toOccupant()Lnet/minecraft/block/entity/BeehiveBlockEntity$Occupant;}
        */
-      public BeehiveBlockEntity.C_cakykluc m_dhblhaks() {
-         return new BeehiveBlockEntity.C_cakykluc(this.f_phfczzkq.entityData, this.ticksInHive, this.f_phfczzkq.minTicksInHive);
+      public BeehiveBlockEntity.Occupant toOccupant() {
+         return new BeehiveBlockEntity.Occupant(this.f_phfczzkq.entityData, this.ticksInHive, this.f_phfczzkq.minTicksInHive);
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_vzehkgql Lnet/minecraft/unmapped/C_cyniebsl$C_idqjupol;m_vzehkgql()Z}
+       * @mapping {@literal named hasNectar Lnet/minecraft/block/entity/BeehiveBlockEntity$Bee;hasNectar()Z}
        */
-      public boolean m_vzehkgql() {
-         return this.f_phfczzkq.entityData.m_tpafhgjl().getBoolean("HasNectar");
+      public boolean hasNectar() {
+         return this.f_phfczzkq.entityData.getNbt().getBoolean("HasNectar");
       }
    }
 
@@ -523,66 +529,68 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_cyniebsl$C_cakykluc}
-    * @mapping {@literal named net/minecraft/block/entity/BeehiveBlockEntity$C_cakykluc}
+    * @mapping {@literal named net/minecraft/block/entity/BeehiveBlockEntity$Occupant}
     */
-   public static record C_cakykluc(C_incrreuu entityData, int ticksInHive, int minTicksInHive) {
+   public static record Occupant(NbtComponent entityData, int ticksInHive, int minTicksInHive) {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_yzeidvrx Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;f_yzeidvrx:Lcom/mojang/serialization/Codec;}
+       * @mapping {@literal named CODEC Lnet/minecraft/block/entity/BeehiveBlockEntity$Occupant;CODEC:Lcom/mojang/serialization/Codec;}
        */
-      public static final Codec<BeehiveBlockEntity.C_cakykluc> f_yzeidvrx = RecordCodecBuilder.create(
+      public static final Codec<BeehiveBlockEntity.Occupant> CODEC = RecordCodecBuilder.create(
          instance -> instance.group(
-                  Codecs.createStrictOptionalField(C_incrreuu.f_otzdwcon, "entity_data", C_incrreuu.f_egifbhdk)
-                     .forGetter(BeehiveBlockEntity.C_cakykluc::entityData),
-                  Codec.INT.fieldOf("ticks_in_hive").forGetter(BeehiveBlockEntity.C_cakykluc::ticksInHive),
-                  Codec.INT.fieldOf("min_ticks_in_hive").forGetter(BeehiveBlockEntity.C_cakykluc::minTicksInHive)
+                  Codecs.createStrictOptionalField(NbtComponent.CODEC, "entity_data", NbtComponent.DEFAULT).forGetter(BeehiveBlockEntity.Occupant::entityData),
+                  Codec.INT.fieldOf("ticks_in_hive").forGetter(BeehiveBlockEntity.Occupant::ticksInHive),
+                  Codec.INT.fieldOf("min_ticks_in_hive").forGetter(BeehiveBlockEntity.Occupant::minTicksInHive)
                )
-               .apply(instance, BeehiveBlockEntity.C_cakykluc::new)
+               .apply(instance, BeehiveBlockEntity.Occupant::new)
       );
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_mffcrvpw Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;f_mffcrvpw:Lcom/mojang/serialization/Codec;}
+       * @mapping {@literal named LIST_CODEC Lnet/minecraft/block/entity/BeehiveBlockEntity$Occupant;LIST_CODEC:Lcom/mojang/serialization/Codec;}
        */
-      public static final Codec<List<BeehiveBlockEntity.C_cakykluc>> f_mffcrvpw = f_yzeidvrx.listOf();
+      public static final Codec<List<BeehiveBlockEntity.Occupant>> LIST_CODEC = CODEC.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$Occupant;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, BeehiveBlockEntity.C_cakykluc> f_avqlsgls = PacketCodec.m_kqzabmpi(
-         C_incrreuu.f_lvjwhawk,
-         BeehiveBlockEntity.C_cakykluc::entityData,
+      public static final PacketCodec<ByteBuf, BeehiveBlockEntity.Occupant> PACKET_CODEC = PacketCodec.tuple(
+         NbtComponent.PACKET_CODEC,
+         BeehiveBlockEntity.Occupant::entityData,
          PacketCodecs.VAR_INT,
-         BeehiveBlockEntity.C_cakykluc::ticksInHive,
+         BeehiveBlockEntity.Occupant::ticksInHive,
          PacketCodecs.VAR_INT,
-         BeehiveBlockEntity.C_cakykluc::minTicksInHive,
-         BeehiveBlockEntity.C_cakykluc::new
+         BeehiveBlockEntity.Occupant::minTicksInHive,
+         BeehiveBlockEntity.Occupant::new
       );
 
       /**
        * Mapping not found
        */
-      public static BeehiveBlockEntity.C_cakykluc m_vlpkfwxg(Entity arg) {
+      public static BeehiveBlockEntity.Occupant m_vlpkfwxg(Entity arg) {
          NbtCompound lv = new NbtCompound();
          arg.saveNbt(lv);
          BeehiveBlockEntity.IRRELEVANT_BEE_NBT_KEYS.forEach(lv::remove);
          boolean bl = lv.getBoolean("HasNectar");
-         return new BeehiveBlockEntity.C_cakykluc(C_incrreuu.m_rqhxtept(lv), 0, bl ? 2400 : 600);
+         return new BeehiveBlockEntity.Occupant(NbtComponent.of(lv), 0, bl ? 2400 : 600);
       }
 
       /**
        * @mapping {@literal hashed m_kiuyjtdd Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;m_kiuyjtdd(I)Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;}
-       * @mapping {@literal named m_kiuyjtdd Lnet/minecraft/block/entity/BeehiveBlockEntity$C_cakykluc;m_kiuyjtdd(I)Lnet/minecraft/block/entity/BeehiveBlockEntity$C_cakykluc;}
+       * @mapping {@literal named m_kiuyjtdd Lnet/minecraft/block/entity/BeehiveBlockEntity$Occupant;m_kiuyjtdd(I)Lnet/minecraft/block/entity/BeehiveBlockEntity$Occupant;}
        */
-      public static BeehiveBlockEntity.C_cakykluc m_kiuyjtdd(int ticksInHive) {
+      public static BeehiveBlockEntity.Occupant m_kiuyjtdd(int ticksInHive) {
          NbtCompound lv = new NbtCompound();
          lv.putString("id", Registries.ENTITY_TYPE.getId(EntityType.BEE).toString());
-         return new BeehiveBlockEntity.C_cakykluc(C_incrreuu.m_rqhxtept(lv), ticksInHive, 600);
+         return new BeehiveBlockEntity.Occupant(NbtComponent.of(lv), ticksInHive, 600);
       }
 
       /**
        * @mapping {@literal hashed m_hzrqymrb Lnet/minecraft/unmapped/C_cyniebsl$C_cakykluc;m_hzrqymrb(Lnet/minecraft/unmapped/C_cdctfzbn;Lnet/minecraft/unmapped/C_hynzadkk;)Lnet/minecraft/unmapped/C_astfners;}
-       * @mapping {@literal named m_hzrqymrb Lnet/minecraft/block/entity/BeehiveBlockEntity$C_cakykluc;m_hzrqymrb(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/Entity;}
+       * @mapping {@literal named m_hzrqymrb Lnet/minecraft/block/entity/BeehiveBlockEntity$Occupant;m_hzrqymrb(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/entity/Entity;}
        */
       @Nullable
       public Entity m_hzrqymrb(World world, BlockPos pos) {
-         NbtCompound lv = this.entityData.m_clauenbt();
+         NbtCompound lv = this.entityData.copy();
          BeehiveBlockEntity.IRRELEVANT_BEE_NBT_KEYS.forEach(lv::remove);
          Entity lv2 = EntityType.loadEntityWithPassengers(lv, world, arg -> arg);
          if (lv2 != null && lv2.getType().isIn(EntityTypeTags.BEEHIVE_INHABITORS)) {
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-14 03:09:57.714085373 +0000
+++ namedSrc/net/minecraft/block/entity/BlockEntity.java	2024-03-14 03:08:48.814858724 +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;
@@ -104,7 +104,7 @@
     * @mapping {@literal hashed m_dfzdncts Lnet/minecraft/unmapped/C_kvegafmh;m_dfzdncts(Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V}
     * @mapping {@literal named readNbt Lnet/minecraft/block/entity/BlockEntity;readNbt(Lnet/minecraft/nbt/NbtCompound;Lnet/minecraft/registry/HolderLookup$Provider;)V}
     */
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
    }
 
    /**
@@ -177,7 +177,7 @@
       NbtCompound lv = this.toNbt(arg2);
       this.m_pcgjfrqh(lv);
       BlockItem.writeBlockEntityNbtToStack(stack, this.getType(), lv);
-      stack.m_vchnqfkp(this.m_wiiwewxr());
+      stack.applyComponents(this.m_wiiwewxr());
    }
 
    /**
@@ -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/BrewingStandBlockEntity.java namedSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java	2024-03-14 03:09:57.762084834 +0000
+++ namedSrc/net/minecraft/block/entity/BrewingStandBlockEntity.java	2024-03-14 03:08:48.890857868 +0000
@@ -295,10 +295,10 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
-      Inventories.readNbt(nbt, this.inventory, arg2);
+      Inventories.readNbt(nbt, this.inventory, lookupProvider);
       this.brewTime = nbt.getShort("BrewTime");
       this.fuel = nbt.getByte("Fuel");
    }
diff -bur namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-03-14 03:09:57.814084249 +0000
+++ namedSrc/net/minecraft/block/entity/BrushableBlockEntity.java	2024-03-14 03:08:48.958857102 +0000
@@ -318,9 +318,9 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
       if (!this.deserializeLootTable(nbt) && nbt.contains("item")) {
-         this.buriedStack = (ItemStack)ItemStack.m_izgziaft(arg2, nbt.getCompound("item")).orElse(ItemStack.EMPTY);
+         this.buriedStack = (ItemStack)ItemStack.fromNbtOptional(lookupProvider, nbt.getCompound("item")).orElse(ItemStack.EMPTY);
       } else {
          this.buriedStack = ItemStack.EMPTY;
       }
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-14 03:09:57.658086002 +0000
+++ namedSrc/net/minecraft/block/entity/CampfireBlockEntity.java	2024-03-14 03:08:48.726859716 +0000
@@ -4,6 +4,9 @@
 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.component.type.ContainerContentsComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.inventory.Inventories;
 import net.minecraft.inventory.Inventory;
@@ -18,9 +21,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;
 import net.minecraft.util.collection.DefaultedList;
@@ -169,10 +169,10 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.itemsBeingCooked.clear();
-      Inventories.readNbt(nbt, this.itemsBeingCooked, arg2);
+      Inventories.readNbt(nbt, this.itemsBeingCooked, lookupProvider);
       if (nbt.contains("CookingTimes", NbtElement.INT_ARRAY_TYPE)) {
          int[] is = nbt.getIntArray("CookingTimes");
          System.arraycopy(is, 0, this.cookingTimes, 0, Math.min(this.cookingTotalTimes.length, is.length));
@@ -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, ContainerContentsComponent.DEFAULT).copyTo(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, ContainerContentsComponent.fromStacks(this.getItemsBeingCooked()));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/ChestBlockEntity.java namedSrc/net/minecraft/block/entity/ChestBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ChestBlockEntity.java	2024-03-14 03:09:57.802084384 +0000
+++ namedSrc/net/minecraft/block/entity/ChestBlockEntity.java	2024-03-14 03:08:48.942857282 +0000
@@ -124,11 +124,11 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
       if (!this.readLootTableNbt(nbt)) {
-         Inventories.readNbt(nbt, this.inventory, arg2);
+         Inventories.readNbt(nbt, this.inventory, lookupProvider);
       }
    }
 
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-14 03:09:57.798084429 +0000
+++ namedSrc/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.java	2024-03-14 03:08:48.938857327 +0000
@@ -6,6 +6,9 @@
 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.component.type.ContainerContentsComponent;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.Inventories;
 import net.minecraft.inventory.Inventory;
@@ -14,9 +17,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;
 import net.minecraft.world.World;
@@ -83,9 +83,9 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
       this.inventory.clear();
-      Inventories.readNbt(nbt, this.inventory, arg2);
+      Inventories.readNbt(nbt, this.inventory, lookupProvider);
       this.lastInteractedSlot = nbt.getInt("last_interacted_slot");
    }
 
@@ -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, ContainerContentsComponent.DEFAULT).copyTo(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, ContainerContentsComponent.fromStacks(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-14 03:09:57.770084744 +0000
+++ namedSrc/net/minecraft/block/entity/CommandBlockBlockEntity.java	2024-03-14 03:08:48.902857733 +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;
@@ -127,9 +127,9 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
-      this.commandExecutor.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
+      this.commandExecutor.readNbt(nbt, lookupProvider);
       this.powered = nbt.getBoolean("powered");
       this.conditionMet = nbt.getBoolean("conditionMet");
       this.setAuto(nbt.getBoolean("auto"));
@@ -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/ComparatorBlockEntity.java namedSrc/net/minecraft/block/entity/ComparatorBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ComparatorBlockEntity.java	2024-03-14 03:09:57.866083665 +0000
+++ namedSrc/net/minecraft/block/entity/ComparatorBlockEntity.java	2024-03-14 03:08:49.010856517 +0000
@@ -37,8 +37,8 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.outputSignal = nbt.getInt("OutputSignal");
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/ConduitBlockEntity.java namedSrc/net/minecraft/block/entity/ConduitBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ConduitBlockEntity.java	2024-03-14 03:09:57.834084025 +0000
+++ namedSrc/net/minecraft/block/entity/ConduitBlockEntity.java	2024-03-14 03:08:48.978856877 +0000
@@ -122,8 +122,8 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       if (nbt.containsUuid("Target")) {
          this.targetUuid = nbt.getUuid("Target");
       } else {

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-03-14 03:09:57.866083665 +0000
+++ namedSrc/net/minecraft/block/entity/CrafterBlockEntity.java	2024-03-14 03:08:49.010856517 +0000
@@ -200,12 +200,12 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.craftingTicksRemaining = nbt.getInt("crafting_ticks_remaining");
       this.inputStacks = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
       if (!this.readLootTableNbt(nbt)) {
-         Inventories.readNbt(nbt, this.inputStacks, arg2);
+         Inventories.readNbt(nbt, this.inputStacks, lookupProvider);
       }
 
       int[] is = nbt.getIntArray("disabled_slots");
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-14 03:09:57.826084114 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-03-14 03:08:48.966857012 +0000
@@ -2,6 +2,9 @@
 
 import java.util.List;
 import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.ContainerContentsComponent;
 import net.minecraft.inventory.LootableInventory;
 import net.minecraft.inventory.SingleStackInventory;
 import net.minecraft.item.ItemStack;
@@ -11,10 +14,6 @@
 import net.minecraft.network.packet.s2c.play.BlockEntityUpdateS2CPacket;
 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;
 import net.minecraft.util.math.Direction;
@@ -53,9 +52,9 @@
    public DecoratedPotBlockEntity.WobbleType lastWobbleType;
    /**
     * @mapping {@literal hashed f_ntlmymra Lnet/minecraft/unmapped/C_snnddtnv;f_ntlmymra:Lnet/minecraft/unmapped/C_cpmlbyix;}
-    * @mapping {@literal named sherds Lnet/minecraft/block/entity/DecoratedPotBlockEntity;sherds:Lnet/minecraft/unmapped/C_cpmlbyix;}
+    * @mapping {@literal named sherds Lnet/minecraft/block/entity/DecoratedPotBlockEntity;sherds:Lnet/minecraft/block/entity/Sherds;}
     */
-   private C_cpmlbyix sherds;
+   private Sherds sherds;
    /**
     * @mapping {@literal hashed f_qacubtfq Lnet/minecraft/unmapped/C_snnddtnv;f_qacubtfq:Lnet/minecraft/unmapped/C_sddaxwyk;}
     * @mapping {@literal named stack Lnet/minecraft/block/entity/DecoratedPotBlockEntity;stack:Lnet/minecraft/item/ItemStack;}
@@ -79,7 +78,7 @@
     */
    public DecoratedPotBlockEntity(BlockPos pos, BlockState state) {
       super(BlockEntityType.DECORATED_POT, pos, state);
-      this.sherds = C_cpmlbyix.f_gautzvog;
+      this.sherds = Sherds.DEFAULT;
    }
 
    /**
@@ -88,7 +87,7 @@
    @Override
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.writeNbt(nbt, arg2);
-      this.sherds.m_ktzuujya(nbt);
+      this.sherds.toNbt(nbt);
       if (!this.writeLootTableNbt(nbt) && !this.stack.isEmpty()) {
          nbt.put("item", this.stack.encode(arg2));
       }
@@ -98,12 +97,12 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
-      this.sherds = C_cpmlbyix.m_aivswlnd(nbt);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
+      this.sherds = Sherds.fromNbt(nbt);
       if (!this.readLootTableNbt(nbt)) {
          if (nbt.contains("item", NbtElement.COMPOUND_TYPE)) {
-            this.stack = (ItemStack)ItemStack.m_izgziaft(arg2, nbt.getCompound("item")).orElse(ItemStack.EMPTY);
+            this.stack = (ItemStack)ItemStack.fromNbtOptional(lookupProvider, nbt.getCompound("item")).orElse(ItemStack.EMPTY);
          } else {
             this.stack = ItemStack.EMPTY;
          }
@@ -136,9 +135,9 @@
 
    /**
     * @mapping {@literal hashed m_rimhwmec Lnet/minecraft/unmapped/C_snnddtnv;m_rimhwmec()Lnet/minecraft/unmapped/C_cpmlbyix;}
-    * @mapping {@literal named getSherds Lnet/minecraft/block/entity/DecoratedPotBlockEntity;getSherds()Lnet/minecraft/unmapped/C_cpmlbyix;}
+    * @mapping {@literal named getSherds Lnet/minecraft/block/entity/DecoratedPotBlockEntity;getSherds()Lnet/minecraft/block/entity/Sherds;}
     */
-   public C_cpmlbyix getSherds() {
+   public Sherds getSherds() {
       return this.sherds;
    }
 
@@ -147,7 +146,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());
    }
 
    /**
@@ -156,16 +155,17 @@
     */
    public ItemStack asStack() {
       ItemStack lv = Items.DECORATED_POT.getDefaultStack();
-      lv.m_vchnqfkp(this.m_wiiwewxr());
+      lv.applyComponents(this.m_wiiwewxr());
       return lv;
    }
 
    /**
-    * 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/block/entity/Sherds;)Lnet/minecraft/item/ItemStack;}
     */
-   public static ItemStack m_qjeeptjd(C_cpmlbyix arg) {
+   public static ItemStack m_qjeeptjd(Sherds value) {
       ItemStack lv = Items.DECORATED_POT.getDefaultStack();
-      lv.m_zakagwqa(C_icwdaizi.POT_DECORATIONS, arg);
+      lv.set(DataComponentTypes.POT_DECORATIONS, value);
       return lv;
    }
 
@@ -206,18 +206,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, ContainerContentsComponent.fromStacks(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, Sherds.DEFAULT);
+      this.stack = arg.getOrDefault(DataComponentTypes.CONTAINER, ContainerContentsComponent.DEFAULT).copyFirstStack();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/entity/DispenserBlockEntity.java namedSrc/net/minecraft/block/entity/DispenserBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DispenserBlockEntity.java	2024-03-14 03:09:57.794084474 +0000
+++ namedSrc/net/minecraft/block/entity/DispenserBlockEntity.java	2024-03-14 03:08:48.934857372 +0000
@@ -98,11 +98,11 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
       if (!this.readLootTableNbt(nbt)) {
-         Inventories.readNbt(nbt, this.inventory, arg2);
+         Inventories.readNbt(nbt, this.inventory, lookupProvider);
       }
    }
 
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-14 03:09:57.782084609 +0000
+++ namedSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java	2024-03-14 03:08:48.922857508 +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;
@@ -105,10 +105,10 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), arg2);
+         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), lookupProvider);
       }
    }
 
@@ -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/EndGatewayBlockEntity.java namedSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java	2024-03-14 03:09:57.882083486 +0000
+++ namedSrc/net/minecraft/block/entity/EndGatewayBlockEntity.java	2024-03-14 03:08:49.022856381 +0000
@@ -118,8 +118,8 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.age = nbt.getLong("Age");
       NbtHelper.toBlockPos(nbt, "exit_portal").filter(World::isValid).ifPresent(pos -> this.exitPortalPos = pos);
       this.exactTeleport = nbt.getBoolean("ExactTeleport");
diff -bur namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java namedSrc/net/minecraft/block/entity/HopperBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/HopperBlockEntity.java	2024-03-14 03:09:57.690085643 +0000
+++ namedSrc/net/minecraft/block/entity/HopperBlockEntity.java	2024-03-14 03:08:48.774859175 +0000
@@ -81,11 +81,11 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
       if (!this.readLootTableNbt(nbt)) {
-         Inventories.readNbt(nbt, this.inventory, arg2);
+         Inventories.readNbt(nbt, this.inventory, lookupProvider);
       }
 
       this.transferCooldown = nbt.getInt("TransferCooldown");
diff -bur namedTargetSrc/net/minecraft/block/entity/JigsawBlockEntity.java namedSrc/net/minecraft/block/entity/JigsawBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/JigsawBlockEntity.java	2024-03-14 03:09:57.710085418 +0000
+++ namedSrc/net/minecraft/block/entity/JigsawBlockEntity.java	2024-03-14 03:08:48.810858769 +0000
@@ -235,8 +235,8 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.name = new Identifier(nbt.getString("name"));
       this.target = new Identifier(nbt.getString("target"));
       this.pool = RegistryKey.of(RegistryKeys.STRUCTURE_POOL, new Identifier(nbt.getString("pool")));
diff -bur namedTargetSrc/net/minecraft/block/entity/JukeboxBlockEntity.java namedSrc/net/minecraft/block/entity/JukeboxBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/JukeboxBlockEntity.java	2024-03-14 03:09:57.818084204 +0000
+++ namedSrc/net/minecraft/block/entity/JukeboxBlockEntity.java	2024-03-14 03:08:48.958857102 +0000
@@ -73,10 +73,10 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       if (nbt.contains("RecordItem", NbtElement.COMPOUND_TYPE)) {
-         this.stack = (ItemStack)ItemStack.m_izgziaft(arg2, nbt.getCompound("RecordItem")).orElse(ItemStack.EMPTY);
+         this.stack = (ItemStack)ItemStack.fromNbtOptional(lookupProvider, nbt.getCompound("RecordItem")).orElse(ItemStack.EMPTY);
       } else {
          this.stack = ItemStack.EMPTY;
       }
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-14 03:09:57.786084564 +0000
+++ namedSrc/net/minecraft/block/entity/LecternBlockEntity.java	2024-03-14 03:08:48.926857463 +0000
@@ -2,6 +2,9 @@
 
 import net.minecraft.block.BlockState;
 import net.minecraft.block.LecternBlock;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.WritableBookContentComponent;
+import net.minecraft.component.type.WrittenBookContentComponent;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.Inventory;
@@ -19,9 +22,6 @@
 import net.minecraft.server.command.ServerCommandSource;
 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;
 import net.minecraft.util.math.MathHelper;
@@ -334,10 +334,10 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       if (nbt.contains("Book", NbtElement.COMPOUND_TYPE)) {
-         this.book = this.resolveBook((ItemStack)ItemStack.m_izgziaft(arg2, nbt.getCompound("Book")).orElse(ItemStack.EMPTY), null);
+         this.book = this.resolveBook((ItemStack)ItemStack.fromNbtOptional(lookupProvider, nbt.getCompound("Book")).orElse(ItemStack.EMPTY), null);
       } else {
          this.book = ItemStack.EMPTY;
       }
@@ -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);
+      WrittenBookContentComponent 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);
+         WritableBookContentComponent 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-14 03:09:57.818084204 +0000
+++ namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-03-14 03:08:48.962857057 +0000
@@ -1,6 +1,9 @@
 package net.minecraft.block.entity;
 
 import net.minecraft.block.BlockState;
+import net.minecraft.component.DataComponentMap;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.ContainerContentsComponent;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.ContainerLock;
@@ -15,9 +18,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;
 import net.minecraft.util.math.BlockPos;
@@ -52,11 +52,11 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.lock = ContainerLock.fromNbt(nbt);
       if (nbt.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), arg2);
+         this.customName = Text.Serializer.m_npeyudcr(nbt.getString("CustomName"), lookupProvider);
       }
    }
 
@@ -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, ContainerContentsComponent.DEFAULT).copyTo(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, ContainerContentsComponent.fromStacks(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-14 03:09:57.714085373 +0000
+++ namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-03-14 03:08:48.814858724 +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.component.type.ContainerLootComponent;
 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);
+      ContainerLootComponent 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 ContainerLootComponent(this.lootTableId, this.lootTableSeed));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java namedSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java	2024-03-14 03:09:57.754084924 +0000
+++ namedSrc/net/minecraft/block/entity/MobSpawnerBlockEntity.java	2024-03-14 03:08:48.878858003 +0000
@@ -59,8 +59,8 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.logic.readNbt(this.world, this.pos, nbt);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java namedSrc/net/minecraft/block/entity/PistonBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-03-14 03:09:57.866083665 +0000
+++ namedSrc/net/minecraft/block/entity/PistonBlockEntity.java	2024-03-14 03:08:49.006856561 +0000
@@ -470,8 +470,8 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       HolderProvider<Block> lv = (HolderProvider<Block>)(this.world != null ? this.world.filteredLookup(RegistryKeys.BLOCK) : Registries.BLOCK.asLookup());
       this.movedState = NbtHelper.toBlockState(lv, nbt.getCompound("blockState"));
       this.facing = Direction.byId(nbt.getInt("facing"));
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java namedSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java	2024-03-14 03:09:57.830084069 +0000
+++ namedSrc/net/minecraft/block/entity/SculkCatalystBlockEntity.java	2024-03-14 03:08:48.974856922 +0000
@@ -58,7 +58,7 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
       this.catalystListener.sculkBehavior.read(nbt);
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java namedSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java	2024-03-14 03:09:57.858083755 +0000
+++ namedSrc/net/minecraft/block/entity/SculkSensorBlockEntity.java	2024-03-14 03:08:48.998856651 +0000
@@ -81,8 +81,8 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.lastVibrationFrequency = nbt.getInt("last_vibration_frequency");
       if (nbt.contains("listener", NbtElement.COMPOUND_TYPE)) {
          VibrationManager.Data.codec
diff -bur namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2024-03-14 03:09:57.854083800 +0000
+++ namedSrc/net/minecraft/block/entity/SculkShriekerBlockEntity.java	2024-03-14 03:08:48.994856696 +0000
@@ -144,8 +144,8 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       if (nbt.contains("warning_level", NbtElement.NUMBER_TYPE)) {
          this.warningLevel = nbt.getInt("warning_level");
       }
Only in namedSrc/net/minecraft/block/entity: Sherds.java
diff -bur namedTargetSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java namedSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java	2024-03-14 03:09:57.778084654 +0000
+++ namedSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java	2024-03-14 03:08:48.918857553 +0000
@@ -303,9 +303,9 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
-      this.readInventoryNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
+      this.readInventoryNbt(nbt, lookupProvider);
    }
 
    /**
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-14 03:09:57.886083441 +0000
+++ namedSrc/net/minecraft/block/entity/SignBlockEntity.java	2024-03-14 03:08:49.026856336 +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);
@@ -172,9 +172,9 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
-      DynamicOps<NbtElement> dynamicOps = arg2.m_uwaazyzq(NbtOps.INSTANCE);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
+      DynamicOps<NbtElement> dynamicOps = lookupProvider.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-14 03:09:57.878083531 +0000
+++ namedSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-03-14 03:08:49.022856381 +0000
@@ -14,6 +14,9 @@
 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.component.type.ProfileComponent;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtOps;
@@ -21,9 +24,6 @@
 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;
@@ -79,10 +79,10 @@
    };
    /**
     * @mapping {@literal hashed f_fwgdpesg Lnet/minecraft/unmapped/C_vrhaavsg;f_fwgdpesg:Lnet/minecraft/unmapped/C_iqgmrwok;}
-    * @mapping {@literal named owner Lnet/minecraft/block/entity/SkullBlockEntity;owner:Lnet/minecraft/unmapped/C_iqgmrwok;}
+    * @mapping {@literal named owner Lnet/minecraft/block/entity/SkullBlockEntity;owner:Lnet/minecraft/component/type/ProfileComponent;}
     */
    @Nullable
-   private C_iqgmrwok owner;
+   private ProfileComponent owner;
    /**
     * @mapping {@literal hashed f_qnsojtvb Lnet/minecraft/unmapped/C_vrhaavsg;f_qnsojtvb:Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named noteBlockSound Lnet/minecraft/block/entity/SkullBlockEntity;noteBlockSound:Lnet/minecraft/util/Identifier;}
@@ -170,7 +170,7 @@
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.writeNbt(nbt, arg2);
       if (this.owner != null) {
-         nbt.put("profile", Util.getOrThrow(C_iqgmrwok.f_bmdljmxz.encodeStart(NbtOps.INSTANCE, this.owner), IllegalStateException::new));
+         nbt.put("profile", Util.getOrThrow(ProfileComponent.CODEC.encodeStart(NbtOps.INSTANCE, this.owner), IllegalStateException::new));
       }
 
       if (this.noteBlockSound != null) {
@@ -186,10 +186,10 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       if (nbt.contains("profile")) {
-         C_iqgmrwok.f_bmdljmxz
+         ProfileComponent.CODEC
             .parse(NbtOps.INSTANCE, nbt.get("profile"))
             .resultOrPartial(string -> LOGGER.error("Failed to load profile from player head: {}", string))
             .ifPresent(this::setOwner);
@@ -200,7 +200,7 @@
       }
 
       if (nbt.contains("custom_name", NbtElement.STRING_TYPE)) {
-         this.f_vvhynfvk = Text.Serializer.m_npeyudcr(nbt.getString("custom_name"), arg2);
+         this.f_vvhynfvk = Text.Serializer.m_npeyudcr(nbt.getString("custom_name"), lookupProvider);
       } else {
          this.f_vvhynfvk = null;
       }
@@ -229,10 +229,10 @@
 
    /**
     * @mapping {@literal hashed m_fanntxcn Lnet/minecraft/unmapped/C_vrhaavsg;m_fanntxcn()Lnet/minecraft/unmapped/C_iqgmrwok;}
-    * @mapping {@literal named getOwner Lnet/minecraft/block/entity/SkullBlockEntity;getOwner()Lnet/minecraft/unmapped/C_iqgmrwok;}
+    * @mapping {@literal named getOwner Lnet/minecraft/block/entity/SkullBlockEntity;getOwner()Lnet/minecraft/component/type/ProfileComponent;}
     */
    @Nullable
-   public C_iqgmrwok getOwner() {
+   public ProfileComponent getOwner() {
       return this.owner;
    }
 
@@ -263,9 +263,9 @@
 
    /**
     * @mapping {@literal hashed m_nirpgzsb Lnet/minecraft/unmapped/C_vrhaavsg;m_nirpgzsb(Lnet/minecraft/unmapped/C_iqgmrwok;)V}
-    * @mapping {@literal named setOwner Lnet/minecraft/block/entity/SkullBlockEntity;setOwner(Lnet/minecraft/unmapped/C_iqgmrwok;)V}
+    * @mapping {@literal named setOwner Lnet/minecraft/block/entity/SkullBlockEntity;setOwner(Lnet/minecraft/component/type/ProfileComponent;)V}
     */
-   public void setOwner(@Nullable C_iqgmrwok arg) {
+   public void setOwner(@Nullable ProfileComponent arg) {
       synchronized (this) {
          this.owner = arg;
       }
@@ -278,8 +278,8 @@
     * @mapping {@literal named loadOwnerProperties Lnet/minecraft/block/entity/SkullBlockEntity;loadOwnerProperties()V}
     */
    private void loadOwnerProperties() {
-      if (this.owner != null && !this.owner.m_pnmdffid()) {
-         this.owner.m_frcmbhum().thenAcceptAsync(arg -> {
+      if (this.owner != null && !this.owner.isResolved()) {
+         this.owner.resolve().thenAcceptAsync(arg -> {
             this.owner = arg;
             this.markDirty();
          }, NONNULL_EXECUTOR);
@@ -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/StructureBlockBlockEntity.java namedSrc/net/minecraft/block/entity/StructureBlockBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/StructureBlockBlockEntity.java	2024-03-14 03:09:57.850083845 +0000
+++ namedSrc/net/minecraft/block/entity/StructureBlockBlockEntity.java	2024-03-14 03:08:48.990856742 +0000
@@ -168,8 +168,8 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.setStructureName(nbt.getString("name"));
       this.author = nbt.getString("author");
       this.metadata = nbt.getString("metadata");
diff -bur namedTargetSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java namedSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java	2024-03-14 03:09:57.842083935 +0000
+++ namedSrc/net/minecraft/block/entity/TrialSpawnerBlockEntity.java	2024-03-14 03:08:48.986856787 +0000
@@ -50,8 +50,8 @@
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
       this.spawnerLogic.getCodec().parse(NbtOps.INSTANCE, nbt).resultOrPartial(LOGGER::error).ifPresent(logic -> this.spawnerLogic = logic);
       if (this.world != null) {
          this.updateListeners();
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-14 03:09:57.770084744 +0000
+++ namedSrc/net/minecraft/block/entity/VaultBlockEntity.java	2024-03-14 03:08:48.902857733 +0000
@@ -113,16 +113,16 @@
     * @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);
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public void readNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
-      super.readNbt(nbt, arg2);
-      DynamicOps<NbtElement> dynamicOps = arg2.m_uwaazyzq(NbtOps.INSTANCE);
+   public void readNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
+      super.readNbt(nbt, lookupProvider);
+      DynamicOps<NbtElement> dynamicOps = lookupProvider.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/entity/ViewerCountManager.java namedSrc/net/minecraft/block/entity/ViewerCountManager.java
--- namedTargetSrc/net/minecraft/block/entity/ViewerCountManager.java	2024-03-14 03:09:57.722085283 +0000
+++ namedSrc/net/minecraft/block/entity/ViewerCountManager.java	2024-03-14 03:08:48.826858589 +0000
@@ -78,7 +78,7 @@
       }
 
       this.onViewerCountUpdate(world, pos, state, i, this.viewerCount);
-      this.f_qmcpzfvt = Math.max(player.m_qdltphmv(), this.f_qmcpzfvt);
+      this.f_qmcpzfvt = Math.max(player.getBlockInteractionRange(), this.f_qmcpzfvt);
    }
 
    /**
@@ -115,7 +115,7 @@
       this.f_qmcpzfvt = 0.0;
 
       for (PlayerEntity lv : list) {
-         this.f_qmcpzfvt = Math.max(lv.m_qdltphmv(), this.f_qmcpzfvt);
+         this.f_qmcpzfvt = Math.max(lv.getBlockInteractionRange(), this.f_qmcpzfvt);
       }
 
       int i = list.size();
diff -bur namedTargetSrc/net/minecraft/block/FlowerBlock.java namedSrc/net/minecraft/block/FlowerBlock.java
--- namedTargetSrc/net/minecraft/block/FlowerBlock.java	2024-03-14 03:09:57.854083800 +0000
+++ namedSrc/net/minecraft/block/FlowerBlock.java	2024-03-14 03:08:48.994856696 +0000
@@ -3,10 +3,10 @@
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.List;
+import net.minecraft.component.type.SuspiciousStewEffectsComponent;
 import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.item.SuspiciousStewEffectContainer;
 import net.minecraft.registry.Holder;
-import net.minecraft.unmapped.C_ceasgpks;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -22,7 +22,8 @@
     * @mapping {@literal hashed f_itvocsaf Lnet/minecraft/unmapped/C_zhojkkij;f_itvocsaf:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named SUSPICIOUS_STEW_CODEC Lnet/minecraft/block/FlowerBlock;SUSPICIOUS_STEW_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   protected static final MapCodec<C_ceasgpks> SUSPICIOUS_STEW_CODEC = C_ceasgpks.CODEC.fieldOf("suspicious_stew_effects");
+   protected static final MapCodec<SuspiciousStewEffectsComponent> SUSPICIOUS_STEW_CODEC = SuspiciousStewEffectsComponent.CODEC
+      .fieldOf("suspicious_stew_effects");
    /**
     * @mapping {@literal hashed f_jprrctms Lnet/minecraft/unmapped/C_zhojkkij;f_jprrctms:Lcom/mojang/serialization/MapCodec;}
     * @mapping {@literal named CODEC Lnet/minecraft/block/FlowerBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
@@ -42,9 +43,9 @@
    protected static final VoxelShape SHAPE = Block.createCuboidShape(5.0, 0.0, 5.0, 11.0, 10.0, 11.0);
    /**
     * @mapping {@literal hashed f_gsqgyhrp Lnet/minecraft/unmapped/C_zhojkkij;f_gsqgyhrp:Lnet/minecraft/unmapped/C_ceasgpks;}
-    * @mapping {@literal named suspiciousStewEffects Lnet/minecraft/block/FlowerBlock;suspiciousStewEffects:Lnet/minecraft/unmapped/C_ceasgpks;}
+    * @mapping {@literal named suspiciousStewEffects Lnet/minecraft/block/FlowerBlock;suspiciousStewEffects:Lnet/minecraft/component/type/SuspiciousStewEffectsComponent;}
     */
-   private final C_ceasgpks suspiciousStewEffects;
+   private final SuspiciousStewEffectsComponent suspiciousStewEffects;
 
    /**
     * Mapping not found
@@ -64,19 +65,19 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zhojkkij;<init>(Lnet/minecraft/unmapped/C_ceasgpks;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/FlowerBlock;<init>(Lnet/minecraft/unmapped/C_ceasgpks;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/FlowerBlock;<init>(Lnet/minecraft/component/type/SuspiciousStewEffectsComponent;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public FlowerBlock(C_ceasgpks suspiciousStewEffects, AbstractBlock.Settings settings) {
+   public FlowerBlock(SuspiciousStewEffectsComponent suspiciousStewEffects, AbstractBlock.Settings settings) {
       super(settings);
       this.suspiciousStewEffects = suspiciousStewEffects;
    }
 
    /**
     * @mapping {@literal hashed m_eohzikrf Lnet/minecraft/unmapped/C_zhojkkij;m_eohzikrf(Lnet/minecraft/unmapped/C_cjzoxshv;F)Lnet/minecraft/unmapped/C_ceasgpks;}
-    * @mapping {@literal named getEffects Lnet/minecraft/block/FlowerBlock;getEffects(Lnet/minecraft/registry/Holder;F)Lnet/minecraft/unmapped/C_ceasgpks;}
+    * @mapping {@literal named getEffects Lnet/minecraft/block/FlowerBlock;getEffects(Lnet/minecraft/registry/Holder;F)Lnet/minecraft/component/type/SuspiciousStewEffectsComponent;}
     */
-   protected static C_ceasgpks getEffects(Holder<StatusEffect> effect, float f) {
-      return new C_ceasgpks(List.of(new C_ceasgpks.C_wrezxwor(effect, MathHelper.floor(f * 20.0F))));
+   protected static SuspiciousStewEffectsComponent getEffects(Holder<StatusEffect> effect, float f) {
+      return new SuspiciousStewEffectsComponent(List.of(new SuspiciousStewEffectsComponent.Entry(effect, MathHelper.floor(f * 20.0F))));
    }
 
    /**
@@ -92,7 +93,7 @@
     * Mapping not found
     */
    @Override
-   public C_ceasgpks getAllEffects() {
+   public SuspiciousStewEffectsComponent getAllEffects() {
       return this.suspiciousStewEffects;
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/FlowerPotBlock.java namedSrc/net/minecraft/block/FlowerPotBlock.java
--- namedTargetSrc/net/minecraft/block/FlowerPotBlock.java	2024-03-14 03:09:57.798084429 +0000
+++ namedSrc/net/minecraft/block/FlowerPotBlock.java	2024-03-14 03:08:48.938857327 +0000
@@ -98,7 +98,7 @@
          world.setBlockState(pos, lv2, Block.NOTIFY_ALL);
          world.emitGameEvent(player, GameEvent.BLOCK_CHANGE, pos);
          player.incrementStat(Stats.POT_FLOWER);
-         stack.m_tyuugrfg(1, player);
+         stack.consume(1, player);
          return InteractionResult.of(world.isClient);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/JukeboxBlock.java namedSrc/net/minecraft/block/JukeboxBlock.java
--- namedTargetSrc/net/minecraft/block/JukeboxBlock.java	2024-03-14 03:09:57.722085283 +0000
+++ namedSrc/net/minecraft/block/JukeboxBlock.java	2024-03-14 03:08:48.826858589 +0000
@@ -5,6 +5,8 @@
 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.component.type.NbtComponent;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
@@ -12,8 +14,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;
 import net.minecraft.util.math.BlockPos;
@@ -61,8 +61,8 @@
    @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);
-      if (lv.m_ongxyjew("RecordItem")) {
+      NbtComponent lv = stack.getOrDefault(DataComponentTypes.BLOCK_ENTITY_DATA, NbtComponent.DEFAULT);
+      if (lv.containsKey("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-14 03:09:57.770084744 +0000
+++ namedSrc/net/minecraft/block/LecternBlock.java	2024-03-14 03:08:48.902857733 +0000
@@ -3,6 +3,8 @@
 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.component.type.NbtComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.ai.pathing.NavigationType;
@@ -19,8 +21,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;
 import net.minecraft.util.BlockRotation;
@@ -187,8 +187,8 @@
       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);
-         if (lv4.m_ongxyjew("Book")) {
+         NbtComponent lv4 = lv2.getOrDefault(DataComponentTypes.BLOCK_ENTITY_DATA, NbtComponent.DEFAULT);
+         if (lv4.containsKey("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-14 03:09:57.782084609 +0000
+++ namedSrc/net/minecraft/block/LightBlock.java	2024-03-14 03:08:48.918857553 +0000
@@ -2,6 +2,8 @@
 
 import com.mojang.serialization.MapCodec;
 import java.util.function.ToIntFunction;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.BlockStateComponent;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
@@ -11,8 +13,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;
 import net.minecraft.util.math.BlockPos;
@@ -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.set(DataComponentTypes.BLOCK_STATE, BlockStateComponent.DEFAULT.with(LEVEL_15, lightLevel));
       }
 
       return stack;
diff -bur namedTargetSrc/net/minecraft/block/RespawnAnchorBlock.java namedSrc/net/minecraft/block/RespawnAnchorBlock.java
--- namedTargetSrc/net/minecraft/block/RespawnAnchorBlock.java	2024-03-14 03:09:57.842083935 +0000
+++ namedSrc/net/minecraft/block/RespawnAnchorBlock.java	2024-03-14 03:08:48.986856787 +0000
@@ -112,7 +112,7 @@
    protected InteractionResult onInteract(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult result) {
       if (isChargeItem(stack) && canCharge(state)) {
          charge(player, world, pos, state);
-         stack.m_tyuugrfg(1, player);
+         stack.consume(1, player);
          return InteractionResult.of(world.isClient);
       } else {
          return hand == Hand.MAIN_HAND && isChargeItem(player.getStackInHand(Hand.OFF_HAND)) && canCharge(state)
diff -bur namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java namedSrc/net/minecraft/block/ShulkerBoxBlock.java
--- namedTargetSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-03-14 03:09:57.794084474 +0000
+++ namedSrc/net/minecraft/block/ShulkerBoxBlock.java	2024-03-14 03:08:48.934857372 +0000
@@ -11,6 +11,8 @@
 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.component.type.ContainerContentsComponent;
 import net.minecraft.entity.ItemEntity;
 import net.minecraft.entity.mob.PiglinBrain;
 import net.minecraft.entity.mob.ShulkerEntity;
@@ -26,8 +28,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;
 import net.minecraft.util.BlockRotation;
@@ -230,7 +230,7 @@
       if (lv instanceof ShulkerBoxBlockEntity lv2) {
          if (!world.isClient && player.isCreative() && !lv2.isEmpty()) {
             ItemStack lv3 = getItemStack(this.getColor());
-            lv3.m_vchnqfkp(lv.m_wiiwewxr());
+            lv3.applyComponents(lv.m_wiiwewxr());
             ItemEntity lv4 = new ItemEntity(world, (double)pos.getX() + 0.5, (double)pos.getY() + 0.5, (double)pos.getZ() + 0.5, lv3);
             lv4.setToDefaultPickupDelay();
             world.spawnEntity(lv4);
@@ -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, ContainerContentsComponent.DEFAULT)) {
          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-14 03:09:57.802084384 +0000
+++ namedSrc/net/minecraft/block/Spawner.java	2024-03-14 03:08:48.942857282 +0000
@@ -1,6 +1,8 @@
 package net.minecraft.block;
 
 import java.util.List;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.NbtComponent;
 import net.minecraft.entity.EntityType;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
@@ -8,8 +10,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;
 import net.minecraft.util.random.RandomGenerator;
@@ -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, NbtComponent.DEFAULT).getNbt();
       Identifier lv2 = getEntityFromNbt(lv, dataKey);
       return lv2 != null
          ? (Text)Registries.ENTITY_TYPE
diff -bur namedTargetSrc/net/minecraft/block/WitherRoseBlock.java namedSrc/net/minecraft/block/WitherRoseBlock.java
--- namedTargetSrc/net/minecraft/block/WitherRoseBlock.java	2024-03-14 03:09:57.762084834 +0000
+++ namedSrc/net/minecraft/block/WitherRoseBlock.java	2024-03-14 03:08:48.894857823 +0000
@@ -2,6 +2,7 @@
 
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.component.type.SuspiciousStewEffectsComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.effect.StatusEffect;
@@ -9,7 +10,6 @@
 import net.minecraft.entity.effect.StatusEffects;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.Holder;
-import net.minecraft.unmapped.C_ceasgpks;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.random.RandomGenerator;
@@ -49,9 +49,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_gigziqfv;<init>(Lnet/minecraft/unmapped/C_ceasgpks;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/WitherRoseBlock;<init>(Lnet/minecraft/unmapped/C_ceasgpks;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/WitherRoseBlock;<init>(Lnet/minecraft/component/type/SuspiciousStewEffectsComponent;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public WitherRoseBlock(C_ceasgpks arg, AbstractBlock.Settings settings) {
+   public WitherRoseBlock(SuspiciousStewEffectsComponent arg, AbstractBlock.Settings settings) {
       super(arg, settings);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/color/block/BlockColors.java namedSrc/net/minecraft/client/color/block/BlockColors.java
--- namedTargetSrc/net/minecraft/client/color/block/BlockColors.java	2024-03-14 03:09:57.834084025 +0000
+++ namedSrc/net/minecraft/client/color/block/BlockColors.java	2024-03-14 03:08:48.974856922 +0000
@@ -101,7 +101,7 @@
       lv.registerColorProvider((state, world, pos, tintIndex) -> -2046180, Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM);
       lv.registerColorProvider((state, world, pos, tintIndex) -> {
          int j = (Integer)state.get(StemBlock.AGE);
-         return ColorUtil.ARGB32.m_jdoowdec(j * 32, 255 - j * 8, j * 4);
+         return ColorUtil.ARGB32.getArgb(j * 32, 255 - j * 8, j * 4);
       }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
       lv.registerColorProperty(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
       lv.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? -14647248 : -9321636, Blocks.LILY_PAD);
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-14 03:09:57.750084969 +0000
+++ namedSrc/net/minecraft/client/color/item/ItemColors.java	2024-03-14 03:08:48.870858093 +0000
@@ -9,6 +9,11 @@
 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.component.type.DyedColorComponent;
+import net.minecraft.component.type.FireworkExplosionComponent;
+import net.minecraft.component.type.MapColorComponent;
+import net.minecraft.component.type.PotionContentsComponent;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemConvertible;
@@ -16,11 +21,6 @@
 import net.minecraft.item.Items;
 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;
 import net.minecraft.util.collection.IdList;
 
 /**
@@ -47,26 +47,26 @@
    public static ItemColors create(BlockColors blockColors) {
       ItemColors lv = new ItemColors();
       lv.register(
-         (stack, tintIndex) -> tintIndex > 0 ? -1 : C_jlijuwug.m_xkqzbejo(stack, -6265536),
+         (stack, tintIndex) -> tintIndex > 0 ? -1 : DyedColorComponent.getColorOrDefault(stack, -6265536),
          Items.LEATHER_HELMET,
          Items.LEATHER_CHESTPLATE,
          Items.LEATHER_LEGGINGS,
          Items.LEATHER_BOOTS,
          Items.LEATHER_HORSE_ARMOR
       );
-      lv.register((stack, tintIndex) -> tintIndex != 1 ? -1 : C_jlijuwug.m_xkqzbejo(stack, 0), Items.WOLF_ARMOR);
+      lv.register((stack, tintIndex) -> tintIndex != 1 ? -1 : DyedColorComponent.getColorOrDefault(stack, 0), Items.WOLF_ARMOR);
       lv.register((stack, tintIndex) -> GrassColors.getColor(0.5, 1.0), Blocks.TALL_GRASS, Blocks.LARGE_FERN);
       lv.register((stack, tintIndex) -> {
          if (tintIndex != 1) {
             return -1;
          } else {
-            C_ibwugxba lvx = stack.m_dnvbhafp(C_icwdaizi.FIREWORK_EXPLOSION);
+            FireworkExplosionComponent lvx = stack.get(DataComponentTypes.FIREWORK_EXPLOSION);
             IntList intList = lvx != null ? lvx.colors() : IntList.of();
             int j = intList.size();
             if (j == 0) {
                return -7697782;
             } else if (j == 1) {
-               return ColorUtil.ARGB32.m_xrcgvmaq(intList.getInt(0));
+               return ColorUtil.ARGB32.opaque(intList.getInt(0));
             } else {
                int k = 0;
                int l = 0;
@@ -79,14 +79,14 @@
                   m += ColorUtil.ARGB32.getBlue(o);
                }
 
-               return ColorUtil.ARGB32.m_jdoowdec(k / j, l / j, m / j);
+               return ColorUtil.ARGB32.getArgb(k / j, l / j, m / j);
             }
          }
       }, Items.FIREWORK_STAR);
       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.opaque(stack.getOrDefault(DataComponentTypes.POTION_CONTENTS, PotionContentsComponent.DEFAULT).getColor()),
          Items.POTION,
          Items.SPLASH_POTION,
          Items.LINGERING_POTION,
@@ -94,7 +94,7 @@
       );
 
       for (SpawnEggItem lv2 : SpawnEggItem.getAll()) {
-         lv.register((stack, tintIndex) -> ColorUtil.ARGB32.m_xrcgvmaq(lv2.getColor(tintIndex)), lv2);
+         lv.register((stack, tintIndex) -> ColorUtil.ARGB32.opaque(lv2.getColor(tintIndex)), lv2);
       }
 
       lv.register(
@@ -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.opaque(stack.getOrDefault(DataComponentTypes.MAP_COLOR, MapColorComponent.DEFAULT).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-14 03:09:57.666085912 +0000
+++ namedSrc/net/minecraft/client/gui/GuiGraphics.java	2024-03-14 03:08:48.738859581 +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-14 03:09:57.750084969 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-03-14 03:08:48.870858093 +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);
          }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/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-14 03:09:57.854083800 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AnvilScreen.java	2024-03-14 03:08:48.994856696 +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-14 03:09:57.810084294 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BookEditScreen.java	2024-03-14 03:08:48.954857147 +0000
@@ -20,16 +20,16 @@
 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.component.type.WritableBookContentComponent;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
+import net.minecraft.network.message.Filterable;
 import net.minecraft.network.packet.c2s.play.BookUpdateC2SPacket;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.OrderedText;
 import net.minecraft.text.Style;
 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,9 +214,9 @@
       this.player = player;
       this.itemStack = itemStack;
       this.hand = hand;
-      C_caqjiyos lv = itemStack.m_dnvbhafp(C_icwdaizi.WRITABLE_BOOK_CONTENT);
+      WritableBookContentComponent lv = itemStack.get(DataComponentTypes.WRITABLE_BOOK_CONTENT);
       if (lv != null) {
-         lv.m_ydlifigh(MinecraftClient.getInstance().shouldFilterText()).forEach(this.pages::add);
+         lv.streamPageContents(MinecraftClient.getInstance().shouldFilterText()).forEach(this.pages::add);
       }
 
       if (this.pages.isEmpty()) {
@@ -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.set(DataComponentTypes.WRITABLE_BOOK_CONTENT, new WritableBookContentComponent(this.pages.stream().map(Filterable::passthrough).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-14 03:09:57.746085013 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/BookScreen.java	2024-03-14 03:08:48.862858184 +0000
@@ -10,6 +10,9 @@
 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.component.type.WritableBookContentComponent;
+import net.minecraft.component.type.WrittenBookContentComponent;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.ClickEvent;
 import net.minecraft.text.CommonTexts;
@@ -17,9 +20,6 @@
 import net.minecraft.text.StringVisitable;
 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;
 import org.jetbrains.annotations.Nullable;
@@ -419,12 +419,12 @@
       @Nullable
       public static BookScreen.Contents create(ItemStack stack) {
          boolean bl = MinecraftClient.getInstance().shouldFilterText();
-         C_xfpcozbo lv = stack.m_dnvbhafp(C_icwdaizi.WRITTEN_BOOK_CONTENT);
+         WrittenBookContentComponent lv = stack.get(DataComponentTypes.WRITTEN_BOOK_CONTENT);
          if (lv != null) {
-            return new BookScreen.Contents(lv.m_hvzjkpvt(bl));
+            return new BookScreen.Contents(lv.getPages(bl));
          } else {
-            C_caqjiyos lv2 = stack.m_dnvbhafp(C_icwdaizi.WRITABLE_BOOK_CONTENT);
-            return lv2 != null ? new BookScreen.Contents(lv2.m_ydlifigh(bl).map(Text::literal).toList()) : null;
+            WritableBookContentComponent lv2 = stack.get(DataComponentTypes.WRITABLE_BOOK_CONTENT);
+            return lv2 != null ? new BookScreen.Contents(lv2.streamPageContents(bl).map(Text::literal).toList()) : null;
          }
       }
    }
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-14 03:09:57.686085688 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2024-03-14 03:08:48.766859265 +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-14 03:09:57.698085553 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen.java	2024-03-14 03:08:48.786859040 +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.set(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.set(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-14 03:09:57.822084159 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/LoomScreen.java	2024-03-14 03:08:48.962857057 +0000
@@ -14,6 +14,8 @@
 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.component.type.BannerPatternsComponent;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.item.BannerItem;
 import net.minecraft.item.ItemStack;
@@ -22,8 +24,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;
 import net.minecraft.util.math.MathHelper;
@@ -132,10 +132,10 @@
    private ModelPart bannerField;
    /**
     * @mapping {@literal hashed f_kvxnjgfq Lnet/minecraft/unmapped/C_sdfeaszq;f_kvxnjgfq:Lnet/minecraft/unmapped/C_wwbphpbp;}
-    * @mapping {@literal named bannerPatterns Lnet/minecraft/client/gui/screen/ingame/LoomScreen;bannerPatterns:Lnet/minecraft/unmapped/C_wwbphpbp;}
+    * @mapping {@literal named bannerPatterns Lnet/minecraft/client/gui/screen/ingame/LoomScreen;bannerPatterns:Lnet/minecraft/component/type/BannerPatternsComponent;}
     */
    @Nullable
-   private C_wwbphpbp bannerPatterns;
+   private BannerPatternsComponent bannerPatterns;
    /**
     * @mapping {@literal hashed f_tylacwwq Lnet/minecraft/unmapped/C_sdfeaszq;f_tylacwwq:Lnet/minecraft/unmapped/C_sddaxwyk;}
     * @mapping {@literal named banner Lnet/minecraft/client/gui/screen/ingame/LoomScreen;banner:Lnet/minecraft/item/ItemStack;}
@@ -318,7 +318,7 @@
       lv.scale(0.6666667F, -0.6666667F, -0.6666667F);
       this.bannerField.pitch = 0.0F;
       this.bannerField.pivotY = -32.0F;
-      C_wwbphpbp lv2 = new C_wwbphpbp.C_qnptwkxy().m_icrxuffv(pattern, DyeColor.WHITE).m_xjspjwnb();
+      BannerPatternsComponent lv2 = new BannerPatternsComponent.Builder().add(pattern, DyeColor.WHITE).build();
       BannerBlockEntityRenderer.m_nhcifwci(
          lv, graphics.getVertexConsumers(), 15728880, OverlayTexture.DEFAULT_UV, this.bannerField, ModelLoader.BANNER_BASE, true, DyeColor.GRAY, lv2
       );
@@ -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, BannerPatternsComponent.DEFAULT);
       }
 
       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);
+      BannerPatternsComponent lv5 = lv2.getOrDefault(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
       this.hasTooManyPatterns = lv5.layers().size() >= 6;
       if (this.hasTooManyPatterns) {
          this.bannerPatterns = null;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/SplashOverlay.java namedSrc/net/minecraft/client/gui/screen/SplashOverlay.java
--- namedTargetSrc/net/minecraft/client/gui/screen/SplashOverlay.java	2024-03-14 03:09:57.742085058 +0000
+++ namedSrc/net/minecraft/client/gui/screen/SplashOverlay.java	2024-03-14 03:08:48.854858274 +0000
@@ -41,12 +41,12 @@
     * @mapping {@literal hashed f_jqknlsmc Lnet/minecraft/unmapped/C_gkaoaepd;f_jqknlsmc:I}
     * @mapping {@literal named MOJANG_RED Lnet/minecraft/client/gui/screen/SplashOverlay;MOJANG_RED:I}
     */
-   private static final int MOJANG_RED = ColorUtil.ARGB32.m_jslmgbyf(255, 239, 50, 61);
+   private static final int MOJANG_RED = ColorUtil.ARGB32.getArgb(255, 239, 50, 61);
    /**
     * @mapping {@literal hashed f_vzvshtvj Lnet/minecraft/unmapped/C_gkaoaepd;f_vzvshtvj:I}
     * @mapping {@literal named MONOCHROME_BLACK Lnet/minecraft/client/gui/screen/SplashOverlay;MONOCHROME_BLACK:I}
     */
-   private static final int MONOCHROME_BLACK = ColorUtil.ARGB32.m_jslmgbyf(255, 0, 0, 0);
+   private static final int MONOCHROME_BLACK = ColorUtil.ARGB32.getArgb(255, 0, 0, 0);
    /**
     * @mapping {@literal hashed f_ubsunlzd Lnet/minecraft/unmapped/C_gkaoaepd;f_ubsunlzd:Ljava/util/function/IntSupplier;}
     * @mapping {@literal named BRAND_ARGB Lnet/minecraft/client/gui/screen/SplashOverlay;BRAND_ARGB:Ljava/util/function/IntSupplier;}
@@ -247,7 +247,7 @@
    private void renderProgressBar(GuiGraphics graphics, int minX, int minY, int maxX, int maxY, float opacity) {
       int m = MathHelper.ceil((float)(maxX - minX - 2) * this.progress);
       int n = Math.round(opacity * 255.0F);
-      int o = ColorUtil.ARGB32.m_jslmgbyf(n, 255, 255, 255);
+      int o = ColorUtil.ARGB32.getArgb(n, 255, 255, 255);
       graphics.fill(minX + 2, minY + 2, minX + m, maxY - 2, o);
       graphics.fill(minX + 1, minY, maxX - 1, minY + 1, o);
       graphics.fill(minX + 1, maxY, maxX - 1, maxY - 1, o);
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-14 03:09:57.682085733 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-03-14 03:08:48.762859310 +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/gui/tooltip/BundleTooltipComponent.java namedSrc/net/minecraft/client/gui/tooltip/BundleTooltipComponent.java
--- namedTargetSrc/net/minecraft/client/gui/tooltip/BundleTooltipComponent.java	2024-03-14 03:09:57.670085868 +0000
+++ namedSrc/net/minecraft/client/gui/tooltip/BundleTooltipComponent.java	2024-03-14 03:08:48.738859581 +0000
@@ -5,8 +5,8 @@
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import net.minecraft.component.type.BundleContentsComponent;
 import net.minecraft.item.ItemStack;
-import net.minecraft.unmapped.C_rdabfjzm;
 import net.minecraft.util.Identifier;
 
 /**
@@ -43,12 +43,12 @@
    /**
     * Mapping not found
     */
-   private final C_rdabfjzm f_smefpbuv;
+   private final BundleContentsComponent f_smefpbuv;
 
    /**
     * Mapping not found
     */
-   public BundleTooltipComponent(C_rdabfjzm arg) {
+   public BundleTooltipComponent(BundleContentsComponent arg) {
       this.f_smefpbuv = arg;
    }
 
@@ -92,7 +92,7 @@
       int k = this.getColumns();
       int l = this.getRows();
       graphics.drawGuiTexture(BACKGROUND, x, y, this.getTextureWidth(), this.getTextureHeight());
-      boolean bl = this.f_smefpbuv.m_dbhmfful() >= 64;
+      boolean bl = this.f_smefpbuv.getWeight() >= 64;
       int m = 0;
 
       for (int n = 0; n < l; n++) {
@@ -109,10 +109,10 @@
     * @mapping {@literal named drawSlot Lnet/minecraft/client/gui/tooltip/BundleTooltipComponent;drawSlot(IIIZLnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/font/TextRenderer;)V}
     */
    private void drawSlot(int x, int y, int index, boolean shouldBlock, GuiGraphics graphics, TextRenderer textRenderer) {
-      if (index >= this.f_smefpbuv.m_dpebwpki()) {
+      if (index >= this.f_smefpbuv.size()) {
          this.draw(graphics, x, y, shouldBlock ? BundleTooltipComponent.Sprite.BLOCKED_SLOT : BundleTooltipComponent.Sprite.SLOT);
       } else {
-         ItemStack lv = this.f_smefpbuv.m_ldhjoyix(index);
+         ItemStack lv = this.f_smefpbuv.getStack(index);
          this.draw(graphics, x, y, BundleTooltipComponent.Sprite.SLOT);
          graphics.drawItem(lv, x + 1, y + 1, index);
          graphics.drawItemInSlot(textRenderer, lv, x + 1, y + 1);
@@ -135,7 +135,7 @@
     * @mapping {@literal named getColumns Lnet/minecraft/client/gui/tooltip/BundleTooltipComponent;getColumns()I}
     */
    private int getColumns() {
-      return Math.max(2, (int)Math.ceil(Math.sqrt((double)this.f_smefpbuv.m_dpebwpki() + 1.0)));
+      return Math.max(2, (int)Math.ceil(Math.sqrt((double)this.f_smefpbuv.size() + 1.0)));
    }
 
    /**
@@ -143,7 +143,7 @@
     * @mapping {@literal named getRows Lnet/minecraft/client/gui/tooltip/BundleTooltipComponent;getRows()I}
     */
    private int getRows() {
-      return (int)Math.ceil(((double)this.f_smefpbuv.m_dpebwpki() + 1.0) / (double)this.getColumns());
+      return (int)Math.ceil(((double)this.f_smefpbuv.size() + 1.0) / (double)this.getColumns());
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/multiplayer/SocialInteractionsPlayerEntry.java namedSrc/net/minecraft/client/gui/widget/list/multiplayer/SocialInteractionsPlayerEntry.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/multiplayer/SocialInteractionsPlayerEntry.java	2024-03-14 03:09:57.690085643 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/multiplayer/SocialInteractionsPlayerEntry.java	2024-03-14 03:08:48.774859175 +0000
@@ -203,7 +203,7 @@
     * @mapping {@literal hashed f_sonkbejw Lnet/minecraft/unmapped/C_wolpvava;f_sonkbejw:I}
     * @mapping {@literal named BLACK_COLOR Lnet/minecraft/client/gui/widget/list/multiplayer/SocialInteractionsPlayerEntry;BLACK_COLOR:I}
     */
-   public static final int BLACK_COLOR = ColorUtil.ARGB32.m_jslmgbyf(190, 0, 0, 0);
+   public static final int BLACK_COLOR = ColorUtil.ARGB32.getArgb(190, 0, 0, 0);
    /**
     * @mapping {@literal hashed f_cvzhtops Lnet/minecraft/unmapped/C_wolpvava;f_cvzhtops:I}
     * @mapping {@literal named TOGGLE_CHAT_ICON_SIZE Lnet/minecraft/client/gui/widget/list/multiplayer/SocialInteractionsPlayerEntry;TOGGLE_CHAT_ICON_SIZE:I}
@@ -213,22 +213,22 @@
     * @mapping {@literal hashed f_pzcgcflq Lnet/minecraft/unmapped/C_wolpvava;f_pzcgcflq:I}
     * @mapping {@literal named GRAY_COLOR Lnet/minecraft/client/gui/widget/list/multiplayer/SocialInteractionsPlayerEntry;GRAY_COLOR:I}
     */
-   public static final int GRAY_COLOR = ColorUtil.ARGB32.m_jslmgbyf(255, 74, 74, 74);
+   public static final int GRAY_COLOR = ColorUtil.ARGB32.getArgb(255, 74, 74, 74);
    /**
     * @mapping {@literal hashed f_xfrfiovg Lnet/minecraft/unmapped/C_wolpvava;f_xfrfiovg:I}
     * @mapping {@literal named DARK_GRAY_COLOR Lnet/minecraft/client/gui/widget/list/multiplayer/SocialInteractionsPlayerEntry;DARK_GRAY_COLOR:I}
     */
-   public static final int DARK_GRAY_COLOR = ColorUtil.ARGB32.m_jslmgbyf(255, 48, 48, 48);
+   public static final int DARK_GRAY_COLOR = ColorUtil.ARGB32.getArgb(255, 48, 48, 48);
    /**
     * @mapping {@literal hashed f_snzutrta Lnet/minecraft/unmapped/C_wolpvava;f_snzutrta:I}
     * @mapping {@literal named WHITE_COLOR Lnet/minecraft/client/gui/widget/list/multiplayer/SocialInteractionsPlayerEntry;WHITE_COLOR:I}
     */
-   public static final int WHITE_COLOR = ColorUtil.ARGB32.m_jslmgbyf(255, 255, 255, 255);
+   public static final int WHITE_COLOR = ColorUtil.ARGB32.getArgb(255, 255, 255, 255);
    /**
     * @mapping {@literal hashed f_chrvndxk Lnet/minecraft/unmapped/C_wolpvava;f_chrvndxk:I}
     * @mapping {@literal named LIGHT_GRAY_COLOR Lnet/minecraft/client/gui/widget/list/multiplayer/SocialInteractionsPlayerEntry;LIGHT_GRAY_COLOR:I}
     */
-   public static final int LIGHT_GRAY_COLOR = ColorUtil.ARGB32.m_jslmgbyf(140, 255, 255, 255);
+   public static final int LIGHT_GRAY_COLOR = ColorUtil.ARGB32.getArgb(140, 255, 255, 255);
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wolpvava;<init>(Lnet/minecraft/unmapped/C_ayfeobid;Lnet/minecraft/unmapped/C_brwvrttn;Ljava/util/UUID;Ljava/lang/String;Ljava/util/function/Supplier;Z)V}
diff -bur namedTargetSrc/net/minecraft/client/item/BundleTooltipData.java namedSrc/net/minecraft/client/item/BundleTooltipData.java
--- namedTargetSrc/net/minecraft/client/item/BundleTooltipData.java	2024-03-14 03:09:57.858083755 +0000
+++ namedSrc/net/minecraft/client/item/BundleTooltipData.java	2024-03-14 03:08:49.002856606 +0000
@@ -1,10 +1,10 @@
 package net.minecraft.client.item;
 
-import net.minecraft.unmapped.C_rdabfjzm;
+import net.minecraft.component.type.BundleContentsComponent;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_lgjfdjqm}
  * @mapping {@literal named net/minecraft/client/item/BundleTooltipData}
  */
-public record BundleTooltipData(C_rdabfjzm contents) implements TooltipData {
+public record BundleTooltipData(BundleContentsComponent contents) implements TooltipData {
 }
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-14 03:09:57.790084519 +0000
+++ namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2024-03-14 03:08:48.930857417 +0000
@@ -6,6 +6,11 @@
 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.BlockStateComponent;
+import net.minecraft.component.type.ChargedProjectilesComponent;
+import net.minecraft.component.type.CustomModelDataComponent;
+import net.minecraft.component.type.LodestoneTrackerComponent;
 import net.minecraft.data.client.ItemModelGenerator;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
@@ -19,12 +24,7 @@
 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;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.dynamic.GlobalPos;
@@ -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);
+         LodestoneTrackerComponent lvx = stack.get(DataComponentTypes.LODESTONE_TRACKER);
          return lvx != null ? (GlobalPos)lvx.target().orElse(null) : CompassItem.getSpawnPosition(world);
       }));
       register(
@@ -249,8 +251,8 @@
       );
       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);
-         return lvx != null && lvx.m_xdmvwenh(Items.FIREWORK_ROCKET) ? 1.0F : 0.0F;
+         ChargedProjectilesComponent lvx = stack.get(DataComponentTypes.CHARGED_PROJECTILES);
+         return lvx != null && lvx.contains(Items.FIREWORK_ROCKET) ? 1.0F : 0.0F;
       });
       register(Items.ELYTRA, new Identifier("broken"), (stack, world, entity, seed) -> ElytraItem.isUsable(stack) ? 0.0F : 1.0F);
       register(Items.FISHING_ROD, new Identifier("cast"), (stack, world, entity, seed) -> {
@@ -277,8 +279,8 @@
          (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);
-         Integer integer = lvx.m_dkddhtzv(LightBlock.LEVEL_15);
+         BlockStateComponent lvx = stack.getOrDefault(DataComponentTypes.BLOCK_STATE, BlockStateComponent.DEFAULT);
+         Integer integer = lvx.get(LightBlock.LEVEL_15);
          return integer != null ? (float)integer.intValue() / 16.0F : 1.0F;
       });
       register(
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-03-14 03:09:57.710085418 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-03-14 03:08:48.810858769 +0000
@@ -172,6 +172,8 @@
 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.component.type.LoreComponent;
 import net.minecraft.datafixer.Schemas;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
@@ -212,10 +214,8 @@
 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;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Formatting;
@@ -3415,8 +3415,8 @@
       NbtCompound lv = blockEntity.toIdentifiedLocatedNbt(registryManager);
       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.applyComponents(blockEntity.m_wiiwewxr());
+      stack.apply(DataComponentTypes.LORE, LoreComponent.DEFAULT, f_ecdhbfvc, LoreComponent::of);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-03-14 03:09:57.878083531 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-03-14 03:08:49.018856426 +0000
@@ -2550,7 +2550,7 @@
             for (EntityAttributesUpdateS2CPacket.Entry lv3 : packet.getEntries()) {
                EntityAttributeInstance lv4 = lv2.getInstance(lv3.attribute());
                if (lv4 == null) {
-                  LOGGER.warn("Entity {} does not have attribute {}", lv, lv3.attribute().m_orzakqff());
+                  LOGGER.warn("Entity {} does not have attribute {}", lv, lv3.attribute().getRegisteredName());
                } else {
                   lv4.setBaseValue(lv3.base());
                   lv4.clearModifiers();
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-14 03:09:57.662085957 +0000
+++ namedSrc/net/minecraft/client/option/HotbarStorageEntry.java	2024-03-14 03:08:48.726859716 +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/particle/FireworksSparkParticle.java namedSrc/net/minecraft/client/particle/FireworksSparkParticle.java
--- namedTargetSrc/net/minecraft/client/particle/FireworksSparkParticle.java	2024-03-14 03:09:57.738085103 +0000
+++ namedSrc/net/minecraft/client/particle/FireworksSparkParticle.java	2024-03-14 03:08:48.850858319 +0000
@@ -9,12 +9,12 @@
 import net.minecraft.client.render.Camera;
 import net.minecraft.client.util.ColorUtil;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.component.type.FireworkExplosionComponent;
 import net.minecraft.particle.DefaultParticleType;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
-import net.minecraft.unmapped.C_ibwugxba;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.MathHelper;
@@ -212,7 +212,7 @@
        * @mapping {@literal hashed f_qdvggukp Lnet/minecraft/unmapped/C_ibnlagfc$C_yoopssed;f_qdvggukp:Ljava/util/List;}
        * @mapping {@literal named explosions Lnet/minecraft/client/particle/FireworksSparkParticle$FireworkParticle;explosions:Ljava/util/List;}
        */
-      private final List<C_ibwugxba> explosions;
+      private final List<FireworkExplosionComponent> explosions;
       /**
        * @mapping {@literal hashed f_rywxrtzz Lnet/minecraft/unmapped/C_ibnlagfc$C_yoopssed;f_rywxrtzz:Z}
        * @mapping {@literal named flicker Lnet/minecraft/client/particle/FireworksSparkParticle$FireworkParticle;flicker:Z}
@@ -224,7 +224,15 @@
        * @mapping {@literal named <init> Lnet/minecraft/client/particle/FireworksSparkParticle$FireworkParticle;<init>(Lnet/minecraft/client/world/ClientWorld;DDDDDDLnet/minecraft/client/particle/ParticleManager;Ljava/util/List;)V}
        */
       public FireworkParticle(
-         ClientWorld world, double d, double e, double f, double g, double h, double i, ParticleManager particleManager, List<C_ibwugxba> explosions
+         ClientWorld world,
+         double d,
+         double e,
+         double f,
+         double g,
+         double h,
+         double i,
+         ParticleManager particleManager,
+         List<FireworkExplosionComponent> explosions
       ) {
          super(world, d, e, f);
          this.velocityX = g;
@@ -237,7 +245,7 @@
             this.explosions = explosions;
             this.maxAge = explosions.size() * 2 - 1;
 
-            for (C_ibwugxba lv : explosions) {
+            for (FireworkExplosionComponent lv : explosions) {
                if (lv.hasTwinkle()) {
                   this.flicker = true;
                   this.maxAge += 15;
@@ -258,8 +266,8 @@
             if (this.explosions.size() >= 3) {
                bl2 = true;
             } else {
-               for (C_ibwugxba lv : this.explosions) {
-                  if (lv.shape() == C_ibwugxba.C_zzjguyly.LARGE_BALL) {
+               for (FireworkExplosionComponent lv : this.explosions) {
+                  if (lv.shape() == FireworkExplosionComponent.Shape.LARGE_BALL) {
                      bl2 = true;
                      break;
                   }
@@ -278,7 +286,7 @@
 
          if (this.age % 2 == 0 && this.age / 2 < this.explosions.size()) {
             int i = this.age / 2;
-            C_ibwugxba lv4 = (C_ibwugxba)this.explosions.get(i);
+            FireworkExplosionComponent lv4 = (FireworkExplosionComponent)this.explosions.get(i);
             boolean bl3 = lv4.hasTrail();
             boolean bl4 = lv4.hasTwinkle();
             IntList intList = lv4.colors();
diff -bur namedTargetSrc/net/minecraft/client/particle/SquidInkParticle.java namedSrc/net/minecraft/client/particle/SquidInkParticle.java
--- namedTargetSrc/net/minecraft/client/particle/SquidInkParticle.java	2024-03-14 03:09:57.830084069 +0000
+++ namedSrc/net/minecraft/client/particle/SquidInkParticle.java	2024-03-14 03:08:48.970856967 +0000
@@ -76,7 +76,7 @@
        * @mapping {@literal named createParticle Lnet/minecraft/client/particle/SquidInkParticle$Factory;createParticle(Lnet/minecraft/particle/DefaultParticleType;Lnet/minecraft/client/world/ClientWorld;DDDDDD)Lnet/minecraft/client/particle/Particle;}
        */
       public Particle createParticle(DefaultParticleType arg, ClientWorld world, double d, double e, double f, double g, double h, double i) {
-         return new SquidInkParticle(world, d, e, f, g, h, i, ColorUtil.ARGB32.m_jslmgbyf(255, 255, 255, 255), this.spriteProvider);
+         return new SquidInkParticle(world, d, e, f, g, h, i, ColorUtil.ARGB32.getArgb(255, 255, 255, 255), this.spriteProvider);
       }
    }
 
@@ -105,7 +105,7 @@
        * @mapping {@literal named createParticle Lnet/minecraft/client/particle/SquidInkParticle$GlowSquidInkFactory;createParticle(Lnet/minecraft/particle/DefaultParticleType;Lnet/minecraft/client/world/ClientWorld;DDDDDD)Lnet/minecraft/client/particle/Particle;}
        */
       public Particle createParticle(DefaultParticleType arg, ClientWorld world, double d, double e, double f, double g, double h, double i) {
-         return new SquidInkParticle(world, d, e, f, g, h, i, ColorUtil.ARGB32.m_jslmgbyf(255, 204, 31, 102), this.spriteProvider);
+         return new SquidInkParticle(world, d, e, f, g, h, i, ColorUtil.ARGB32.getArgb(255, 204, 31, 102), this.spriteProvider);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.java	2024-03-14 03:09:57.826084114 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.java	2024-03-14 03:08:48.966857012 +0000
@@ -20,8 +20,8 @@
 import net.minecraft.client.render.model.ModelLoader;
 import net.minecraft.client.resource.Material;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.type.BannerPatternsComponent;
 import net.minecraft.state.properties.RotationSegment;
-import net.minecraft.unmapped.C_wwbphpbp;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.math.Axis;
 import net.minecraft.util.math.BlockPos;
@@ -150,7 +150,7 @@
 
    /**
     * @mapping {@literal hashed m_nhcifwci Lnet/minecraft/unmapped/C_ooqwcvxe;m_nhcifwci(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;IILnet/minecraft/unmapped/C_rglqxnbw;Lnet/minecraft/unmapped/C_djlixbky;ZLnet/minecraft/unmapped/C_arllgqae;Lnet/minecraft/unmapped/C_wwbphpbp;)V}
-    * @mapping {@literal named m_nhcifwci Lnet/minecraft/client/render/block/entity/BannerBlockEntityRenderer;m_nhcifwci(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/resource/Material;ZLnet/minecraft/util/DyeColor;Lnet/minecraft/unmapped/C_wwbphpbp;)V}
+    * @mapping {@literal named m_nhcifwci Lnet/minecraft/client/render/block/entity/BannerBlockEntityRenderer;m_nhcifwci(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/resource/Material;ZLnet/minecraft/util/DyeColor;Lnet/minecraft/component/type/BannerPatternsComponent;)V}
     */
    public static void m_nhcifwci(
       MatrixStack matrices,
@@ -161,14 +161,14 @@
       Material arg4,
       boolean bl,
       DyeColor arg5,
-      C_wwbphpbp arg6
+      BannerPatternsComponent arg6
    ) {
       m_obboznrl(matrices, vertexConsumers, light, overlay, arg3, arg4, bl, arg5, arg6, false);
    }
 
    /**
     * @mapping {@literal hashed m_obboznrl Lnet/minecraft/unmapped/C_ooqwcvxe;m_obboznrl(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;IILnet/minecraft/unmapped/C_rglqxnbw;Lnet/minecraft/unmapped/C_djlixbky;ZLnet/minecraft/unmapped/C_arllgqae;Lnet/minecraft/unmapped/C_wwbphpbp;Z)V}
-    * @mapping {@literal named m_obboznrl Lnet/minecraft/client/render/block/entity/BannerBlockEntityRenderer;m_obboznrl(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/resource/Material;ZLnet/minecraft/util/DyeColor;Lnet/minecraft/unmapped/C_wwbphpbp;Z)V}
+    * @mapping {@literal named m_obboznrl Lnet/minecraft/client/render/block/entity/BannerBlockEntityRenderer;m_obboznrl(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/client/model/ModelPart;Lnet/minecraft/client/resource/Material;ZLnet/minecraft/util/DyeColor;Lnet/minecraft/component/type/BannerPatternsComponent;Z)V}
     */
    public static void m_obboznrl(
       MatrixStack matrices,
@@ -179,14 +179,14 @@
       Material arg4,
       boolean bl,
       DyeColor arg5,
-      C_wwbphpbp arg6,
+      BannerPatternsComponent arg6,
       boolean glint
    ) {
       arg3.render(matrices, arg4.getVertexConsumer(vertexConsumers, RenderLayer::getEntitySolid, glint), light, overlay);
       m_quqxbzod(matrices, vertexConsumers, light, overlay, arg3, bl ? TexturedRenderLayers.f_xjwzvfjn : TexturedRenderLayers.f_kfaomire, arg5);
 
       for (int k = 0; k < 16 && k < arg6.layers().size(); k++) {
-         C_wwbphpbp.C_mhdqkjqk lv = (C_wwbphpbp.C_mhdqkjqk)arg6.layers().get(k);
+         BannerPatternsComponent.Layer lv = (BannerPatternsComponent.Layer)arg6.layers().get(k);
          Material lv2 = bl ? TexturedRenderLayers.getBannerPatternTextureId(lv.pattern()) : TexturedRenderLayers.getShieldPatternTextureId(lv.pattern());
          m_quqxbzod(matrices, vertexConsumers, light, overlay, arg3, lv2, lv.color());
       }
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java	2024-03-14 03:09:57.794084474 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java	2024-03-14 03:08:48.930857417 +0000
@@ -8,6 +8,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.block.DecoratedPotPatterns;
 import net.minecraft.block.entity.DecoratedPotBlockEntity;
+import net.minecraft.block.entity.Sherds;
 import net.minecraft.client.model.Dilation;
 import net.minecraft.client.model.ModelData;
 import net.minecraft.client.model.ModelPart;
@@ -24,7 +25,6 @@
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.Item;
 import net.minecraft.item.Items;
-import net.minecraft.unmapped.C_cpmlbyix;
 import net.minecraft.util.math.Axis;
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
@@ -218,7 +218,7 @@
       this.neck.render(matrices, lv3, i, j);
       this.top.render(matrices, lv3, i, j);
       this.bottom.render(matrices, lv3, i, j);
-      C_cpmlbyix lv4 = arg.getSherds();
+      Sherds lv4 = arg.getSherds();
       this.renderModelPart(this.front, matrices, vertexConsumers, i, j, getSpriteId(lv4.front()));
       this.renderModelPart(this.back, matrices, vertexConsumers, i, j, getSpriteId(lv4.back()));
       this.renderModelPart(this.left, matrices, vertexConsumers, i, j, getSpriteId(lv4.left()));
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java	2024-03-14 03:09:57.854083800 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java	2024-03-14 03:08:48.994856696 +0000
@@ -303,7 +303,7 @@
          int j = (int)((double)ColorUtil.ARGB32.getRed(i) * 0.4);
          int k = (int)((double)ColorUtil.ARGB32.getGreen(i) * 0.4);
          int l = (int)((double)ColorUtil.ARGB32.getBlue(i) * 0.4);
-         return ColorUtil.ARGB32.m_jslmgbyf(0, j, k, l);
+         return ColorUtil.ARGB32.getArgb(0, j, k, l);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.java	2024-03-14 03:09:57.882083486 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.java	2024-03-14 03:08:49.022856381 +0000
@@ -25,8 +25,8 @@
 import net.minecraft.client.texture.PlayerSkinProvider;
 import net.minecraft.client.util.DefaultSkinHelper;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.type.ProfileComponent;
 import net.minecraft.state.properties.RotationSegment;
-import net.minecraft.unmapped.C_iqgmrwok;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.Direction;
@@ -129,9 +129,9 @@
 
    /**
     * @mapping {@literal hashed m_xutpyjpm Lnet/minecraft/unmapped/C_nhhfdztn;m_xutpyjpm(Lnet/minecraft/unmapped/C_hxsyxqpk$C_nyiksgwh;Lnet/minecraft/unmapped/C_iqgmrwok;)Lnet/minecraft/unmapped/C_tizlwnnv;}
-    * @mapping {@literal named getRenderLayer Lnet/minecraft/client/render/block/entity/SkullBlockEntityRenderer;getRenderLayer(Lnet/minecraft/block/SkullBlock$SkullType;Lnet/minecraft/unmapped/C_iqgmrwok;)Lnet/minecraft/client/render/RenderLayer;}
+    * @mapping {@literal named getRenderLayer Lnet/minecraft/client/render/block/entity/SkullBlockEntityRenderer;getRenderLayer(Lnet/minecraft/block/SkullBlock$SkullType;Lnet/minecraft/component/type/ProfileComponent;)Lnet/minecraft/client/render/RenderLayer;}
     */
-   public static RenderLayer getRenderLayer(SkullBlock.SkullType type, @Nullable C_iqgmrwok arg2) {
+   public static RenderLayer getRenderLayer(SkullBlock.SkullType type, @Nullable ProfileComponent arg2) {
       Identifier lv = (Identifier)TEXTURES.get(type);
       if (type == SkullBlock.Type.PLAYER && arg2 != null) {
          PlayerSkinProvider lv2 = MinecraftClient.getInstance().getSkinProvider();
diff -bur namedTargetSrc/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.java namedSrc/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.java
--- namedTargetSrc/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.java	2024-03-14 03:09:57.686085688 +0000
+++ namedSrc/net/minecraft/client/render/debug/ChunkBorderDebugRenderer.java	2024-03-14 03:08:48.770859220 +0000
@@ -27,12 +27,12 @@
     * @mapping {@literal hashed f_aliphypp Lnet/minecraft/unmapped/C_anglpvjn;f_aliphypp:I}
     * @mapping {@literal named CYAN Lnet/minecraft/client/render/debug/ChunkBorderDebugRenderer;CYAN:I}
     */
-   private static final int CYAN = ColorUtil.ARGB32.m_jslmgbyf(255, 0, 155, 155);
+   private static final int CYAN = ColorUtil.ARGB32.getArgb(255, 0, 155, 155);
    /**
     * @mapping {@literal hashed f_xbskwqdp Lnet/minecraft/unmapped/C_anglpvjn;f_xbskwqdp:I}
     * @mapping {@literal named YELLOW Lnet/minecraft/client/render/debug/ChunkBorderDebugRenderer;YELLOW:I}
     */
-   private static final int YELLOW = ColorUtil.ARGB32.m_jslmgbyf(255, 255, 255, 0);
+   private static final int YELLOW = ColorUtil.ARGB32.getArgb(255, 255, 255, 0);
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_anglpvjn;<init>(Lnet/minecraft/unmapped/C_ayfeobid;)V}
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-14 03:09:57.690085643 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-03-14 03:08:48.770859220 +0000
@@ -15,6 +15,8 @@
 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.component.type.DyedColorComponent;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ArmorItem;
@@ -23,8 +25,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;
 
 /**
@@ -88,7 +88,7 @@
             this.setVisible(model, armorSlot);
             boolean bl = this.usesSecondLayer(armorSlot);
             ArmorMaterial lv4 = lv2.getMaterial().value();
-            int j = lv.isIn(ItemTags.DYEABLE) ? C_jlijuwug.m_xkqzbejo(lv, -6265536) : -1;
+            int j = lv.isIn(ItemTags.DYEABLE) ? DyedColorComponent.getColorOrDefault(lv, -6265536) : -1;
 
             for (ArmorMaterial.Layer lv5 : lv4.layers()) {
                float f;
@@ -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-14 03:09:57.718085328 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.java	2024-03-14 03:08:48.822858634 +0000
@@ -15,6 +15,8 @@
 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.component.type.ProfileComponent;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LimbData;
 import net.minecraft.entity.LivingEntity;
@@ -24,8 +26,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);
+            ProfileComponent 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/feature/HorseArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-03-14 03:09:57.694085598 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-03-14 03:08:48.778859130 +0000
@@ -11,11 +11,11 @@
 import net.minecraft.client.render.entity.model.HorseEntityModel;
 import net.minecraft.client.util.ColorUtil;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.component.type.DyedColorComponent;
 import net.minecraft.entity.passive.HorseEntity;
 import net.minecraft.item.AnimalArmorItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.registry.tag.ItemTags;
-import net.minecraft.unmapped.C_jlijuwug;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_ztxhvvob}
@@ -54,7 +54,7 @@
          float p;
          float n;
          if (lv.isIn(ItemTags.DYEABLE)) {
-            int m = C_jlijuwug.m_xkqzbejo(lv, -6265536);
+            int m = DyedColorComponent.getColorOrDefault(lv, -6265536);
             n = (float)ColorUtil.ARGB32.getRed(m) / 255.0F;
             o = (float)ColorUtil.ARGB32.getGreen(m) / 255.0F;
             p = (float)ColorUtil.ARGB32.getBlue(m) / 255.0F;
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-14 03:09:57.726085238 +0000
+++ namedSrc/net/minecraft/client/render/entity/ItemFrameEntityRenderer.java	2024-03-14 03:08:48.830858544 +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/GameRenderer.java namedSrc/net/minecraft/client/render/GameRenderer.java
--- namedTargetSrc/net/minecraft/client/render/GameRenderer.java	2024-03-14 03:09:57.706085463 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-03-14 03:08:48.802858860 +0000
@@ -1319,8 +1319,8 @@
       if (lv != null) {
          if (this.client.world != null && this.client.player != null) {
             this.client.getProfiler().push("pick");
-            double d = this.client.player.m_qdltphmv();
-            double e = this.client.player.m_xvbnellz();
+            double d = this.client.player.getBlockInteractionRange();
+            double e = this.client.player.getEntityInteractionRange();
             HitResult lv2 = this.m_vzamypqw(lv, d, e, f);
             this.client.crosshairTarget = lv2;
             this.client.targetedEntity = lv2 instanceof EntityHitResult lv3 ? lv3.getEntity() : null;
@@ -1764,7 +1764,7 @@
                } else {
                   CachedBlockPosition lv6 = new CachedBlockPosition(this.client.world, lv4, false);
                   Registry<Block> lv7 = this.client.world.getRegistryManager().get(RegistryKeys.BLOCK);
-                  bl = !lv2.isEmpty() && (lv2.m_cpmzxurz(lv6) || lv2.m_qiozuhii(lv6));
+                  bl = !lv2.isEmpty() && (lv2.canBreakInAdventureMode(lv6) || lv2.canPlaceOnInAdventureMode(lv6));
                }
             }
          }
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-14 03:09:57.702085508 +0000
+++ namedSrc/net/minecraft/client/render/item/BuiltinModelItemRenderer.java	2024-03-14 03:08:48.790858995 +0000
@@ -39,15 +39,15 @@
 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.component.type.BannerPatternsComponent;
+import net.minecraft.component.type.ProfileComponent;
 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;
 import net.minecraft.util.math.BlockPos;
 
@@ -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);
-            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());
+            ProfileComponent lv4 = stack.get(DataComponentTypes.PROFILE);
+            if (lv4 != null && !lv4.isResolved()) {
+               stack.remove(DataComponentTypes.PROFILE);
+               lv4.resolve().thenAcceptAsync(arg2 -> stack.set(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);
+            BannerPatternsComponent lv19 = stack.getOrDefault(DataComponentTypes.BANNER_PATTERNS, BannerPatternsComponent.DEFAULT);
+            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-14 03:09:57.730085193 +0000
+++ namedSrc/net/minecraft/client/render/item/HeldItemRenderer.java	2024-03-14 03:08:48.838858454 +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/client/util/ColorUtil.java namedSrc/net/minecraft/client/util/ColorUtil.java
--- namedTargetSrc/net/minecraft/client/util/ColorUtil.java	2024-03-14 03:09:57.838083980 +0000
+++ namedSrc/net/minecraft/client/util/ColorUtil.java	2024-03-14 03:08:48.982856832 +0000
@@ -115,17 +115,19 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_jslmgbyf Lnet/minecraft/unmapped/C_tmbijhir$C_aibqjhoi;m_jslmgbyf(IIII)I}
+       * @mapping {@literal named getArgb Lnet/minecraft/client/util/ColorUtil$ARGB32;getArgb(IIII)I}
        */
-      public static int m_jslmgbyf(int i, int j, int k, int l) {
-         return i << 24 | j << 16 | k << 8 | l;
+      public static int getArgb(int alpha, int red, int blue, int green) {
+         return alpha << 24 | red << 16 | blue << 8 | green;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_jdoowdec Lnet/minecraft/unmapped/C_tmbijhir$C_aibqjhoi;m_jdoowdec(III)I}
+       * @mapping {@literal named getArgb Lnet/minecraft/client/util/ColorUtil$ARGB32;getArgb(III)I}
        */
-      public static int m_jdoowdec(int i, int j, int k) {
-         return m_jslmgbyf(255, i, j, k);
+      public static int getArgb(int red, int blue, int green) {
+         return getArgb(255, red, blue, green);
       }
 
       /**
@@ -133,7 +135,7 @@
        * @mapping {@literal named mixColor Lnet/minecraft/client/util/ColorUtil$ARGB32;mixColor(II)I}
        */
       public static int mixColor(int first, int second) {
-         return m_jslmgbyf(
+         return getArgb(
             getAlpha(first) * getAlpha(second) / 255,
             getRed(first) * getRed(second) / 255,
             getGreen(first) * getGreen(second) / 255,
@@ -150,14 +152,15 @@
          int l = MathHelper.lerp(delta, getRed(start), getRed(end));
          int m = MathHelper.lerp(delta, getGreen(start), getGreen(end));
          int n = MathHelper.lerp(delta, getBlue(start), getBlue(end));
-         return m_jslmgbyf(k, l, m, n);
+         return getArgb(k, l, m, n);
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_xrcgvmaq Lnet/minecraft/unmapped/C_tmbijhir$C_aibqjhoi;m_xrcgvmaq(I)I}
+       * @mapping {@literal named opaque Lnet/minecraft/client/util/ColorUtil$ARGB32;opaque(I)I}
        */
-      public static int m_xrcgvmaq(int i) {
-         return i | 0xFF000000;
+      public static int opaque(int argb) {
+         return argb | 0xFF000000;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2024-03-14 03:09:57.822084159 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2024-03-14 03:08:48.966857012 +0000
@@ -27,6 +27,7 @@
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.sound.EntityTrackingSoundInstance;
 import net.minecraft.client.sound.PositionedSoundInstance;
+import net.minecraft.component.type.FireworkExplosionComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
@@ -52,7 +53,6 @@
 import net.minecraft.sound.SoundCategory;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.text.Text;
-import net.minecraft.unmapped.C_ibwugxba;
 import net.minecraft.util.CubicSampler;
 import net.minecraft.util.CuboidBlockIterator;
 import net.minecraft.util.Util;
@@ -752,7 +752,7 @@
     * Mapping not found
     */
    @Override
-   public void addFireworkParticle(double x, double y, double z, double velocityX, double velocityY, double velocityZ, List<C_ibwugxba> list) {
+   public void addFireworkParticle(double x, double y, double z, double velocityX, double velocityY, double velocityZ, List<FireworkExplosionComponent> list) {
       if (list.isEmpty()) {
          for (int j = 0; j < this.random.nextInt(3) + 2; j++) {
             this.addParticle(ParticleTypes.POOF, x, y, z, this.random.nextGaussian() * 0.05, 0.005, this.random.nextGaussian() * 0.05);


The remaining diff is too long!

Please sign in to comment.