Skip to content

Commit

Permalink
british
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Apr 3, 2024
1 parent 5d6b3f7 commit 494795b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mappings/net/minecraft/entity/mob/MobEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ CLASS net/minecraft/unmapped/C_dxkfswlz net/minecraft/entity/mob/MobEntity
METHOD m_swfiqufm prefersNewEquipment (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Z
ARG 1 newStack
ARG 2 oldStack
METHOD m_szhnkfyu canWearBodyArmour ()Z
METHOD m_szhnkfyu canWearBodyArmor ()Z
METHOD m_tjejbxzp canUseRangedWeapon (Lnet/minecraft/unmapped/C_axrfhndl;)Z
ARG 1 weapon
METHOD m_todoiyds clearGoalsAndTasks (Ljava/util/function/Predicate;)V
Expand Down

3 comments on commit 494795b

@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 494795b, 238 file(s) were updated with 2301 line(s) added and 2002 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-04-03 14:10:47.853675542 +0000
+++ namedSrc/com/mojang/blaze3d/texture/NativeImage.java	2024-04-03 14:09:37.249378218 +0000
@@ -525,7 +525,7 @@
          int yx = (int)(u * 255.0F);
          int z = (int)(v * 255.0F);
          int aa = (int)(w * 255.0F);
-         this.setPixelColor(x, y, ColorUtil.Abgr32.getColor(xx, yx, z, aa));
+         this.setPixelColor(x, y, ColorUtil.Abgr32.of(xx, yx, z, aa));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/ChorusFlowerBlock.java namedSrc/net/minecraft/block/ChorusFlowerBlock.java
--- namedTargetSrc/net/minecraft/block/ChorusFlowerBlock.java	2024-04-03 14:10:48.069676464 +0000
+++ namedSrc/net/minecraft/block/ChorusFlowerBlock.java	2024-04-03 14:09:37.521379361 +0000
@@ -320,7 +320,7 @@
    @Override
    protected void onProjectileHit(World world, BlockState state, BlockHitResult result, ProjectileEntity projectile) {
       BlockPos lv = result.getBlockPos();
-      if (!world.isClient && projectile.canModifyAt(world, lv) && projectile.m_jyeyoflu(world)) {
+      if (!world.isClient && projectile.canModifyAt(world, lv) && projectile.canBreakBlocks(world)) {
          world.breakBlock(lv, true, projectile);
       }
    }
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-04-03 14:10:47.857675560 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-04-03 14:09:37.249378218 +0000
@@ -310,7 +310,7 @@
    @Override
    protected void onProjectileHit(World world, BlockState state, BlockHitResult result, ProjectileEntity projectile) {
       BlockPos lv = result.getBlockPos();
-      if (!world.isClient && projectile.canModifyAt(world, lv) && projectile.m_jyeyoflu(world)) {
+      if (!world.isClient && projectile.canModifyAt(world, lv) && projectile.canBreakBlocks(world)) {
          world.setBlockState(lv, state.with(CRACKED, Boolean.valueOf(true)), Block.NO_REDRAW);
          world.breakBlock(lv, true, projectile);
       }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-04-03 14:10:47.985676105 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-04-03 14:09:37.401378856 +0000
@@ -31,8 +31,8 @@
 import net.minecraft.entity.TntEntity;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.entity.passive.AbstractDonkeyEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.entity.passive.ArmadilloEntity;
-import net.minecraft.entity.passive.HorseBaseEntity;
 import net.minecraft.entity.vehicle.BoatEntity;
 import net.minecraft.item.ArmorItem;
 import net.minecraft.item.BoneMealItem;
@@ -137,7 +137,7 @@
             BlockPos lv2 = pointer.pos().offset(lv);
             ServerWorld lv3 = pointer.world();
             Consumer<ArmorStandEntity> consumer = EntityType.appendDefaultStackSpawnConfig(arg2 -> arg2.setYaw(lv.asRotation()), lv3, stack, null);
-            ArmorStandEntity lv4 = EntityType.ARMOR_STAND.m_izopxjam(lv3, consumer, lv2, SpawnReason.DISPENSER, false, false);
+            ArmorStandEntity lv4 = EntityType.ARMOR_STAND.spawn(lv3, consumer, lv2, SpawnReason.DISPENSER, false, false);
             if (lv4 != null) {
                stack.decrement(1);
             }
@@ -175,9 +175,10 @@
          protected ItemStack dispenseSilently(BlockPointer pointer, ItemStack stack) {
             BlockPos lv = pointer.pos().offset(pointer.state().get(DispenserBlock.FACING));
 
-            for (HorseBaseEntity lv2 : pointer.world().getEntitiesByClass(HorseBaseEntity.class, new Box(lv), arg -> arg.isAlive() && arg.m_szhnkfyu())) {
-               if (lv2.m_rvknxdfs(stack) && !lv2.m_rpistqzo() && lv2.isTame()) {
-                  lv2.m_utndsklm(stack.split(1));
+            for (AbstractHorseEntity lv2 : pointer.world()
+               .getEntitiesByClass(AbstractHorseEntity.class, new Box(lv), arg -> arg.isAlive() && arg.canWearBodyArmor())) {
+               if (lv2.isBodyArmorItem(stack) && !lv2.isWearingBodyArmor() && lv2.isTame()) {
+                  lv2.equipBodyArmor(stack.split(1));
                   this.setSuccess(true);
                   return stack;
                }
diff -bur namedTargetSrc/net/minecraft/block/entity/BannerBlockEntity.java namedSrc/net/minecraft/block/entity/BannerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-04-03 14:10:47.961676003 +0000
+++ namedSrc/net/minecraft/block/entity/BannerBlockEntity.java	2024-04-03 14:09:37.373378739 +0000
@@ -111,7 +111,7 @@
       }
 
       if (this.customName != null) {
-         nbt.putString("CustomName", Text.Serializer.toJson(this.customName, arg2));
+         nbt.putString("CustomName", Text.SerializationUtil.toJson(this.customName, arg2));
       }
    }
 
@@ -122,7 +122,7 @@
    protected void m_trzmaydr(NbtCompound arg, HolderLookup.Provider arg2) {
       super.m_trzmaydr(arg, arg2);
       if (arg.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(arg.getString("CustomName"), arg2);
+         this.customName = Text.SerializationUtil.fromJson(arg.getString("CustomName"), arg2);
       }
 
       if (arg.contains("patterns")) {
diff -bur namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-04-03 14:10:47.957675986 +0000
+++ namedSrc/net/minecraft/block/entity/BeaconBlockEntity.java	2024-04-03 14:09:37.369378722 +0000
@@ -446,7 +446,7 @@
       this.primary = readStatusEffect(arg, "primary_effect");
       this.secondary = readStatusEffect(arg, "secondary_effect");
       if (arg.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(arg.getString("CustomName"), arg2);
+         this.customName = Text.SerializationUtil.fromJson(arg.getString("CustomName"), arg2);
       }
 
       this.lock = ContainerLock.fromNbt(arg);
@@ -462,7 +462,7 @@
       writeStatusEffect(nbt, "secondary_effect", this.secondary);
       nbt.putInt("Levels", this.level);
       if (this.customName != null) {
-         nbt.putString("CustomName", Text.Serializer.toJson(this.customName, arg2));
+         nbt.putString("CustomName", Text.SerializationUtil.toJson(this.customName, arg2));
       }
 
       this.lock.writeNbt(nbt);
diff -bur namedTargetSrc/net/minecraft/block/entity/BeehiveBlockEntity.java namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-04-03 14:10:47.981676089 +0000
+++ namedSrc/net/minecraft/block/entity/BeehiveBlockEntity.java	2024-04-03 14:09:37.397378839 +0000
@@ -594,7 +594,7 @@
          if (lv2 != null && lv2.getType().isIn(EntityTypeTags.BEEHIVE_INHABITORS)) {
             lv2.setNoGravity(true);
             if (lv2 instanceof BeeEntity lv3) {
-               lv3.m_lksmfqbw(pos);
+               lv3.setHivePos(pos);
                m_bygqvptj(this.ticksInHive, lv3);
             }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/BellBlockEntity.java namedSrc/net/minecraft/block/entity/BellBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/BellBlockEntity.java	2024-04-03 14:10:48.089676549 +0000
+++ namedSrc/net/minecraft/block/entity/BellBlockEntity.java	2024-04-03 14:09:37.553379495 +0000
@@ -6,7 +6,7 @@
 import net.minecraft.entity.ai.brain.MemoryModuleType;
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.particle.EntityEffectParticleEffect;
+import net.minecraft.particle.ColoredParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.tag.EntityTypeTags;
 import net.minecraft.sound.SoundCategory;
@@ -261,9 +261,7 @@
       
                for (int k = 0; k < j; k++) {
                   int l = mutableInt.addAndGet(5);
-                  world.addParticle(
-                     EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, l), e, (double)((float)pos.getY() + 0.5F), g, 0.0, 0.0, 0.0
-                  );
+                  world.addParticle(ColoredParticleEffect.create(ParticleTypes.ENTITY_EFFECT, l), e, (double)((float)pos.getY() + 0.5F), g, 0.0, 0.0, 0.0);
                }
             }
          );
diff -bur namedTargetSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java namedSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java	2024-04-03 14:10:47.981676089 +0000
+++ namedSrc/net/minecraft/block/entity/EnchantingTableBlockEntity.java	2024-04-03 14:09:37.397378839 +0000
@@ -97,7 +97,7 @@
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.writeNbt(nbt, arg2);
       if (this.hasCustomName()) {
-         nbt.putString("CustomName", Text.Serializer.toJson(this.customName, arg2));
+         nbt.putString("CustomName", Text.SerializationUtil.toJson(this.customName, arg2));
       }
    }
 
@@ -108,7 +108,7 @@
    protected void m_trzmaydr(NbtCompound arg, HolderLookup.Provider arg2) {
       super.m_trzmaydr(arg, arg2);
       if (arg.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(arg.getString("CustomName"), arg2);
+         this.customName = Text.SerializationUtil.fromJson(arg.getString("CustomName"), arg2);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-04-03 14:10:48.029676293 +0000
+++ namedSrc/net/minecraft/block/entity/LockableContainerBlockEntity.java	2024-04-03 14:09:37.457379092 +0000
@@ -56,7 +56,7 @@
       super.m_trzmaydr(arg, arg2);
       this.lock = ContainerLock.fromNbt(arg);
       if (arg.contains("CustomName", NbtElement.STRING_TYPE)) {
-         this.customName = Text.Serializer.m_npeyudcr(arg.getString("CustomName"), arg2);
+         this.customName = Text.SerializationUtil.fromJson(arg.getString("CustomName"), arg2);
       }
    }
 
@@ -68,7 +68,7 @@
       super.writeNbt(nbt, arg2);
       this.lock.writeNbt(nbt);
       if (this.customName != null) {
-         nbt.putString("CustomName", Text.Serializer.toJson(this.customName, arg2));
+         nbt.putString("CustomName", Text.SerializationUtil.toJson(this.customName, arg2));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java namedSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java	2024-04-03 14:10:47.977676071 +0000
+++ namedSrc/net/minecraft/block/entity/ShulkerBoxBlockEntity.java	2024-04-03 14:09:37.389378806 +0000
@@ -323,10 +323,10 @@
     * @mapping {@literal hashed m_jqvxostv Lnet/minecraft/unmapped/C_gauehqwp;m_jqvxostv(Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V}
     * @mapping {@literal named readInventoryNbt Lnet/minecraft/block/entity/ShulkerBoxBlockEntity;readInventoryNbt(Lnet/minecraft/nbt/NbtCompound;Lnet/minecraft/registry/HolderLookup$Provider;)V}
     */
-   public void readInventoryNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
+   public void readInventoryNbt(NbtCompound nbt, HolderLookup.Provider lookupProvider) {
       this.inventory = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
       if (!this.readLootTableNbt(nbt) && nbt.contains("Items", NbtElement.LIST_TYPE)) {
-         Inventories.readNbt(nbt, this.inventory, arg2);
+         Inventories.readNbt(nbt, this.inventory, lookupProvider);
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java namedSrc/net/minecraft/block/entity/SkullBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-04-03 14:10:48.089676549 +0000
+++ namedSrc/net/minecraft/block/entity/SkullBlockEntity.java	2024-04-03 14:09:37.553379495 +0000
@@ -178,7 +178,7 @@
       }
 
       if (this.f_vvhynfvk != null) {
-         nbt.putString("custom_name", Text.Serializer.toJson(this.f_vvhynfvk, arg2));
+         nbt.putString("custom_name", Text.SerializationUtil.toJson(this.f_vvhynfvk, arg2));
       }
    }
 
@@ -200,7 +200,7 @@
       }
 
       if (arg.contains("custom_name", NbtElement.STRING_TYPE)) {
-         this.f_vvhynfvk = Text.Serializer.m_npeyudcr(arg.getString("custom_name"), arg2);
+         this.f_vvhynfvk = Text.SerializationUtil.fromJson(arg.getString("custom_name"), arg2);
       } else {
          this.f_vvhynfvk = null;
       }
diff -bur namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java namedSrc/net/minecraft/block/PointedDripstoneBlock.java
--- namedTargetSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-04-03 14:10:47.897675731 +0000
+++ namedSrc/net/minecraft/block/PointedDripstoneBlock.java	2024-04-03 14:09:37.297378419 +0000
@@ -274,7 +274,7 @@
       if (!world.isClient) {
          BlockPos lv = result.getBlockPos();
          if (projectile.canModifyAt(world, lv)
-            && projectile.m_jyeyoflu(world)
+            && projectile.canBreakBlocks(world)
             && projectile instanceof TridentEntity
             && projectile.getVelocity().length() > 0.6) {
             world.breakBlock(lv, true);
diff -bur namedTargetSrc/net/minecraft/block/PowderSnowBlock.java namedSrc/net/minecraft/block/PowderSnowBlock.java
--- namedTargetSrc/net/minecraft/block/PowderSnowBlock.java	2024-04-03 14:10:47.877675645 +0000
+++ namedSrc/net/minecraft/block/PowderSnowBlock.java	2024-04-03 14:09:37.273378318 +0000
@@ -192,7 +192,7 @@
       if (entity.getType().isIn(EntityTypeTags.POWDER_SNOW_WALKABLE_MOBS)) {
          return true;
       } else {
-         return entity instanceof LivingEntity ? ((LivingEntity)entity).m_zwvabaox(EquipmentSlot.FEET).isOf(Items.LEATHER_BOOTS) : false;
+         return entity instanceof LivingEntity ? ((LivingEntity)entity).getEquippedStack(EquipmentSlot.FEET).isOf(Items.LEATHER_BOOTS) : false;
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java	2024-04-03 14:10:48.045676361 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/HorseScreen.java	2024-04-03 14:09:37.481379192 +0000
@@ -4,7 +4,7 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.entity.passive.AbstractDonkeyEntity;
-import net.minecraft.entity.passive.HorseBaseEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.entity.passive.LlamaEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.HorseScreenHandler;
@@ -43,9 +43,9 @@
    private static final Identifier TEXTURE = new Identifier("textures/gui/container/horse.png");
    /**
     * @mapping {@literal hashed f_ngiqspdm Lnet/minecraft/unmapped/C_ghofnnir;f_ngiqspdm:Lnet/minecraft/unmapped/C_ktznyhaj;}
-    * @mapping {@literal named entity Lnet/minecraft/client/gui/screen/ingame/HorseScreen;entity:Lnet/minecraft/entity/passive/HorseBaseEntity;}
+    * @mapping {@literal named entity Lnet/minecraft/client/gui/screen/ingame/HorseScreen;entity:Lnet/minecraft/entity/passive/AbstractHorseEntity;}
     */
-   private final HorseBaseEntity entity;
+   private final AbstractHorseEntity entity;
    /**
     * @mapping {@literal hashed f_mnyjmfvj Lnet/minecraft/unmapped/C_ghofnnir;f_mnyjmfvj:F}
     * @mapping {@literal named mouseX Lnet/minecraft/client/gui/screen/ingame/HorseScreen;mouseX:F}
@@ -59,9 +59,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ghofnnir;<init>(Lnet/minecraft/unmapped/C_ftvggtnv;Lnet/minecraft/unmapped/C_sxzqocrm;Lnet/minecraft/unmapped/C_ktznyhaj;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/ingame/HorseScreen;<init>(Lnet/minecraft/screen/HorseScreenHandler;Lnet/minecraft/entity/player/PlayerInventory;Lnet/minecraft/entity/passive/HorseBaseEntity;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/client/gui/screen/ingame/HorseScreen;<init>(Lnet/minecraft/screen/HorseScreenHandler;Lnet/minecraft/entity/player/PlayerInventory;Lnet/minecraft/entity/passive/AbstractHorseEntity;)V}
     */
-   public HorseScreen(HorseScreenHandler handler, PlayerInventory inventory, HorseBaseEntity entity) {
+   public HorseScreen(HorseScreenHandler handler, PlayerInventory inventory, AbstractHorseEntity entity) {
       super(handler, inventory, entity.getDisplayName());
       this.entity = entity;
    }
@@ -82,7 +82,7 @@
          graphics.drawGuiTexture(SADDLE_SLOT, k + 7, l + 35 - 18, 18, 18);
       }
 
-      if (this.entity.m_szhnkfyu()) {
+      if (this.entity.canWearBodyArmor()) {
          if (this.entity instanceof LlamaEntity) {
             graphics.drawGuiTexture(LLAMA_ARMOR_SLOT, k + 7, l + 35, 18, 18);
          } else {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-04-03 14:10:48.005676191 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/SmithingScreen.java	2024-04-03 14:09:37.421378941 +0000
@@ -230,15 +230,15 @@
    private void displayStack(ItemStack stack) {
       if (this.display != null) {
          for (EquipmentSlot lv : EquipmentSlot.values()) {
-            this.display.m_udqbhpxg(lv, ItemStack.EMPTY);
+            this.display.equipStack(lv, ItemStack.EMPTY);
          }
 
          if (!stack.isEmpty()) {
             ItemStack lv2 = stack.copy();
             if (stack.getItem() instanceof ArmorItem lv3) {
-               this.display.m_udqbhpxg(lv3.getPreferredSlot(), lv2);
+               this.display.equipStack(lv3.getPreferredSlot(), lv2);
             } else {
-               this.display.m_udqbhpxg(EquipmentSlot.OFFHAND, lv2);
+               this.display.equipStack(EquipmentSlot.OFFHAND, lv2);
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java namedSrc/net/minecraft/client/network/ClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-04-03 14:10:47.997676157 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayerEntity.java	2024-04-03 14:09:37.417378924 +0000
@@ -1076,8 +1076,8 @@
       this.inSneakingPose = !this.getAbilities().flying
          && !this.isSwimming()
          && !this.hasVehicle()
-         && this.m_lmajbikk(EntityPose.CROUCHING)
-         && (this.isSneaking() || !this.isSleeping() && !this.m_lmajbikk(EntityPose.STANDING));
+         && this.canMoveIntoPose(EntityPose.CROUCHING)
+         && (this.isSneaking() || !this.isSleeping() && !this.canMoveIntoPose(EntityPose.STANDING));
       float f = MathHelper.clamp(0.3F + EnchantmentHelper.getSwiftSneak(this), 0.0F, 1.0F);
       this.input.tick(this.shouldSlowDown(), f);
       this.client.getTutorialManager().onMovement(this.input);
@@ -1153,7 +1153,7 @@
       }
 
       if (this.input.jumping && !bl10 && !bl && !this.getAbilities().flying && !this.hasVehicle() && !this.isClimbing()) {
-         ItemStack lv = this.m_zwvabaox(EquipmentSlot.CHEST);
+         ItemStack lv = this.getEquippedStack(EquipmentSlot.CHEST);
          if (lv.isOf(Items.ELYTRA) && ElytraItem.isUsable(lv) && this.checkFallFlying()) {
             this.networkHandler.send(new ClientCommandC2SPacket(this, ClientCommandC2SPacket.Mode.START_FALL_FLYING));
          }
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-04-03 14:10:48.085676532 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2024-04-03 14:09:37.549379478 +0000
@@ -82,8 +82,8 @@
 import net.minecraft.entity.effect.StatusEffectInstance;
 import net.minecraft.entity.mob.GuardianEntity;
 import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.entity.passive.BeeEntity;
-import net.minecraft.entity.passive.HorseBaseEntity;
 import net.minecraft.entity.passive.SnifferEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
@@ -1453,7 +1453,7 @@
    @Override
    public void onHorseScreenOpen(HorseScreenOpenS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
-      if (this.world.getEntityById(packet.getHorseId()) instanceof HorseBaseEntity lv2) {
+      if (this.world.getEntityById(packet.getHorseId()) instanceof AbstractHorseEntity lv2) {
          ClientPlayerEntity lv3 = this.client.player;
          SimpleInventory lv4 = new SimpleInventory(packet.getSlotCount());
          HorseScreenHandler lv5 = new HorseScreenHandler(packet.getSyncId(), lv3.getInventory(), lv4, lv2);
@@ -1577,7 +1577,7 @@
    public void onEntityEquipmentUpdate(EntityEquipmentUpdateS2CPacket packet) {
       NetworkThreadUtils.forceMainThread(packet, this, this.client);
       if (this.world.getEntityById(packet.getId()) instanceof LivingEntity lv2) {
-         packet.getEquipmentList().forEach(slotAndStack -> lv2.m_udqbhpxg((EquipmentSlot)slotAndStack.getFirst(), (ItemStack)slotAndStack.getSecond()));
+         packet.getEquipmentList().forEach(slotAndStack -> lv2.equipStack((EquipmentSlot)slotAndStack.getFirst(), (ItemStack)slotAndStack.getSecond()));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java
--- namedTargetSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-04-03 14:10:48.101676600 +0000
+++ namedSrc/net/minecraft/client/network/OtherClientPlayerEntity.java	2024-04-03 14:09:37.569379562 +0000
@@ -80,7 +80,7 @@
       }
 
       if (this.headTrackingIncrements > 0) {
-         this.m_zjpztqou(this.headTrackingIncrements, this.serverHeadYaw);
+         this.lerpHeadYaw(this.headTrackingIncrements, this.serverHeadYaw);
          this.headTrackingIncrements--;
       }
 
diff -bur namedTargetSrc/net/minecraft/client/particle/SpellParticle.java namedSrc/net/minecraft/client/particle/SpellParticle.java
--- namedTargetSrc/net/minecraft/client/particle/SpellParticle.java	2024-04-03 14:10:48.041676344 +0000
+++ namedSrc/net/minecraft/client/particle/SpellParticle.java	2024-04-03 14:09:37.477379176 +0000
@@ -5,8 +5,8 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.particle.ColoredParticleEffect;
 import net.minecraft.particle.DefaultParticleType;
-import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.random.RandomGenerator;
 
@@ -92,7 +92,7 @@
     * @mapping {@literal named net/minecraft/client/particle/SpellParticle$C_xgeemgpq}
     */
    @Environment(EnvType.CLIENT)
-   public static class C_xgeemgpq implements ParticleFactory<EntityEffectParticleEffect> {
+   public static class C_xgeemgpq implements ParticleFactory<ColoredParticleEffect> {
       /**
        * Mapping not found
        */
@@ -107,12 +107,12 @@
 
       /**
        * @mapping {@literal hashed createParticle Lnet/minecraft/unmapped/C_sscomrld$C_xgeemgpq;createParticle(Lnet/minecraft/unmapped/C_gjiczies;Lnet/minecraft/unmapped/C_ghdnlrrw;DDDDDD)Lnet/minecraft/unmapped/C_pfsoguef;}
-       * @mapping {@literal named createParticle Lnet/minecraft/client/particle/SpellParticle$C_xgeemgpq;createParticle(Lnet/minecraft/particle/EntityEffectParticleEffect;Lnet/minecraft/client/world/ClientWorld;DDDDDD)Lnet/minecraft/client/particle/Particle;}
+       * @mapping {@literal named createParticle Lnet/minecraft/client/particle/SpellParticle$C_xgeemgpq;createParticle(Lnet/minecraft/particle/ColoredParticleEffect;Lnet/minecraft/client/world/ClientWorld;DDDDDD)Lnet/minecraft/client/particle/Particle;}
        */
-      public Particle createParticle(EntityEffectParticleEffect arg, ClientWorld world, double d, double e, double f, double g, double h, double i) {
+      public Particle createParticle(ColoredParticleEffect arg, ClientWorld world, double d, double e, double f, double g, double h, double i) {
          Particle lv = new SpellParticle(world, d, e, f, g, h, i, this.f_idfsumtt);
-         lv.setColor(arg.m_ttiphltz(), arg.m_pnqkildl(), arg.m_ihcdlzwk());
-         lv.setColorAlpha(arg.m_dvvuftxj());
+         lv.setColor(arg.getRed(), arg.getGreen(), arg.getBlue());
+         lv.setColorAlpha(arg.getAlpha());
          return lv;
       }
    }
Only in namedSrc/net/minecraft/client/render/entity: AbstractHorseEntityRenderer.java
diff -bur namedTargetSrc/net/minecraft/client/render/entity/CatEntityRenderer.java namedSrc/net/minecraft/client/render/entity/CatEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/CatEntityRenderer.java	2024-04-03 14:10:47.917675815 +0000
+++ namedSrc/net/minecraft/client/render/entity/CatEntityRenderer.java	2024-04-03 14:09:37.325378537 +0000
@@ -33,7 +33,7 @@
     * @mapping {@literal named getTexture Lnet/minecraft/client/render/entity/CatEntityRenderer;getTexture(Lnet/minecraft/entity/passive/CatEntity;)Lnet/minecraft/util/Identifier;}
     */
    public Identifier getTexture(CatEntity arg) {
-      return arg.m_lucghypi();
+      return arg.getTexture();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/DonkeyEntityRenderer.java namedSrc/net/minecraft/client/render/entity/DonkeyEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/DonkeyEntityRenderer.java	2024-04-03 14:10:47.897675731 +0000
+++ namedSrc/net/minecraft/client/render/entity/DonkeyEntityRenderer.java	2024-04-03 14:09:37.297378419 +0000
@@ -16,7 +16,7 @@
  * @mapping {@literal named net/minecraft/client/render/entity/DonkeyEntityRenderer}
  */
 @Environment(EnvType.CLIENT)
-public class DonkeyEntityRenderer<T extends AbstractDonkeyEntity> extends HorseBaseEntityRenderer<T, DonkeyEntityModel<T>> {
+public class DonkeyEntityRenderer<T extends AbstractDonkeyEntity> extends AbstractHorseEntityRenderer<T, DonkeyEntityModel<T>> {
    /**
     * @mapping {@literal hashed f_xwlzzqyw Lnet/minecraft/unmapped/C_yivpinog;f_xwlzzqyw:Ljava/util/Map;}
     * @mapping {@literal named TEXTURES Lnet/minecraft/client/render/entity/DonkeyEntityRenderer;TEXTURES:Ljava/util/Map;}
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java namedSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java	2024-04-03 14:10:47.825675424 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderDispatcher.java	2024-04-03 14:09:37.209378050 +0000
@@ -341,7 +341,7 @@
       if (lv3 != null) {
          float l = Math.min(lv3.getWidth(), entity.getWidth()) / 2.0F;
          float m = 0.0625F;
-         Vec3d lv4 = lv3.m_pxzrmrny(entity).subtract(entity.getPos());
+         Vec3d lv4 = lv3.getPassengerRidingPos(entity).subtract(entity.getPos());
          WorldRenderer.drawBox(
             matrices, vertices, lv4.x - (double)l, lv4.y, lv4.z - (double)l, lv4.x + (double)l, lv4.y + 0.0625, lv4.z + (double)l, 1.0F, 1.0F, 0.0F, 1.0F
          );
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EntityRenderer.java namedSrc/net/minecraft/client/render/entity/EntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-04-03 14:10:47.957675986 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderer.java	2024-04-03 14:09:37.369378722 +0000
@@ -154,7 +154,7 @@
    protected void renderLabelIfPresent(T entity, Text text, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, float tickDelta) {
       double d = this.dispatcher.getSquaredDistanceToCamera(entity);
       if (!(d > 4096.0)) {
-         Vec3d lv = entity.getAttachments().m_rfotkcao(EntityAttachmentType.NAME_TAG, 0, entity.getYaw(tickDelta));
+         Vec3d lv = entity.getAttachments().getPointNullable(EntityAttachmentType.NAME_TAG, 0, entity.getYaw(tickDelta));
          if (lv != null) {
             boolean bl = !entity.isSneaky();
             int j = "deadmau5".equals(text.getString()) ? -10 : 0;
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-04-03 14:10:47.853675542 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-04-03 14:09:37.245378201 +0000
@@ -81,7 +81,7 @@
     * @mapping {@literal named renderArmor Lnet/minecraft/client/render/entity/feature/ArmorFeatureRenderer;renderArmor(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/EquipmentSlot;ILnet/minecraft/client/render/entity/model/BipedEntityModel;)V}
     */
    private void renderArmor(MatrixStack matrices, VertexConsumerProvider vertexConsumers, T entity, EquipmentSlot armorSlot, int light, A model) {
-      ItemStack lv = entity.m_zwvabaox(armorSlot);
+      ItemStack lv = entity.getEquippedStack(armorSlot);
       if (lv.getItem() instanceof ArmorItem lv2) {
          if (lv2.getPreferredSlot() == armorSlot) {
             this.getContextModel().setAttributes(model);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java	2024-04-03 14:10:48.109676634 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.java	2024-04-03 14:09:37.585379630 +0000
@@ -49,7 +49,7 @@
       if (!arg3.isInvisible() && arg3.isPartVisible(PlayerModelPart.CAPE)) {
          PlayerSkin lv = arg3.getSkin();
          if (lv.capeTexture() != null) {
-            ItemStack lv2 = arg3.m_zwvabaox(EquipmentSlot.CHEST);
+            ItemStack lv2 = arg3.getEquippedStack(EquipmentSlot.CHEST);
             if (!lv2.isOf(Items.ELYTRA)) {
                matrices.push();
                matrices.translate(0.0F, 0.0F, 0.125F);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.java	2024-04-03 14:10:48.021676259 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ElytraFeatureRenderer.java	2024-04-03 14:09:37.441379024 +0000
@@ -52,7 +52,7 @@
     * @mapping {@literal named render Lnet/minecraft/client/render/entity/feature/ElytraFeatureRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/LivingEntity;FFFFFF)V}
     */
    public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, T arg3, float f, float g, float h, float j, float k, float l) {
-      ItemStack lv = arg3.m_zwvabaox(EquipmentSlot.CHEST);
+      ItemStack lv = arg3.getEquippedStack(EquipmentSlot.CHEST);
       if (lv.isOf(Items.ELYTRA)) {
          Identifier lv4;
          if (arg3 instanceof AbstractClientPlayerEntity lv2) {
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/FoxHeldItemFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/FoxHeldItemFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/FoxHeldItemFeatureRenderer.java	2024-04-03 14:10:47.945675935 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/FoxHeldItemFeatureRenderer.java	2024-04-03 14:09:37.357378671 +0000
@@ -69,7 +69,7 @@
          matrices.rotate(Axis.Z_POSITIVE.rotationDegrees(90.0F));
       }
 
-      ItemStack lv = arg3.m_zwvabaox(EquipmentSlot.MAINHAND);
+      ItemStack lv = arg3.getEquippedStack(EquipmentSlot.MAINHAND);
       this.heldItemRenderer.renderItem(arg3, lv, ModelTransformationMode.GROUND, false, matrices, vertexConsumers, i);
       matrices.pop();
    }
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-04-03 14:10:47.893675713 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HeadFeatureRenderer.java	2024-04-03 14:09:37.297378419 +0000
@@ -88,7 +88,7 @@
     * @mapping {@literal named render Lnet/minecraft/client/render/entity/feature/HeadFeatureRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/entity/LivingEntity;FFFFFF)V}
     */
    public void render(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, T arg3, float f, float g, float h, float j, float k, float l) {
-      ItemStack lv = arg3.m_zwvabaox(EquipmentSlot.HEAD);
+      ItemStack lv = arg3.getEquippedStack(EquipmentSlot.HEAD);
       if (!lv.isEmpty()) {
          Item lv2 = lv.getItem();
          matrices.push();
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-04-03 14:10:47.861675576 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-04-03 14:09:37.253378235 +0000
@@ -45,7 +45,7 @@
    public void render(
       MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, HorseEntity arg3, float f, float g, float h, float j, float k, float l
    ) {
-      ItemStack lv = arg3.m_faldjosq();
+      ItemStack lv = arg3.getBodyArmor();
       if (lv.getItem() instanceof AnimalArmorItem lv2 && lv2.type() == AnimalArmorItem.Type.EQUESTRIAN) {
          this.getContextModel().copyStateTo(this.model);
          this.model.animateModel(arg3, f, g, h);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/PandaHeldItemFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/PandaHeldItemFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/PandaHeldItemFeatureRenderer.java	2024-04-03 14:10:48.089676549 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/PandaHeldItemFeatureRenderer.java	2024-04-03 14:09:37.557379512 +0000
@@ -40,7 +40,7 @@
    public void render(
       MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, PandaEntity arg3, float f, float g, float h, float j, float k, float l
    ) {
-      ItemStack lv = arg3.m_zwvabaox(EquipmentSlot.MAINHAND);
+      ItemStack lv = arg3.getEquippedStack(EquipmentSlot.MAINHAND);
       if (arg3.isScared() && !arg3.isScaredByThunderstorm()) {
          float m = -0.6F;
          float n = 1.4F;
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/VillagerHeldItemFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/VillagerHeldItemFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/VillagerHeldItemFeatureRenderer.java	2024-04-03 14:10:47.853675542 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/VillagerHeldItemFeatureRenderer.java	2024-04-03 14:09:37.249378218 +0000
@@ -41,7 +41,7 @@
       matrices.push();
       matrices.translate(0.0F, 0.4F, -0.4F);
       matrices.rotate(Axis.X_POSITIVE.rotationDegrees(180.0F));
-      ItemStack lv = arg3.m_zwvabaox(EquipmentSlot.MAINHAND);
+      ItemStack lv = arg3.getEquippedStack(EquipmentSlot.MAINHAND);
       this.heldItemRenderer.renderItem(arg3, lv, ModelTransformationMode.GROUND, false, matrices, vertexConsumers, i);
       matrices.pop();
    }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-04-03 14:10:47.861675576 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/WolfArmorFeatureRenderer.java	2024-04-03 14:09:37.257378251 +0000
@@ -61,7 +61,7 @@
       MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, WolfEntity arg3, float f, float g, float h, float j, float k, float l
    ) {
       if (arg3.hasArmor()) {
-         ItemStack lv = arg3.m_faldjosq();
+         ItemStack lv = arg3.getBodyArmor();
          if (lv.getItem() instanceof AnimalArmorItem lv2) {
             this.getContextModel().copyStateTo(this.model);
             this.model.animateModel(arg3, f, g, h);
Only in namedTargetSrc/net/minecraft/client/render/entity: HorseBaseEntityRenderer.java
diff -bur namedTargetSrc/net/minecraft/client/render/entity/HorseEntityRenderer.java namedSrc/net/minecraft/client/render/entity/HorseEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/HorseEntityRenderer.java	2024-04-03 14:10:47.993676139 +0000
+++ namedSrc/net/minecraft/client/render/entity/HorseEntityRenderer.java	2024-04-03 14:09:37.409378889 +0000
@@ -18,7 +18,7 @@
  * @mapping {@literal named net/minecraft/client/render/entity/HorseEntityRenderer}
  */
 @Environment(EnvType.CLIENT)
-public final class HorseEntityRenderer extends HorseBaseEntityRenderer<HorseEntity, HorseEntityModel<HorseEntity>> {
+public final class HorseEntityRenderer extends AbstractHorseEntityRenderer<HorseEntity, HorseEntityModel<HorseEntity>> {
    /**
     * @mapping {@literal hashed f_lvibnndx Lnet/minecraft/unmapped/C_cvlgwgfs;f_lvibnndx:Ljava/util/Map;}
     * @mapping {@literal named TEXTURES Lnet/minecraft/client/render/entity/HorseEntityRenderer;TEXTURES:Ljava/util/Map;}
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/AllayEntityModel.java namedSrc/net/minecraft/client/render/entity/model/AllayEntityModel.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/AllayEntityModel.java	2024-04-03 14:10:47.885675679 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/AllayEntityModel.java	2024-04-03 14:09:37.285378369 +0000
@@ -153,14 +153,14 @@
       float n = h * 9.0F * (float) (Math.PI / 180.0);
       float o = Math.min(g / 0.3F, 1.0F);
       float p = 1.0F - o;
-      float q = arg.m_zlnrwbiq(m);
+      float q = arg.getHoldingItemAnimationProgress(m);
       if (arg.isDancing()) {
          float r = h * 8.0F * (float) (Math.PI / 180.0) + g;
          float s = MathHelper.cos(r) * 16.0F * (float) (Math.PI / 180.0);
-         float t = arg.m_bywwptpx(m);
+         float t = arg.getSpinningAnimationProgress(m);
          float u = MathHelper.cos(r) * 14.0F * (float) (Math.PI / 180.0);
          float v = MathHelper.cos(r) * 30.0F * (float) (Math.PI / 180.0);
-         this.root.yaw = arg.m_fixrglzq() ? (float) (Math.PI * 4) * t : this.root.yaw;
+         this.root.yaw = arg.isSpinning() ? (float) (Math.PI * 4) * t : this.root.yaw;
          this.root.roll = s * (1.0F - t);
          this.head.yaw = v * (1.0F - t);
          this.head.roll = u * (1.0F - t);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/BoggedEntityModel.java namedSrc/net/minecraft/client/render/entity/model/BoggedEntityModel.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/BoggedEntityModel.java	2024-04-03 14:10:47.925675850 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/BoggedEntityModel.java	2024-04-03 14:09:37.337378588 +0000
@@ -78,7 +78,7 @@
     * @mapping {@literal named animateModel Lnet/minecraft/client/render/entity/model/BoggedEntityModel;animateModel(Lnet/minecraft/entity/mob/BoggedEntity;FFF)V}
     */
    public void animateModel(BoggedEntity arg, float f, float g, float h) {
-      this.mushrooms.visible = !arg.m_xziptrpf();
+      this.mushrooms.visible = !arg.isSheared();
       super.animateModel(arg, f, g, h);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/BreezeEntityModel.java namedSrc/net/minecraft/client/render/entity/model/BreezeEntityModel.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/BreezeEntityModel.java	2024-04-03 14:10:48.069676464 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/BreezeEntityModel.java	2024-04-03 14:09:37.521379361 +0000
@@ -179,8 +179,8 @@
       this.rods.yaw = h * (float) Math.PI * 0.1F;
       this.animate(arg.shootingState, BreezeEntityAnimations.SHOOTING, h);
       this.animate(arg.slidingState, BreezeEntityAnimations.SLIDING, h);
-      this.animate(arg.f_lkksromp, BreezeEntityAnimations.f_pnajrztk, h);
-      this.animate(arg.inhalingState, BreezeEntityAnimations.INHALING, h);
+      this.animate(arg.slidingBackState, BreezeEntityAnimations.f_pnajrztk, h);
+      this.animate(arg.longJumpState, BreezeEntityAnimations.INHALING, h);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/HorseEntityModel.java namedSrc/net/minecraft/client/render/entity/model/HorseEntityModel.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/HorseEntityModel.java	2024-04-03 14:10:47.845675508 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/HorseEntityModel.java	2024-04-03 14:09:37.241378184 +0000
@@ -9,7 +9,7 @@
 import net.minecraft.client.model.ModelPartBuilder;
 import net.minecraft.client.model.ModelPartData;
 import net.minecraft.client.model.ModelTransform;
-import net.minecraft.entity.passive.HorseBaseEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.util.math.MathHelper;
 
 /**
@@ -17,7 +17,7 @@
  * @mapping {@literal named net/minecraft/client/render/entity/model/HorseEntityModel}
  */
 @Environment(EnvType.CLIENT)
-public class HorseEntityModel<T extends HorseBaseEntity> extends AnimalModel<T> {
+public class HorseEntityModel<T extends AbstractHorseEntity> extends AnimalModel<T> {
    /**
     * @mapping {@literal hashed f_kyiwomgp Lnet/minecraft/unmapped/C_dairtqdl;f_kyiwomgp:F}
     * @mapping {@literal named EATING_GRASS_ANIMATION_HEAD_BASE_PITCH Lnet/minecraft/client/render/entity/model/HorseEntityModel;EATING_GRASS_ANIMATION_HEAD_BASE_PITCH:F}
@@ -323,7 +323,7 @@
 
    /**
     * @mapping {@literal hashed m_cthcwexe Lnet/minecraft/unmapped/C_dairtqdl;m_cthcwexe(Lnet/minecraft/unmapped/C_ktznyhaj;FFFFF)V}
-    * @mapping {@literal named setAngles Lnet/minecraft/client/render/entity/model/HorseEntityModel;setAngles(Lnet/minecraft/entity/passive/HorseBaseEntity;FFFFF)V}
+    * @mapping {@literal named setAngles Lnet/minecraft/client/render/entity/model/HorseEntityModel;setAngles(Lnet/minecraft/entity/passive/AbstractHorseEntity;FFFFF)V}
     */
    public void setAngles(T arg, float f, float g, float h, float i, float j) {
       boolean bl = arg.isSaddled();
@@ -368,7 +368,7 @@
 
    /**
     * @mapping {@literal hashed m_zhpkqkmd Lnet/minecraft/unmapped/C_dairtqdl;m_zhpkqkmd(Lnet/minecraft/unmapped/C_ktznyhaj;FFF)V}
-    * @mapping {@literal named animateModel Lnet/minecraft/client/render/entity/model/HorseEntityModel;animateModel(Lnet/minecraft/entity/passive/HorseBaseEntity;FFF)V}
+    * @mapping {@literal named animateModel Lnet/minecraft/client/render/entity/model/HorseEntityModel;animateModel(Lnet/minecraft/entity/passive/AbstractHorseEntity;FFF)V}
     */
    public void animateModel(T arg, float f, float g, float h) {
       super.animateModel(arg, f, g, h);
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/PlayerEntityModel.java namedSrc/net/minecraft/client/render/entity/model/PlayerEntityModel.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/PlayerEntityModel.java	2024-04-03 14:10:48.029676293 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/PlayerEntityModel.java	2024-04-03 14:09:37.457379092 +0000
@@ -300,7 +300,7 @@
       this.leftSleeve.copyTransform(this.leftArm);
       this.rightSleeve.copyTransform(this.rightArm);
       this.jacket.copyTransform(this.body);
-      if (arg.m_zwvabaox(EquipmentSlot.CHEST).isEmpty()) {
+      if (arg.getEquippedStack(EquipmentSlot.CHEST).isEmpty()) {
          if (arg.isInSneakingPose()) {
             this.cloak.pivotZ = 1.4F;
             this.cloak.pivotY = 1.85F;
diff -bur namedTargetSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java namedSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java	2024-04-03 14:10:48.001676173 +0000
+++ namedSrc/net/minecraft/client/render/entity/WolfEntityRenderer.java	2024-04-03 14:09:37.421378941 +0000
@@ -55,6 +55,6 @@
     * @mapping {@literal named getTexture Lnet/minecraft/client/render/entity/WolfEntityRenderer;getTexture(Lnet/minecraft/entity/passive/WolfEntity;)Lnet/minecraft/util/Identifier;}
     */
    public Identifier getTexture(WolfEntity arg) {
-      return arg.m_zwqarhhn();
+      return arg.getTexture();
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/ZombieHorseEntityRenderer.java namedSrc/net/minecraft/client/render/entity/ZombieHorseEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/entity/ZombieHorseEntityRenderer.java	2024-04-03 14:10:47.897675731 +0000
+++ namedSrc/net/minecraft/client/render/entity/ZombieHorseEntityRenderer.java	2024-04-03 14:09:37.297378419 +0000
@@ -8,7 +8,7 @@
 import net.minecraft.client.render.entity.model.EntityModelLayer;
 import net.minecraft.client.render.entity.model.HorseEntityModel;
 import net.minecraft.entity.EntityType;
-import net.minecraft.entity.passive.HorseBaseEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.util.Identifier;
 
 /**
@@ -16,7 +16,7 @@
  * @mapping {@literal named net/minecraft/client/render/entity/ZombieHorseEntityRenderer}
  */
 @Environment(EnvType.CLIENT)
-public class ZombieHorseEntityRenderer extends HorseBaseEntityRenderer<HorseBaseEntity, HorseEntityModel<HorseBaseEntity>> {
+public class ZombieHorseEntityRenderer extends AbstractHorseEntityRenderer<AbstractHorseEntity, HorseEntityModel<AbstractHorseEntity>> {
    /**
     * @mapping {@literal hashed f_dlrfynqg Lnet/minecraft/unmapped/C_pgymxohb;f_dlrfynqg:Ljava/util/Map;}
     * @mapping {@literal named TEXTURES Lnet/minecraft/client/render/entity/ZombieHorseEntityRenderer;TEXTURES:Ljava/util/Map;}
@@ -40,9 +40,9 @@
 
    /**
     * @mapping {@literal hashed m_msctuldv Lnet/minecraft/unmapped/C_pgymxohb;m_msctuldv(Lnet/minecraft/unmapped/C_ktznyhaj;)Lnet/minecraft/unmapped/C_ncpywfca;}
-    * @mapping {@literal named getTexture Lnet/minecraft/client/render/entity/ZombieHorseEntityRenderer;getTexture(Lnet/minecraft/entity/passive/HorseBaseEntity;)Lnet/minecraft/util/Identifier;}
+    * @mapping {@literal named getTexture Lnet/minecraft/client/render/entity/ZombieHorseEntityRenderer;getTexture(Lnet/minecraft/entity/passive/AbstractHorseEntity;)Lnet/minecraft/util/Identifier;}
     */
-   public Identifier getTexture(HorseBaseEntity arg) {
+   public Identifier getTexture(AbstractHorseEntity arg) {
       return (Identifier)TEXTURES.get(arg.getType());
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/sound/SoundManager.java namedSrc/net/minecraft/client/sound/SoundManager.java
--- namedTargetSrc/net/minecraft/client/sound/SoundManager.java	2024-04-03 14:10:47.849675526 +0000
+++ namedSrc/net/minecraft/client/sound/SoundManager.java	2024-04-03 14:09:37.241378184 +0000
@@ -81,7 +81,7 @@
     * @mapping {@literal named GSON Lnet/minecraft/client/sound/SoundManager;GSON:Lcom/google/gson/Gson;}
     */
    private static final Gson GSON = new GsonBuilder()
-      .registerTypeHierarchyAdapter(Text.class, new Text.C_poyaemhx(DynamicRegistryManager.EMPTY))
+      .registerTypeHierarchyAdapter(Text.class, new Text.Serializer(DynamicRegistryManager.EMPTY))
       .registerTypeAdapter(SoundEntry.class, new SoundEntryDeserializer())
       .create();
    /**
diff -bur namedTargetSrc/net/minecraft/client/texture/atlas/source/PaletteSpriteSource.java namedSrc/net/minecraft/client/texture/atlas/source/PaletteSpriteSource.java
--- namedTargetSrc/net/minecraft/client/texture/atlas/source/PaletteSpriteSource.java	2024-04-03 14:10:48.093676566 +0000
+++ namedSrc/net/minecraft/client/texture/atlas/source/PaletteSpriteSource.java	2024-04-03 14:09:37.557379512 +0000
@@ -140,7 +140,7 @@
                int k = ColorUtil.Abgr32.transparent(value);
                int l = int2IntMap.getOrDefault(k, ColorUtil.Abgr32.opaque(k));
                int m = ColorUtil.Abgr32.getAlpha(l);
-               return ColorUtil.Abgr32.color(jx * m / 255, l);
+               return ColorUtil.Abgr32.of(jx * m / 255, l);
             }
          };
       }
diff -bur namedTargetSrc/net/minecraft/client/util/ColorUtil.java namedSrc/net/minecraft/client/util/ColorUtil.java
--- namedTargetSrc/net/minecraft/client/util/ColorUtil.java	2024-04-03 14:10:48.049676378 +0000
+++ namedSrc/net/minecraft/client/util/ColorUtil.java	2024-04-03 14:09:37.489379226 +0000
@@ -62,18 +62,18 @@
 
       /**
        * @mapping {@literal hashed m_rztpqkze Lnet/minecraft/unmapped/C_tmbijhir$C_lpcvvzvx;m_rztpqkze(IIII)I}
-       * @mapping {@literal named getColor Lnet/minecraft/client/util/ColorUtil$Abgr32;getColor(IIII)I}
+       * @mapping {@literal named of Lnet/minecraft/client/util/ColorUtil$Abgr32;of(IIII)I}
        */
-      public static int getColor(int alpha, int blue, int green, int red) {
+      public static int of(int alpha, int blue, int green, int red) {
          return alpha << 24 | blue << 16 | green << 8 | red;
       }
 
       /**
        * @mapping {@literal hashed m_butjrgyi Lnet/minecraft/unmapped/C_tmbijhir$C_lpcvvzvx;m_butjrgyi(II)I}
-       * @mapping {@literal named color Lnet/minecraft/client/util/ColorUtil$Abgr32;color(II)I}
+       * @mapping {@literal named of Lnet/minecraft/client/util/ColorUtil$Abgr32;of(II)I}
        */
-      public static int color(int a, int bgr) {
-         return a << 24 | bgr & 16777215;
+      public static int of(int alpha, int bgr) {
+         return alpha << 24 | bgr & 16777215;
       }
    }
 
@@ -164,10 +164,11 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_bixluiis Lnet/minecraft/unmapped/C_tmbijhir$C_aibqjhoi;m_bixluiis(II)I}
+       * @mapping {@literal named of Lnet/minecraft/client/util/ColorUtil$Argb32;of(II)I}
        */
-      public static int m_bixluiis(int i, int j) {
-         return i << 24 | j & 16777215;
+      public static int of(int rgb, int alpha) {
+         return rgb << 24 | alpha & 16777215;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java namedSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java
--- namedTargetSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java	2024-04-03 14:10:47.953675969 +0000
+++ namedSrc/net/minecraft/command/argument/ParticleEffectArgumentType.java	2024-04-03 14:09:37.365378704 +0000
@@ -90,9 +90,9 @@
     * @mapping {@literal hashed m_okcgtylw Lnet/minecraft/unmapped/C_wvjakmzf;m_okcgtylw(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_nqucohct;}
     * @mapping {@literal named parse Lnet/minecraft/command/argument/ParticleEffectArgumentType;parse(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/ParticleEffect;}
     */
-   public static ParticleEffect parse(StringReader reader, HolderLookup.Provider arg) throws CommandSyntaxException {
-      ParticleType<?> lv = parse(reader, arg.getLookupOrThrow(RegistryKeys.PARTICLE_TYPE));
-      return getParameters(reader, (ParticleType<ParticleEffect>)lv, arg);
+   public static ParticleEffect parse(StringReader reader, HolderLookup.Provider lookupProvider) throws CommandSyntaxException {
+      ParticleType<?> lv = parse(reader, lookupProvider.getLookupOrThrow(RegistryKeys.PARTICLE_TYPE));
+      return getParameters(reader, (ParticleType<ParticleEffect>)lv, lookupProvider);
    }
 
    /**
@@ -110,8 +110,8 @@
     * @mapping {@literal hashed m_gdaxvlny Lnet/minecraft/unmapped/C_wvjakmzf;m_gdaxvlny(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/unmapped/C_qlzoaopu;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_nqucohct;}
     * @mapping {@literal named getParameters Lnet/minecraft/command/argument/ParticleEffectArgumentType;getParameters(Lcom/mojang/brigadier/StringReader;Lnet/minecraft/particle/ParticleType;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/particle/ParticleEffect;}
     */
-   private static <T extends ParticleEffect> T getParameters(StringReader reader, ParticleType<T> type, HolderLookup.Provider arg2) throws CommandSyntaxException {
-      return type.getParametersFactory().fromCommand(type, reader, arg2);
+   private static <T extends ParticleEffect> T getParameters(StringReader reader, ParticleType<T> type, HolderLookup.Provider lookupProvider) throws CommandSyntaxException {
+      return type.getParametersFactory().fromCommand(type, reader, lookupProvider);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/component/type/WrittenBookContentComponent.java namedSrc/net/minecraft/component/type/WrittenBookContentComponent.java
--- namedTargetSrc/net/minecraft/component/type/WrittenBookContentComponent.java	2024-04-03 14:10:47.845675508 +0000
+++ namedSrc/net/minecraft/component/type/WrittenBookContentComponent.java	2024-04-03 14:09:37.237378167 +0000
@@ -179,7 +179,7 @@
     * @mapping {@literal named isPageTooLarge Lnet/minecraft/component/type/WrittenBookContentComponent;isPageTooLarge(Lnet/minecraft/text/Text;Lnet/minecraft/registry/HolderLookup$Provider;)Z}
     */
    private static boolean isPageTooLarge(Text text, HolderLookup.Provider lookupProvider) {
-      return Text.Serializer.toJson(text, lookupProvider).length() > 32767;
+      return Text.SerializationUtil.toJson(text, lookupProvider).length() > 32767;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java namedSrc/net/minecraft/enchantment/EnchantmentHelper.java
--- namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-04-03 14:10:47.985676105 +0000
+++ namedSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-04-03 14:09:37.401378856 +0000
@@ -202,7 +202,7 @@
    public static void onUserDamaged(LivingEntity user, Entity attacker) {
       EnchantmentHelper.Consumer lv = (arg3, i) -> arg3.onUserDamaged(user, attacker, i);
       if (user != null) {
-         forEachEnchantment(lv, user.m_xvjkmxro());
+         forEachEnchantment(lv, user.getEquippedItems());
       }
 
       if (attacker instanceof PlayerEntity) {
@@ -219,7 +219,7 @@
    public static void onTargetDamaged(LivingEntity user, Entity target) {
       EnchantmentHelper.Consumer lv = (arg3, i) -> arg3.onTargetDamaged(user, target, i);
       if (user != null) {
-         forEachEnchantment(lv, user.m_xvjkmxro());
+         forEachEnchantment(lv, user.getEquippedItems());
       }
 
       if (user instanceof PlayerEntity) {
diff -bur namedTargetSrc/net/minecraft/enchantment/Enchantment.java namedSrc/net/minecraft/enchantment/Enchantment.java
--- namedTargetSrc/net/minecraft/enchantment/Enchantment.java	2024-04-03 14:10:47.929675866 +0000
+++ namedSrc/net/minecraft/enchantment/Enchantment.java	2024-04-03 14:09:37.341378604 +0000
@@ -129,7 +129,7 @@
       Map<EquipmentSlot, ItemStack> map = Maps.newEnumMap(EquipmentSlot.class);
 
       for (EquipmentSlot lv : this.f_cytkilek.slots()) {
-         ItemStack lv2 = entity.m_zwvabaox(lv);
+         ItemStack lv2 = entity.getEquippedStack(lv);
          if (!lv2.isEmpty()) {
             map.put(lv, lv2);
          }
diff -bur namedTargetSrc/net/minecraft/enchantment/WindBurstEnchantment.java namedSrc/net/minecraft/enchantment/WindBurstEnchantment.java
--- namedTargetSrc/net/minecraft/enchantment/WindBurstEnchantment.java	2024-04-03 14:10:47.849675526 +0000
+++ namedSrc/net/minecraft/enchantment/WindBurstEnchantment.java	2024-04-03 14:09:37.245378201 +0000
@@ -49,7 +49,7 @@
    @Override
    public void m_sclzujte(LivingEntity arg, Entity arg2, int i) {
       arg.getWorld()
-         .m_kyovuptu(
+         .createExplosion(
             null,
             null,
             f_lbuhsvcm[i - 1],
@@ -86,7 +86,7 @@
        * Mapping not found
        */
       @Override
-      public float m_vcortgkd() {
+      public float getKnockbackMultiplier() {
          return this.f_otbqmmcr;
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java namedSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java	2024-04-03 14:10:47.817675390 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/sensor/SensorType.java	2024-04-03 14:09:37.201378016 +0000
@@ -77,7 +77,7 @@
     */
    public static final SensorType<MobSensor<ArmadilloEntity>> ARMADILLO_SCARE_DETECTED = register(
       "armadillo_scare_detected",
-      () -> new MobSensor(5, ArmadilloEntity::isScaredOf, ArmadilloEntity::m_gfpmjxza, MemoryModuleType.DANGER_DETECTED_RECENTLY, 80)
+      () -> new MobSensor(5, ArmadilloEntity::isScaredOf, ArmadilloEntity::canStayRolledUp, MemoryModuleType.DANGER_DETECTED_RECENTLY, 80)
    );
    /**
     * @mapping {@literal hashed f_exgymxyt Lnet/minecraft/unmapped/C_usxopklv;f_exgymxyt:Lnet/minecraft/unmapped/C_usxopklv;}
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/BoneMealTask.java namedSrc/net/minecraft/entity/ai/brain/task/BoneMealTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/BoneMealTask.java	2024-04-03 14:10:47.865675594 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BoneMealTask.java	2024-04-03 14:09:37.257378251 +0000
@@ -123,7 +123,7 @@
     */
    protected void run(ServerWorld world, VillagerEntity arg2, long l) {
       this.addLookWalkTargets(arg2);
-      arg2.m_udqbhpxg(EquipmentSlot.MAINHAND, new ItemStack(Items.BONE_MEAL));
+      arg2.equipStack(EquipmentSlot.MAINHAND, new ItemStack(Items.BONE_MEAL));
       this.startTime = l;
       this.duration = 0;
    }
@@ -145,7 +145,7 @@
     * @mapping {@literal named finishRunning Lnet/minecraft/entity/ai/brain/task/BoneMealTask;finishRunning(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/passive/VillagerEntity;J)V}
     */
    protected void finishRunning(ServerWorld world, VillagerEntity arg2, long l) {
-      arg2.m_udqbhpxg(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
+      arg2.equipStack(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
       this.lastEndEntityAge = (long)arg2.age;
    }
 
Only in namedSrc/net/minecraft/entity/ai/brain/task: BreezeShootTask.java
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java namedSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java	2024-04-03 14:10:48.049676378 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/BreezeSlideTask.java	2024-04-03 14:09:37.489379226 +0000
@@ -52,7 +52,7 @@
    protected void run(ServerWorld world, BreezeEntity arg2, long l) {
       LivingEntity lv = (LivingEntity)arg2.getBrain().getOptionalMemory(MemoryModuleType.ATTACK_TARGET).orElse(null);
       if (lv != null) {
-         boolean bl = arg2.m_jcnzetwg(lv.getPos());
+         boolean bl = arg2.isWithinInnerCircleRange(lv.getPos());
          Vec3d lv2 = null;
          if (bl) {
             Vec3d lv3 = NoPenaltyTargeting.find(arg2, 5, 5, lv.getPos());
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java namedSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java	2024-04-03 14:10:47.945675935 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/GiveItemsToTargetTask.java	2024-04-03 14:09:37.357378671 +0000
@@ -105,7 +105,7 @@
             if (!lv2.isEmpty()) {
                throwItemStackToEntity(entity, lv2, getThrowPosition(lv));
                if (entity instanceof AllayEntity lv3) {
-                  AllayBrain.m_rydiwjxl(lv3).ifPresent(player -> this.triggerDropItemOnBlock(lv, lv2, player));
+                  AllayBrain.getLikedPlayer(lv3).ifPresent(player -> this.triggerDropItemOnBlock(lv, lv2, player));
                }
 
                entity.getBrain().remember(MemoryModuleType.ITEM_PICKUP_COOLDOWN_TICKS, 60);
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.java namedSrc/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.java	2024-04-03 14:10:47.869675611 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/HoldTradeOffersTask.java	2024-04-03 14:09:37.261378268 +0000
@@ -184,8 +184,8 @@
     * @mapping {@literal named holdNothing Lnet/minecraft/entity/ai/brain/task/HoldTradeOffersTask;holdNothing(Lnet/minecraft/entity/passive/VillagerEntity;)V}
     */
    private static void holdNothing(VillagerEntity villager) {
-      villager.m_udqbhpxg(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
-      villager.m_mywpdhns(EquipmentSlot.MAINHAND, 0.085F);
+      villager.equipStack(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
+      villager.setDropChance(EquipmentSlot.MAINHAND, 0.085F);
    }
 
    /**
@@ -193,8 +193,8 @@
     * @mapping {@literal named holdOffer Lnet/minecraft/entity/ai/brain/task/HoldTradeOffersTask;holdOffer(Lnet/minecraft/entity/passive/VillagerEntity;Lnet/minecraft/item/ItemStack;)V}
     */
    private static void holdOffer(VillagerEntity villager, ItemStack stack) {
-      villager.m_udqbhpxg(EquipmentSlot.MAINHAND, stack);
-      villager.m_mywpdhns(EquipmentSlot.MAINHAND, 0.0F);
+      villager.equipStack(EquipmentSlot.MAINHAND, stack);
+      villager.setDropChance(EquipmentSlot.MAINHAND, 0.0F);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpUtil.java namedSrc/net/minecraft/entity/ai/brain/task/LongJumpUtil.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/LongJumpUtil.java	2024-04-03 14:10:47.893675713 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/LongJumpUtil.java	2024-04-03 14:09:37.293378403 +0000
@@ -26,7 +26,7 @@
       double e = lv4.subtract(0.0, lv4.y, 0.0).lengthSquared();
       double h = Math.sqrt(e);
       double j = lv4.y;
-      double k = entity.m_gliwfays();
+      double k = entity.getGravity();
       double l = Math.sin((double)(2.0F * g));
       double m = Math.pow(Math.cos((double)g), 2.0);
       double n = Math.sin((double)g);

@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/entity/ai/brain/task/SonicBoomTask.java namedSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java
--- namedTargetSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java	2024-04-03 14:10:47.877675645 +0000
+++ namedSrc/net/minecraft/entity/ai/brain/task/SonicBoomTask.java	2024-04-03 14:09:37.273378318 +0000
@@ -116,7 +116,7 @@
             .filter(arg2::isEnemy)
             .filter(arg2x -> arg2.isInRange(arg2x, 15.0, 20.0))
             .ifPresent(arg3 -> {
-               Vec3d lv = arg2.getPos().add(arg2.getAttachments().m_mhnyqnyc(EntityAttachmentType.WARDEN_CHEST, 0, arg2.getYaw()));
+               Vec3d lv = arg2.getPos().add(arg2.getAttachments().getPoint(EntityAttachmentType.WARDEN_CHEST, 0, arg2.getYaw()));
                Vec3d lv2 = arg3.getEyePos().subtract(lv);
                Vec3d lv3 = lv2.normalize();
                int i = MathHelper.floor(lv2.length()) + 7;
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/AvoidSunlightGoal.java namedSrc/net/minecraft/entity/ai/goal/AvoidSunlightGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/AvoidSunlightGoal.java	2024-04-03 14:10:48.093676566 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/AvoidSunlightGoal.java	2024-04-03 14:09:37.561379529 +0000
@@ -29,7 +29,7 @@
     */
    @Override
    public boolean canStart() {
-      return this.mob.getWorld().isDay() && this.mob.m_zwvabaox(EquipmentSlot.HEAD).isEmpty() && NavigationConditions.hasMobNavigation(this.mob);
+      return this.mob.getWorld().isDay() && this.mob.getEquippedStack(EquipmentSlot.HEAD).isEmpty() && NavigationConditions.hasMobNavigation(this.mob);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/EscapeSunlightGoal.java namedSrc/net/minecraft/entity/ai/goal/EscapeSunlightGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/EscapeSunlightGoal.java	2024-04-03 14:10:47.881675662 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/EscapeSunlightGoal.java	2024-04-03 14:09:37.281378351 +0000
@@ -70,7 +70,7 @@
       } else if (!this.world.isSkyVisible(this.mob.getBlockPos())) {
          return false;
       } else {
-         return !this.mob.m_zwvabaox(EquipmentSlot.HEAD).isEmpty() ? false : this.targetShadedPos();
+         return !this.mob.getEquippedStack(EquipmentSlot.HEAD).isEmpty() ? false : this.targetShadedPos();
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java namedSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java	2024-04-03 14:10:47.921675832 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/FollowOwnerGoal.java	2024-04-03 14:09:37.333378571 +0000
@@ -144,7 +144,7 @@
     * @mapping {@literal named cannotMove Lnet/minecraft/entity/ai/goal/FollowOwnerGoal;cannotMove()Z}
     */
    private boolean cannotMove() {
-      return this.tameable.isSitting() || this.tameable.hasVehicle() || this.tameable.m_psezodiw();
+      return this.tameable.isSitting() || this.tameable.hasVehicle() || this.tameable.mayBeLeashed();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/HoldInHandsGoal.java namedSrc/net/minecraft/entity/ai/goal/HoldInHandsGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/HoldInHandsGoal.java	2024-04-03 14:10:48.041676344 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/HoldInHandsGoal.java	2024-04-03 14:09:37.473379159 +0000
@@ -67,7 +67,7 @@
     */
    @Override
    public void start() {
-      this.actor.m_udqbhpxg(EquipmentSlot.MAINHAND, this.item.copy());
+      this.actor.equipStack(EquipmentSlot.MAINHAND, this.item.copy());
       this.actor.setCurrentHand(Hand.MAIN_HAND);
    }
 
@@ -76,7 +76,7 @@
     */
    @Override
    public void stop() {
-      this.actor.m_udqbhpxg(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
+      this.actor.equipStack(EquipmentSlot.MAINHAND, ItemStack.EMPTY);
       if (this.sound != null) {
          this.actor.playSound(this.sound, 1.0F, this.actor.getRandom().nextFloat() * 0.2F + 0.9F);
       }
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.java namedSrc/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.java	2024-04-03 14:10:48.009676207 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/HorseBondWithPlayerGoal.java	2024-04-03 14:09:37.433378991 +0000
@@ -4,7 +4,7 @@
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityStatuses;
 import net.minecraft.entity.ai.NoPenaltyTargeting;
-import net.minecraft.entity.passive.HorseBaseEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.Vec3d;
 
@@ -15,9 +15,9 @@
 public class HorseBondWithPlayerGoal extends Goal {
    /**
     * @mapping {@literal hashed f_ybpighqc Lnet/minecraft/unmapped/C_ehgcbcik;f_ybpighqc:Lnet/minecraft/unmapped/C_ktznyhaj;}
-    * @mapping {@literal named horse Lnet/minecraft/entity/ai/goal/HorseBondWithPlayerGoal;horse:Lnet/minecraft/entity/passive/HorseBaseEntity;}
+    * @mapping {@literal named horse Lnet/minecraft/entity/ai/goal/HorseBondWithPlayerGoal;horse:Lnet/minecraft/entity/passive/AbstractHorseEntity;}
     */
-   private final HorseBaseEntity horse;
+   private final AbstractHorseEntity horse;
    /**
     * @mapping {@literal hashed f_ddxmrqyd Lnet/minecraft/unmapped/C_ehgcbcik;f_ddxmrqyd:D}
     * @mapping {@literal named speed Lnet/minecraft/entity/ai/goal/HorseBondWithPlayerGoal;speed:D}
@@ -41,9 +41,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ehgcbcik;<init>(Lnet/minecraft/unmapped/C_ktznyhaj;D)V}
-    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/HorseBondWithPlayerGoal;<init>(Lnet/minecraft/entity/passive/HorseBaseEntity;D)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/HorseBondWithPlayerGoal;<init>(Lnet/minecraft/entity/passive/AbstractHorseEntity;D)V}
     */
-   public HorseBondWithPlayerGoal(HorseBaseEntity horse, double speed) {
+   public HorseBondWithPlayerGoal(AbstractHorseEntity horse, double speed) {
       this.horse = horse;
       this.speed = speed;
       this.setControls(EnumSet.of(Goal.Control.MOVE));
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/RearGoal.java namedSrc/net/minecraft/entity/ai/goal/RearGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/RearGoal.java	2024-04-03 14:10:48.017676241 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/RearGoal.java	2024-04-03 14:09:37.437379008 +0000
@@ -1,6 +1,6 @@
 package net.minecraft.entity.ai.goal;
 
-import net.minecraft.entity.passive.HorseBaseEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.sound.SoundEvent;
 
 /**
@@ -10,9 +10,9 @@
 public class RearGoal extends Goal {
    /**
     * @mapping {@literal hashed f_hoovuoiy Lnet/minecraft/unmapped/C_ndpiopmv;f_hoovuoiy:Lnet/minecraft/unmapped/C_ktznyhaj;}
-    * @mapping {@literal named horse Lnet/minecraft/entity/ai/goal/RearGoal;horse:Lnet/minecraft/entity/passive/HorseBaseEntity;}
+    * @mapping {@literal named horse Lnet/minecraft/entity/ai/goal/RearGoal;horse:Lnet/minecraft/entity/passive/AbstractHorseEntity;}
     */
-   private final HorseBaseEntity horse;
+   private final AbstractHorseEntity horse;
    /**
     * @mapping {@literal hashed f_diehnube Lnet/minecraft/unmapped/C_ndpiopmv;f_diehnube:I}
     * @mapping {@literal named timer Lnet/minecraft/entity/ai/goal/RearGoal;timer:I}
@@ -21,9 +21,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_ndpiopmv;<init>(Lnet/minecraft/unmapped/C_ktznyhaj;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/RearGoal;<init>(Lnet/minecraft/entity/passive/HorseBaseEntity;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/ai/goal/RearGoal;<init>(Lnet/minecraft/entity/passive/AbstractHorseEntity;)V}
     */
-   public RearGoal(HorseBaseEntity horse) {
+   public RearGoal(AbstractHorseEntity horse) {
       this.horse = horse;
       this.resetTimer(horse);
    }
@@ -72,9 +72,9 @@
 
    /**
     * @mapping {@literal hashed m_cpjevhmh Lnet/minecraft/unmapped/C_ndpiopmv;m_cpjevhmh(Lnet/minecraft/unmapped/C_ktznyhaj;)V}
-    * @mapping {@literal named resetTimer Lnet/minecraft/entity/ai/goal/RearGoal;resetTimer(Lnet/minecraft/entity/passive/HorseBaseEntity;)V}
+    * @mapping {@literal named resetTimer Lnet/minecraft/entity/ai/goal/RearGoal;resetTimer(Lnet/minecraft/entity/passive/AbstractHorseEntity;)V}
     */
-   private void resetTimer(HorseBaseEntity horse) {
+   private void resetTimer(AbstractHorseEntity horse) {
       this.timer = -horse.getMinRearDelay();
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java namedSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java
--- namedTargetSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java	2024-04-03 14:10:48.077676497 +0000
+++ namedSrc/net/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal.java	2024-04-03 14:09:37.533379411 +0000
@@ -9,7 +9,7 @@
 import net.minecraft.entity.SpawnReason;
 import net.minecraft.entity.mob.SkeletonEntity;
 import net.minecraft.entity.mob.SkeletonHorseEntity;
-import net.minecraft.entity.passive.HorseBaseEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
@@ -65,7 +65,7 @@
             lv.spawnEntityAndPassengers(lv4);
 
             for (int i = 0; i < 3; i++) {
-               HorseBaseEntity lv5 = this.getHorse(lv2);
+               AbstractHorseEntity lv5 = this.getHorse(lv2);
                if (lv5 != null) {
                   SkeletonEntity lv6 = this.getSkeleton(lv2, lv5);
                   if (lv6 != null) {
@@ -83,10 +83,10 @@
 
    /**
     * @mapping {@literal hashed m_obntfjzt Lnet/minecraft/unmapped/C_aeyqpoyu;m_obntfjzt(Lnet/minecraft/unmapped/C_jiailwzt;)Lnet/minecraft/unmapped/C_ktznyhaj;}
-    * @mapping {@literal named getHorse Lnet/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal;getHorse(Lnet/minecraft/world/LocalDifficulty;)Lnet/minecraft/entity/passive/HorseBaseEntity;}
+    * @mapping {@literal named getHorse Lnet/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal;getHorse(Lnet/minecraft/world/LocalDifficulty;)Lnet/minecraft/entity/passive/AbstractHorseEntity;}
     */
    @Nullable
-   private HorseBaseEntity getHorse(LocalDifficulty localDifficulty) {
+   private AbstractHorseEntity getHorse(LocalDifficulty localDifficulty) {
       SkeletonHorseEntity lv = EntityType.SKELETON_HORSE.create(this.skeletonHorse.getWorld());
       if (lv != null) {
          lv.initialize((ServerWorld)this.skeletonHorse.getWorld(), localDifficulty, SpawnReason.TRIGGERED, null);
@@ -102,22 +102,22 @@
 
    /**
     * @mapping {@literal hashed m_ylaiemqt Lnet/minecraft/unmapped/C_aeyqpoyu;m_ylaiemqt(Lnet/minecraft/unmapped/C_jiailwzt;Lnet/minecraft/unmapped/C_ktznyhaj;)Lnet/minecraft/unmapped/C_fihnfnjv;}
-    * @mapping {@literal named getSkeleton Lnet/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal;getSkeleton(Lnet/minecraft/world/LocalDifficulty;Lnet/minecraft/entity/passive/HorseBaseEntity;)Lnet/minecraft/entity/mob/SkeletonEntity;}
+    * @mapping {@literal named getSkeleton Lnet/minecraft/entity/ai/goal/SkeletonHorseTrapTriggerGoal;getSkeleton(Lnet/minecraft/world/LocalDifficulty;Lnet/minecraft/entity/passive/AbstractHorseEntity;)Lnet/minecraft/entity/mob/SkeletonEntity;}
     */
    @Nullable
-   private SkeletonEntity getSkeleton(LocalDifficulty localDifficulty, HorseBaseEntity vehicle) {
+   private SkeletonEntity getSkeleton(LocalDifficulty localDifficulty, AbstractHorseEntity vehicle) {
       SkeletonEntity lv = EntityType.SKELETON.create(vehicle.getWorld());
       if (lv != null) {
          lv.initialize((ServerWorld)vehicle.getWorld(), localDifficulty, SpawnReason.TRIGGERED, null);
          lv.setPosition(vehicle.getX(), vehicle.getY(), vehicle.getZ());
          lv.timeUntilRegen = 60;
          lv.setPersistent();
-         if (lv.m_zwvabaox(EquipmentSlot.HEAD).isEmpty()) {
-            lv.m_udqbhpxg(EquipmentSlot.HEAD, new ItemStack(Items.IRON_HELMET));
+         if (lv.getEquippedStack(EquipmentSlot.HEAD).isEmpty()) {
+            lv.equipStack(EquipmentSlot.HEAD, new ItemStack(Items.IRON_HELMET));
          }
 
          FeatureFlagBitSet lv2 = vehicle.getWorld().getEnabledFlags();
-         lv.m_udqbhpxg(
+         lv.equipStack(
             EquipmentSlot.MAINHAND,
             EnchantmentHelper.enchant(
                lv2,
@@ -127,12 +127,12 @@
                false
             )
          );
-         lv.m_udqbhpxg(
+         lv.equipStack(
             EquipmentSlot.HEAD,
             EnchantmentHelper.enchant(
                lv2,
                lv.getRandom(),
-               this.removeEnchantments(lv.m_zwvabaox(EquipmentSlot.HEAD)),
+               this.removeEnchantments(lv.getEquippedStack(EquipmentSlot.HEAD)),
                (int)(5.0F + localDifficulty.getClampedLocalDifficulty() * (float)lv.getRandom().nextInt(18)),
                false
             )
diff -bur namedTargetSrc/net/minecraft/entity/AreaEffectCloudEntity.java namedSrc/net/minecraft/entity/AreaEffectCloudEntity.java
--- namedTargetSrc/net/minecraft/entity/AreaEffectCloudEntity.java	2024-04-03 14:10:47.921675832 +0000
+++ namedSrc/net/minecraft/entity/AreaEffectCloudEntity.java	2024-04-03 14:09:37.329378554 +0000
@@ -18,7 +18,7 @@
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.nbt.NbtOps;
-import net.minecraft.particle.EntityEffectParticleEffect;
+import net.minecraft.particle.ColoredParticleEffect;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.potion.Potion;
@@ -85,9 +85,10 @@
     */
    public static final float HEIGHT = 0.5F;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ptifiiup Lnet/minecraft/unmapped/C_dtsrsfye;f_ptifiiup:Lnet/minecraft/unmapped/C_xpqegwnr;}
+    * @mapping {@literal named potionContents Lnet/minecraft/entity/AreaEffectCloudEntity;potionContents:Lnet/minecraft/component/type/PotionContentsComponent;}
     */
-   private PotionContentsComponent f_ptifiiup = PotionContentsComponent.DEFAULT;
+   private PotionContentsComponent potionContents = PotionContentsComponent.DEFAULT;
    /**
     * @mapping {@literal hashed f_fnmdnkyf Lnet/minecraft/unmapped/C_dtsrsfye;f_fnmdnkyf:Ljava/util/Map;}
     * @mapping {@literal named affectedEntities Lnet/minecraft/entity/AreaEffectCloudEntity;affectedEntities:Ljava/util/Map;}
@@ -161,7 +162,7 @@
    protected void initDataTracker(DataTracker.Builder builder) {
       builder.add(RADIUS, 3.0F);
       builder.add(WAITING, false);
-      builder.add(PARTICLE_ID, EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, -1));
+      builder.add(PARTICLE_ID, ColoredParticleEffect.create(ParticleTypes.ENTITY_EFFECT, -1));
    }
 
    /**
@@ -195,10 +196,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pexreefj Lnet/minecraft/unmapped/C_dtsrsfye;m_pexreefj(Lnet/minecraft/unmapped/C_xpqegwnr;)V}
+    * @mapping {@literal named setPotionContents Lnet/minecraft/entity/AreaEffectCloudEntity;setPotionContents(Lnet/minecraft/component/type/PotionContentsComponent;)V}
     */
-   public void m_pexreefj(PotionContentsComponent arg) {
-      this.f_ptifiiup = arg;
+   public void setPotionContents(PotionContentsComponent contents) {
+      this.potionContents = contents;
       this.updateColor();
    }
 
@@ -207,8 +209,8 @@
     * @mapping {@literal named updateColor Lnet/minecraft/entity/AreaEffectCloudEntity;updateColor()V}
     */
    private void updateColor() {
-      int i = this.f_ptifiiup.equals(PotionContentsComponent.DEFAULT) ? 0 : this.f_ptifiiup.getColor();
-      this.dataTracker.set(PARTICLE_ID, EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, i));
+      int i = this.potionContents.equals(PotionContentsComponent.DEFAULT) ? 0 : this.potionContents.getColor();
+      this.dataTracker.set(PARTICLE_ID, ColoredParticleEffect.create(ParticleTypes.ENTITY_EFFECT, i));
    }
 
    /**
@@ -216,7 +218,7 @@
     * @mapping {@literal named addEffect Lnet/minecraft/entity/AreaEffectCloudEntity;addEffect(Lnet/minecraft/entity/effect/StatusEffectInstance;)V}
     */
    public void addEffect(StatusEffectInstance effect) {
-      this.m_pexreefj(this.f_ptifiiup.withEffect(effect));
+      this.setPotionContents(this.potionContents.withEffect(effect));
    }
 
    /**
@@ -298,7 +300,7 @@
             double e = this.getY();
             double n = this.getZ() + (double)(MathHelper.sin(l) * m);
             if (bl && this.random.nextBoolean()) {
-               this.getWorld().addImportantParticle(EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, -1), d, e, n, 0.0, 0.0, 0.0);
+               this.getWorld().addImportantParticle(ColoredParticleEffect.create(ParticleTypes.ENTITY_EFFECT, -1), d, e, n, 0.0, 0.0, 0.0);
             } else {
                this.getWorld().addImportantParticle(lv, d, e, n, 0.0, 0.0, 0.0);
             }
@@ -330,12 +332,12 @@
 
          if (this.age % 5 == 0) {
             this.affectedEntities.entrySet().removeIf(entry -> this.age >= (Integer)entry.getValue());
-            if (!this.f_ptifiiup.hasEffects()) {
+            if (!this.potionContents.hasEffects()) {
                this.affectedEntities.clear();
             } else {
                List<StatusEffectInstance> list = Lists.<StatusEffectInstance>newArrayList();
-               if (this.f_ptifiiup.potion().isPresent()) {
-                  for (StatusEffectInstance lv2 : ((Potion)((Holder)this.f_ptifiiup.potion().get()).value()).getEffects()) {
+               if (this.potionContents.potion().isPresent()) {
+                  for (StatusEffectInstance lv2 : ((Potion)((Holder)this.potionContents.potion().get()).value()).getEffects()) {
                      list.add(
                         new StatusEffectInstance(
                            lv2.getEffectType(), lv2.mapDuration(i -> i / 4), lv2.getAmplifier(), lv2.isAmbient(), lv2.shouldShowParticles()
@@ -344,7 +346,7 @@
                   }
                }
 
-               list.addAll(this.f_ptifiiup.customEffects());
+               list.addAll(this.potionContents.customEffects());
                List<LivingEntity> list2 = this.getWorld().getNonSpectatingEntities(LivingEntity.class, this.getBounds());
                if (!list2.isEmpty()) {
                   for (LivingEntity lv3 : list2) {
@@ -507,7 +509,7 @@
          PotionContentsComponent.CODEC
             .parse(NbtOps.INSTANCE, nbt.get("potion_contents"))
             .resultOrPartial(string -> LOGGER.warn("Failed to parse area effect cloud potions: '{}'", string))
-            .ifPresent(this::m_pexreefj);
+            .ifPresent(this::setPotionContents);
       }
    }
 
@@ -529,8 +531,8 @@
          nbt.putUuid("Owner", this.ownerUuid);
       }
 
-      if (!this.f_ptifiiup.equals(PotionContentsComponent.DEFAULT)) {
-         NbtElement lv = PotionContentsComponent.CODEC.encodeStart(NbtOps.INSTANCE, this.f_ptifiiup).getOrThrow();
+      if (!this.potionContents.equals(PotionContentsComponent.DEFAULT)) {
+         NbtElement lv = PotionContentsComponent.CODEC.encodeStart(NbtOps.INSTANCE, this.potionContents).getOrThrow();
          nbt.put("potion_contents", lv);
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java namedSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java
--- namedTargetSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java	2024-04-03 14:10:47.845675508 +0000
+++ namedSrc/net/minecraft/entity/attribute/DefaultAttributeRegistry.java	2024-04-03 14:09:37.233378150 +0000
@@ -45,6 +45,7 @@
 import net.minecraft.entity.mob.ZombifiedPiglinEntity;
 import net.minecraft.entity.mob.warden.WardenEntity;
 import net.minecraft.entity.passive.AbstractDonkeyEntity;
+import net.minecraft.entity.passive.AbstractHorseEntity;
 import net.minecraft.entity.passive.AllayEntity;
 import net.minecraft.entity.passive.ArmadilloEntity;
 import net.minecraft.entity.passive.AxolotlEntity;
@@ -60,7 +61,6 @@
 import net.minecraft.entity.passive.FrogEntity;
 import net.minecraft.entity.passive.GlowSquidEntity;
 import net.minecraft.entity.passive.GoatEntity;
-import net.minecraft.entity.passive.HorseBaseEntity;
 import net.minecraft.entity.passive.IronGolemEntity;
 import net.minecraft.entity.passive.LlamaEntity;
 import net.minecraft.entity.passive.OcelotEntity;
@@ -102,12 +102,12 @@
       )
       .put(EntityType.ALLAY, AllayEntity.createAttributes().build())
       .put(EntityType.ARMADILLO, ArmadilloEntity.createAttributes().build())
-      .put(EntityType.ARMOR_STAND, ArmorStandEntity.m_nendfomc().build())
+      .put(EntityType.ARMOR_STAND, ArmorStandEntity.createAttributes().build())
       .put(EntityType.AXOLOTL, AxolotlEntity.createAttributes().build())
       .put(EntityType.BAT, BatEntity.createAttributes().build())
       .put(EntityType.BEE, BeeEntity.createAttributes().build())
       .put(EntityType.BLAZE, BlazeEntity.createAttributes().build())
-      .put(EntityType.BOGGED, BoggedEntity.m_hspcdijf().build())
+      .put(EntityType.BOGGED, BoggedEntity.createAttributes().build())
       .put(EntityType.CAT, CatEntity.createAttributes().build())
       .put(EntityType.CAMEL, CamelEntity.createAttributes().build())
       .put(EntityType.CAVE_SPIDER, CaveSpiderEntity.createAttributes().build())
@@ -123,7 +123,7 @@
       .put(EntityType.ENDERMITE, EndermiteEntity.createAttributes().build())
       .put(EntityType.ENDER_DRAGON, EnderDragonEntity.createAttributes().build())
       .put(EntityType.EVOKER, EvokerEntity.createAttributes().build())
-      .put(EntityType.BREEZE, BreezeEntity.m_cijxjjfl().build())
+      .put(EntityType.BREEZE, BreezeEntity.createAttributes().build())
       .put(EntityType.FOX, FoxEntity.createAttributes().build())
       .put(EntityType.FROG, FrogEntity.createAttributes().build())
       .put(EntityType.GHAST, GhastEntity.createAttributes().build())
@@ -132,7 +132,7 @@
       .put(EntityType.GOAT, GoatEntity.createAttributes().build())
       .put(EntityType.GUARDIAN, GuardianEntity.createAttributes().build())
       .put(EntityType.HOGLIN, HoglinEntity.createAttributes().build())
-      .put(EntityType.HORSE, HorseBaseEntity.createBaseAttributes().build())
+      .put(EntityType.HORSE, AbstractHorseEntity.createBaseAttributes().build())
       .put(EntityType.HUSK, ZombieEntity.createAttributes().build())
       .put(EntityType.ILLUSIONER, IllusionerEntity.createAttributes().build())
       .put(EntityType.IRON_GOLEM, IronGolemEntity.createAttributes().build())
diff -bur namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java namedSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java
--- namedTargetSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java	2024-04-03 14:10:48.045676361 +0000
+++ namedSrc/net/minecraft/entity/attribute/EntityAttributeInstance.java	2024-04-03 14:09:37.481379192 +0000
@@ -109,10 +109,10 @@
 
    /**
     * @mapping {@literal hashed m_gktfmzhg Lnet/minecraft/unmapped/C_lzukavpx;m_gktfmzhg(Lnet/minecraft/unmapped/C_hdbqsqsm$C_pljpmmzs;)Ljava/util/Map;}
-    * @mapping {@literal named m_gktfmzhg Lnet/minecraft/entity/attribute/EntityAttributeInstance;m_gktfmzhg(Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;)Ljava/util/Map;}
+    * @mapping {@literal named addIfAbsent Lnet/minecraft/entity/attribute/EntityAttributeInstance;addIfAbsent(Lnet/minecraft/entity/attribute/EntityAttributeModifier$Operation;)Ljava/util/Map;}
     */
    @VisibleForTesting
-   Map<UUID, EntityAttributeModifier> m_gktfmzhg(EntityAttributeModifier.Operation key) {
+   Map<UUID, EntityAttributeModifier> addIfAbsent(EntityAttributeModifier.Operation key) {
       return (Map<UUID, EntityAttributeModifier>)this.operationToModifiers.computeIfAbsent(key, operation -> new Object2ObjectOpenHashMap());
    }
 
@@ -150,7 +150,7 @@
       if (lv != null) {
          throw new IllegalArgumentException("Modifier is already applied on this attribute!");
       } else {
-         this.m_gktfmzhg(modifier.operation()).put(modifier.id(), modifier);
+         this.addIfAbsent(modifier.operation()).put(modifier.id(), modifier);
          this.onUpdate();
       }
    }
@@ -159,10 +159,10 @@
     * @mapping {@literal hashed m_mrmrewks Lnet/minecraft/unmapped/C_lzukavpx;m_mrmrewks(Lnet/minecraft/unmapped/C_hdbqsqsm;)V}
     * @mapping {@literal named updateModifier Lnet/minecraft/entity/attribute/EntityAttributeInstance;updateModifier(Lnet/minecraft/entity/attribute/EntityAttributeModifier;)V}
     */
-   public void updateModifier(EntityAttributeModifier arg) {
-      EntityAttributeModifier lv = (EntityAttributeModifier)this.idToModifiers.put(arg.id(), arg);
-      if (arg != lv) {
-         this.m_gktfmzhg(arg.operation()).put(arg.id(), arg);
+   public void updateModifier(EntityAttributeModifier modifier) {
+      EntityAttributeModifier lv = (EntityAttributeModifier)this.idToModifiers.put(modifier.id(), modifier);
+      if (modifier != lv) {
+         this.addIfAbsent(modifier.operation()).put(modifier.id(), modifier);
          this.onUpdate();
       }
    }
@@ -211,7 +211,7 @@
    public void removeModifier(UUID uuid) {
       EntityAttributeModifier lv = (EntityAttributeModifier)this.idToModifiers.remove(uuid);
       if (lv != null) {
-         this.m_gktfmzhg(lv.operation()).remove(uuid);
+         this.addIfAbsent(lv.operation()).remove(uuid);
          this.persistentModifiers.remove(uuid);
          this.onUpdate();
       }
@@ -226,7 +226,7 @@
       if (lv == null) {
          return false;
       } else {
-         this.m_gktfmzhg(lv.operation()).remove(lv.id());
+         this.addIfAbsent(lv.operation()).remove(lv.id());
          this.idToModifiers.remove(uuid);
          this.onUpdate();
          return true;
@@ -311,7 +311,7 @@
       this.persistentModifiers.clear();
       this.persistentModifiers.putAll(other.persistentModifiers);
       this.operationToModifiers.clear();
-      other.operationToModifiers.forEach((operation, map) -> this.m_gktfmzhg(operation).putAll(map));
+      other.operationToModifiers.forEach((operation, map) -> this.addIfAbsent(operation).putAll(map));
       this.onUpdate();
    }
 
@@ -352,7 +352,7 @@
             EntityAttributeModifier lv2 = EntityAttributeModifier.fromNbt(lv.getCompound(i));
             if (lv2 != null) {
                this.idToModifiers.put(lv2.id(), lv2);
-               this.m_gktfmzhg(lv2.operation()).put(lv2.id(), lv2);
+               this.addIfAbsent(lv2.operation()).put(lv2.id(), lv2);
                this.persistentModifiers.put(lv2.id(), lv2);
             }
          }
diff -bur namedTargetSrc/net/minecraft/entity/boss/BossBarManager.java namedSrc/net/minecraft/entity/boss/BossBarManager.java
--- namedTargetSrc/net/minecraft/entity/boss/BossBarManager.java	2024-04-03 14:10:47.993676139 +0000
+++ namedSrc/net/minecraft/entity/boss/BossBarManager.java	2024-04-03 14:09:37.413378907 +0000
@@ -68,11 +68,11 @@
     * @mapping {@literal hashed m_yslgusfr Lnet/minecraft/unmapped/C_xtwgkoiw;m_yslgusfr(Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;}
     * @mapping {@literal named toNbt Lnet/minecraft/entity/boss/BossBarManager;toNbt(Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/nbt/NbtCompound;}
     */
-   public NbtCompound toNbt(HolderLookup.Provider arg) {
+   public NbtCompound toNbt(HolderLookup.Provider lookupProvider) {
       NbtCompound lv = new NbtCompound();
 
       for (CommandBossBar lv2 : this.commandBossBars.values()) {
-         lv.put(lv2.getId().toString(), lv2.toNbt(arg));
+         lv.put(lv2.getId().toString(), lv2.toNbt(lookupProvider));
       }
 
       return lv;
@@ -82,10 +82,10 @@
     * @mapping {@literal hashed m_orrnpvup Lnet/minecraft/unmapped/C_xtwgkoiw;m_orrnpvup(Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)V}
     * @mapping {@literal named readNbt Lnet/minecraft/entity/boss/BossBarManager;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) {
       for (String string : nbt.getKeys()) {
          Identifier lv = new Identifier(string);
-         this.commandBossBars.put(lv, CommandBossBar.fromNbt(nbt.getCompound(string), lv, arg2));
+         this.commandBossBars.put(lv, CommandBossBar.fromNbt(nbt.getCompound(string), lv, lookupProvider));
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/boss/CommandBossBar.java namedSrc/net/minecraft/entity/boss/CommandBossBar.java
--- namedTargetSrc/net/minecraft/entity/boss/CommandBossBar.java	2024-04-03 14:10:48.037676327 +0000
+++ namedSrc/net/minecraft/entity/boss/CommandBossBar.java	2024-04-03 14:09:37.469379142 +0000
@@ -202,9 +202,9 @@
     * @mapping {@literal hashed m_qnxyeypi Lnet/minecraft/unmapped/C_izahjvwf;m_qnxyeypi(Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_hhlwcnih;}
     * @mapping {@literal named toNbt Lnet/minecraft/entity/boss/CommandBossBar;toNbt(Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/nbt/NbtCompound;}
     */
-   public NbtCompound toNbt(HolderLookup.Provider arg) {
+   public NbtCompound toNbt(HolderLookup.Provider lookupProvider) {
       NbtCompound lv = new NbtCompound();
-      lv.putString("Name", Text.Serializer.toJson(this.name, arg));
+      lv.putString("Name", Text.SerializationUtil.toJson(this.name, lookupProvider));
       lv.putBoolean("Visible", this.isVisible());
       lv.putInt("Value", this.value);
       lv.putInt("Max", this.maxValue);
@@ -227,8 +227,8 @@
     * @mapping {@literal hashed m_sayczpmf Lnet/minecraft/unmapped/C_izahjvwf;m_sayczpmf(Lnet/minecraft/unmapped/C_hhlwcnih;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_vtbxyypo$C_etmlgbig;)Lnet/minecraft/unmapped/C_izahjvwf;}
     * @mapping {@literal named fromNbt Lnet/minecraft/entity/boss/CommandBossBar;fromNbt(Lnet/minecraft/nbt/NbtCompound;Lnet/minecraft/util/Identifier;Lnet/minecraft/registry/HolderLookup$Provider;)Lnet/minecraft/entity/boss/CommandBossBar;}
     */
-   public static CommandBossBar fromNbt(NbtCompound nbt, Identifier id, HolderLookup.Provider arg3) {
-      CommandBossBar lv = new CommandBossBar(id, Text.Serializer.m_npeyudcr(nbt.getString("Name"), arg3));
+   public static CommandBossBar fromNbt(NbtCompound nbt, Identifier id, HolderLookup.Provider lookupProvider) {
+      CommandBossBar lv = new CommandBossBar(id, Text.SerializationUtil.fromJson(nbt.getString("Name"), lookupProvider));
       lv.setVisible(nbt.getBoolean("Visible"));
       lv.setValue(nbt.getInt("Value"));
       lv.setMaxValue(nbt.getInt("Max"));
diff -bur namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java namedSrc/net/minecraft/entity/boss/WitherEntity.java
--- namedTargetSrc/net/minecraft/entity/boss/WitherEntity.java	2024-04-03 14:10:47.865675594 +0000
+++ namedSrc/net/minecraft/entity/boss/WitherEntity.java	2024-04-03 14:09:37.261378268 +0000
@@ -36,7 +36,7 @@
 import net.minecraft.entity.projectile.WitherSkullEntity;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.particle.EntityEffectParticleEffect;
+import net.minecraft.particle.ColoredParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.tag.BlockTags;
 import net.minecraft.registry.tag.DamageTypeTags;
@@ -325,7 +325,7 @@
          if (bl && this.getWorld().random.nextInt(4) == 0) {
             this.getWorld()
                .addParticle(
-                  EntityEffectParticleEffect.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, 0.7F, 0.7F, 0.5F),
+                  ColoredParticleEffect.create(ParticleTypes.ENTITY_EFFECT, 0.7F, 0.7F, 0.5F),
                   r + this.random.nextGaussian() * (double)u,
                   s + this.random.nextGaussian() * (double)u,
                   t + this.random.nextGaussian() * (double)u,
@@ -342,7 +342,7 @@
          for (int w = 0; w < 3; w++) {
             this.getWorld()
                .addParticle(
-                  EntityEffectParticleEffect.m_vnsoutnn(ParticleTypes.ENTITY_EFFECT, 0.7F, 0.7F, 0.9F),
+                  ColoredParticleEffect.create(ParticleTypes.ENTITY_EFFECT, 0.7F, 0.7F, 0.9F),
                   this.getX() + this.random.nextGaussian(),
                   this.getY() + (double)(this.random.nextFloat() * v),
                   this.getZ() + this.random.nextGaussian(),
diff -bur namedTargetSrc/net/minecraft/entity/BreezeWindChargeEntity.java namedSrc/net/minecraft/entity/BreezeWindChargeEntity.java
--- namedTargetSrc/net/minecraft/entity/BreezeWindChargeEntity.java	2024-04-03 14:10:47.925675850 +0000
+++ namedSrc/net/minecraft/entity/BreezeWindChargeEntity.java	2024-04-03 14:09:37.333378571 +0000
@@ -12,9 +12,10 @@
  */
 public class BreezeWindChargeEntity extends WindChargeProjectileEntity {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_zhlnocwh Lnet/minecraft/unmapped/C_uqkupzdc;f_zhlnocwh:F}
+    * @mapping {@literal named EXPLOSION_POWER Lnet/minecraft/entity/BreezeWindChargeEntity;EXPLOSION_POWER:F}
     */
-   private static final float f_zhlnocwh = 3.0F;
+   private static final float EXPLOSION_POWER = 3.0F;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_uqkupzdc;<init>(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
@@ -38,10 +39,10 @@
    @Override
    protected void createExplosion() {
       this.getWorld()
-         .m_kyovuptu(
+         .createExplosion(
             this,
             null,
-            f_whsjpufz,
+            EXPLOSION_BEHAVIOR,
             this.getX(),
             this.getY(),
             this.getZ(),
diff -bur namedTargetSrc/net/minecraft/entity/damage/DamageTracker.java namedSrc/net/minecraft/entity/damage/DamageTracker.java
--- namedTargetSrc/net/minecraft/entity/damage/DamageTracker.java	2024-04-03 14:10:48.037676327 +0000
+++ namedSrc/net/minecraft/entity/damage/DamageTracker.java	2024-04-03 14:09:37.469379142 +0000
@@ -110,30 +110,30 @@
 
    /**
     * @mapping {@literal hashed m_lagkuzok Lnet/minecraft/unmapped/C_xkhemiqp;m_lagkuzok(Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_rdaqiwdt;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named m_lagkuzok Lnet/minecraft/entity/damage/DamageTracker;m_lagkuzok(Lnet/minecraft/entity/Entity;Lnet/minecraft/text/Text;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/text/Text;}
+    * @mapping {@literal named formatDeathMessage Lnet/minecraft/entity/damage/DamageTracker;formatDeathMessage(Lnet/minecraft/entity/Entity;Lnet/minecraft/text/Text;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/text/Text;}
     */
-   private Text m_lagkuzok(Entity entity, Text arg2, String string, String string2) {
+   private Text formatDeathMessage(Entity entity, Text displayName, String customItemTranslationKey, String baseTranslationKey) {
       ItemStack lv2 = entity instanceof LivingEntity lv ? lv.getMainHandStack() : ItemStack.EMPTY;
       return !lv2.isEmpty() && lv2.contains(DataComponentTypes.CUSTOM_NAME)
-         ? Text.translatable(string, this.entity.getDisplayName(), arg2, lv2.toHoverableText())
-         : Text.translatable(string2, this.entity.getDisplayName(), arg2);
+         ? Text.translatable(customItemTranslationKey, this.entity.getDisplayName(), displayName, lv2.toHoverableText())
+         : Text.translatable(baseTranslationKey, this.entity.getDisplayName(), displayName);
    }
 
    /**
     * @mapping {@literal hashed m_xfvrnbnv Lnet/minecraft/unmapped/C_xkhemiqp;m_xfvrnbnv(Lnet/minecraft/unmapped/C_opjrpnsy;Lnet/minecraft/unmapped/C_astfners;)Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named m_xfvrnbnv Lnet/minecraft/entity/damage/DamageTracker;m_xfvrnbnv(Lnet/minecraft/entity/damage/DamageRecord;Lnet/minecraft/entity/Entity;)Lnet/minecraft/text/Text;}
+    * @mapping {@literal named getFallingDeathMessage Lnet/minecraft/entity/damage/DamageTracker;getFallingDeathMessage(Lnet/minecraft/entity/damage/DamageRecord;Lnet/minecraft/entity/Entity;)Lnet/minecraft/text/Text;}
     */
-   private Text m_xfvrnbnv(DamageRecord damage, @Nullable Entity entity) {
+   private Text getFallingDeathMessage(DamageRecord damage, @Nullable Entity entity) {
       DamageSource lv = damage.source();
       if (!lv.isTypeIn(DamageTypeTags.IS_FALL) && !lv.isTypeIn(DamageTypeTags.ALWAYS_MOST_SIGNIFICANT_FALL)) {
          Text lv3 = getDisplayName(entity);
          Entity lv4 = lv.getAttacker();
          Text lv5 = getDisplayName(lv4);
          if (lv5 != null && !lv5.equals(lv3)) {
-            return this.m_lagkuzok(lv4, lv5, "death.fell.assist.item", "death.fell.assist");
+            return this.formatDeathMessage(lv4, lv5, "death.fell.assist.item", "death.fell.assist");
          } else {
             return (Text)(lv3 != null
-               ? this.m_lagkuzok(entity, lv3, "death.fell.finish.item", "death.fell.finish")
+               ? this.formatDeathMessage(entity, lv3, "death.fell.finish.item", "death.fell.finish")
                : Text.translatable("death.fell.killer", this.entity.getDisplayName()));
          }
       } else {
@@ -164,7 +164,7 @@
          DamageRecord lv3 = this.getBiggestFall();
          DeathMessageType lv4 = lv2.getType().getDeathMessageType();
          if (lv4 == DeathMessageType.FALL_VARIANTS && lv3 != null) {
-            return this.m_xfvrnbnv(lv3, lv2.getAttacker());
+            return this.getFallingDeathMessage(lv3, lv2.getAttacker());
          } else if (lv4 == DeathMessageType.INTENTIONAL_GAME_DESIGN) {
             String string = "death.attack." + lv2.getName();
             Text lv5 = Texts.bracketed(Text.translatable(string + ".link")).fillStyle(INTENTIONAL_GAME_DESIGN_STYLE);
diff -bur namedTargetSrc/net/minecraft/entity/DamageUtil.java namedSrc/net/minecraft/entity/DamageUtil.java
--- namedTargetSrc/net/minecraft/entity/DamageUtil.java	2024-04-03 14:10:47.941675918 +0000
+++ namedSrc/net/minecraft/entity/DamageUtil.java	2024-04-03 14:09:37.349378638 +0000
@@ -39,11 +39,11 @@
     * @mapping {@literal hashed m_penyqeye Lnet/minecraft/unmapped/C_agstzlgm;m_penyqeye(FLnet/minecraft/unmapped/C_sbxfkpyv;FF)F}
     * @mapping {@literal named getDamageLeft Lnet/minecraft/entity/DamageUtil;getDamageLeft(FLnet/minecraft/entity/damage/DamageSource;FF)F}
     */
-   public static float getDamageLeft(float damage, DamageSource arg, float armor, float armorToughness) {
+   public static float getDamageLeft(float damage, DamageSource source, float armor, float armorToughness) {
       float i = 2.0F + armorToughness / 4.0F;
       float j = MathHelper.clamp(armor - damage / i, armor * 0.2F, 20.0F);
       float k = j / 25.0F;
-      float l = EnchantmentHelper.getArmorBreach(arg.getAttacker(), k);
+      float l = EnchantmentHelper.getArmorBreach(source.getAttacker(), k);
       float m = 1.0F - l;
       return damage * m;
    }
diff -bur namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java
--- namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-04-03 14:10:47.965676021 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-04-03 14:09:37.377378756 +0000
@@ -13,6 +13,7 @@
 import net.minecraft.entity.passive.CatVariant;
 import net.minecraft.entity.passive.FrogVariant;
 import net.minecraft.entity.passive.SnifferEntity;
+import net.minecraft.entity.passive.WolfVariant;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.network.RegistryByteBuf;
@@ -25,7 +26,6 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.text.Text;
 import net.minecraft.text.TextCodecs;
-import net.minecraft.unmapped.C_qgilydva;
 import net.minecraft.util.UuidUtil;
 import net.minecraft.util.collection.Int2ObjectBiMap;
 import net.minecraft.util.dynamic.GlobalPos;
@@ -150,9 +150,10 @@
     */
    public static final TrackedDataHandler<ParticleEffect> PARTICLE = TrackedDataHandler.create(ParticleTypes.CODEC);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kolazbza Lnet/minecraft/unmapped/C_fegtripb;f_kolazbza:Lnet/minecraft/unmapped/C_xrzqxzbg;}
+    * @mapping {@literal named PARTICLES Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;PARTICLES:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<List<ParticleEffect>> f_kolazbza = TrackedDataHandler.create(ParticleTypes.CODEC.apply(PacketCodecs.toCollection()));
+   public static final TrackedDataHandler<List<ParticleEffect>> PARTICLES = TrackedDataHandler.create(ParticleTypes.CODEC.apply(PacketCodecs.toCollection()));
    /**
     * @mapping {@literal hashed f_bhjosbpm Lnet/minecraft/unmapped/C_fegtripb;f_bhjosbpm:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named ROTATION Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;ROTATION:Lnet/minecraft/entity/data/TrackedDataHandler;}
@@ -254,7 +255,7 @@
     * @mapping {@literal hashed f_jymqxprw Lnet/minecraft/unmapped/C_fegtripb;f_jymqxprw:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named WOLF_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;WOLF_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<Holder<C_qgilydva>> WOLF_VARIANT = TrackedDataHandler.create(PacketCodecs.holder(RegistryKeys.WOLF_VARIANT));
+   public static final TrackedDataHandler<Holder<WolfVariant>> WOLF_VARIANT = TrackedDataHandler.create(PacketCodecs.holder(RegistryKeys.WOLF_VARIANT));
    /**
     * @mapping {@literal hashed f_vcohujss Lnet/minecraft/unmapped/C_fegtripb;f_vcohujss:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named FROG_VARIANT Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;FROG_VARIANT:Lnet/minecraft/entity/data/TrackedDataHandler;}
@@ -341,7 +342,7 @@
       register(OPTIONAL_BLOCK_STATE);
       register(TAG_COMPOUND);
       register(PARTICLE);
-      register(f_kolazbza);
+      register(PARTICLES);
       register(VILLAGER_DATA);
       register(FIREWORK_DATA);
       register(ENTITY_POSE);
diff -bur namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-04-03 14:10:48.001676173 +0000
+++ namedSrc/net/minecraft/entity/decoration/ArmorStandEntity.java	2024-04-03 14:09:37.417378924 +0000
@@ -271,9 +271,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_nendfomc Lnet/minecraft/unmapped/C_nknvrhfn;m_nendfomc()Lnet/minecraft/unmapped/C_sdjuuzrz$C_tehwrjus;}
+    * @mapping {@literal named createAttributes Lnet/minecraft/entity/decoration/ArmorStandEntity;createAttributes()Lnet/minecraft/entity/attribute/DefaultAttributeContainer$Builder;}
     */
-   public static DefaultAttributeContainer.Builder m_nendfomc() {
+   public static DefaultAttributeContainer.Builder createAttributes() {
       return createAttributes().add(EntityAttributes.GENERIC_STEP_HEIGHT, 0.0);
    }
 
@@ -324,7 +325,7 @@
     * Mapping not found
     */
    @Override
-   public Iterable<ItemStack> m_qjxxiksy() {
+   public Iterable<ItemStack> getHandItems() {
       return this.heldItems;
    }
 
@@ -332,7 +333,7 @@
     * Mapping not found
     */
    @Override
-   public Iterable<ItemStack> m_xqeoerfz() {
+   public Iterable<ItemStack> getArmorItems() {
       return this.armorItems;
    }
 
@@ -340,12 +341,12 @@
     * Mapping not found
     */
    @Override
-   public ItemStack m_zwvabaox(EquipmentSlot arg) {
-      switch (arg.getType()) {
+   public ItemStack getEquippedStack(EquipmentSlot slot) {
+      switch (slot.getType()) {
          case HAND:
-            return this.heldItems.get(arg.getEntitySlotId());
+            return this.heldItems.get(slot.getEntitySlotId());
          case ARMOR:
-            return this.armorItems.get(arg.getEntitySlotId());
+            return this.armorItems.get(slot.getEntitySlotId());
          default:
             return ItemStack.EMPTY;
       }
@@ -355,23 +356,22 @@
     * Mapping not found
     */
    @Override
-   public boolean m_xcvctlld(EquipmentSlot arg) {
-      return arg != EquipmentSlot.BODY;
+   public boolean canUseSlot(EquipmentSlot slot) {
+      return slot != EquipmentSlot.BODY;
    }
 
    /**
-    * @mapping {@literal hashed m_udqbhpxg Lnet/minecraft/unmapped/C_nknvrhfn;m_udqbhpxg(Lnet/minecraft/unmapped/C_yuycoehb;Lnet/minecraft/unmapped/C_sddaxwyk;)V}
-    * @mapping {@literal named m_udqbhpxg Lnet/minecraft/entity/decoration/ArmorStandEntity;m_udqbhpxg(Lnet/minecraft/entity/EquipmentSlot;Lnet/minecraft/item/ItemStack;)V}
+    * Mapping not found
     */
    @Override
-   public void m_udqbhpxg(EquipmentSlot arg, ItemStack stack) {
+   public void equipStack(EquipmentSlot slot, ItemStack stack) {
       this.processEquippedStack(stack);
-      switch (arg.getType()) {
+      switch (slot.getType()) {
          case HAND:
-            this.onEquipItem(arg, this.heldItems.set(arg.getEntitySlotId(), stack), stack);
+            this.onEquipItem(slot, this.heldItems.set(slot.getEntitySlotId(), stack), stack);
             break;
          case ARMOR:
-            this.onEquipItem(arg, this.armorItems.set(arg.getEntitySlotId(), stack), stack);
+            this.onEquipItem(slot, this.armorItems.set(slot.getEntitySlotId(), stack), stack);
       }
    }
 
@@ -381,7 +381,7 @@
    @Override
    public boolean canEquip(ItemStack stack) {
       EquipmentSlot lv = MobEntity.getPreferredEquipmentSlot(stack);
-      return this.m_zwvabaox(lv).isEmpty() && !this.isSlotDisabled(lv);
+      return this.getEquippedStack(lv).isEmpty() && !this.isSlotDisabled(lv);
    }
 
    /**
@@ -605,22 +605,22 @@
     * @mapping {@literal named equip Lnet/minecraft/entity/decoration/ArmorStandEntity;equip(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/entity/EquipmentSlot;Lnet/minecraft/item/ItemStack;Lnet/minecraft/util/Hand;)Z}
     */
    private boolean equip(PlayerEntity player, EquipmentSlot slot, ItemStack stack, Hand hand) {
-      ItemStack lv = this.m_zwvabaox(slot);
+      ItemStack lv = this.getEquippedStack(slot);
       if (!lv.isEmpty() && (this.disabledSlots & 1 << slot.getArmorStandSlotId() + 8) != 0) {
          return false;
       } else if (lv.isEmpty() && (this.disabledSlots & 1 << slot.getArmorStandSlotId() + 16) != 0) {
          return false;
       } else if (player.isInCreativeMode() && lv.isEmpty() && !stack.isEmpty()) {
-         this.m_udqbhpxg(slot, stack.copyWithCount(1));
+         this.equipStack(slot, stack.copyWithCount(1));
          return true;
       } else if (stack.isEmpty() || stack.getCount() <= 1) {
-         this.m_udqbhpxg(slot, stack);
+         this.equipStack(slot, stack);
          player.setStackInHand(hand, lv);
          return true;
       } else if (!lv.isEmpty()) {
          return false;
       } else {
-         this.m_udqbhpxg(slot, stack.split(1));
+         this.equipStack(slot, stack.split(1));
          return true;
       }
    }

@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/entity/decoration/DisplayEntity.java namedSrc/net/minecraft/entity/decoration/DisplayEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/DisplayEntity.java	2024-04-03 14:10:47.845675508 +0000
+++ namedSrc/net/minecraft/entity/decoration/DisplayEntity.java	2024-04-03 14:09:37.241378184 +0000
@@ -55,17 +55,20 @@
     */
    public static final int NO_BRIGHTNESS_OVERRIDE = -1;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_irdedhug Lnet/minecraft/unmapped/C_zdeutotk;f_irdedhug:Lnet/minecraft/unmapped/C_rinmcaxy;}
+    * @mapping {@literal named START_INTERPOLATION Lnet/minecraft/entity/decoration/DisplayEntity;START_INTERPOLATION:Lnet/minecraft/entity/data/TrackedData;}
     */
-   private static final TrackedData<Integer> f_irdedhug = DataTracker.registerData(DisplayEntity.class, TrackedDataHandlerRegistry.INTEGER);
+   private static final TrackedData<Integer> START_INTERPOLATION = DataTracker.registerData(DisplayEntity.class, TrackedDataHandlerRegistry.INTEGER);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_xlyoeing Lnet/minecraft/unmapped/C_zdeutotk;f_xlyoeing:Lnet/minecraft/unmapped/C_rinmcaxy;}
+    * @mapping {@literal named INTERPOLATION_DURATION Lnet/minecraft/entity/decoration/DisplayEntity;INTERPOLATION_DURATION:Lnet/minecraft/entity/data/TrackedData;}
     */
-   private static final TrackedData<Integer> f_xlyoeing = DataTracker.registerData(DisplayEntity.class, TrackedDataHandlerRegistry.INTEGER);
+   private static final TrackedData<Integer> INTERPOLATION_DURATION = DataTracker.registerData(DisplayEntity.class, TrackedDataHandlerRegistry.INTEGER);
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_exeyhnpz Lnet/minecraft/unmapped/C_zdeutotk;f_exeyhnpz:Lnet/minecraft/unmapped/C_rinmcaxy;}
+    * @mapping {@literal named TELEPORT_DURATION Lnet/minecraft/entity/decoration/DisplayEntity;TELEPORT_DURATION:Lnet/minecraft/entity/data/TrackedData;}
     */
-   private static final TrackedData<Integer> f_exeyhnpz = DataTracker.registerData(DisplayEntity.class, TrackedDataHandlerRegistry.INTEGER);
+   private static final TrackedData<Integer> TELEPORT_DURATION = DataTracker.registerData(DisplayEntity.class, TrackedDataHandlerRegistry.INTEGER);
    /**
     * @mapping {@literal hashed f_rrozolcg Lnet/minecraft/unmapped/C_zdeutotk;f_rrozolcg:Lnet/minecraft/unmapped/C_rinmcaxy;}
     * @mapping {@literal named TRANSLATION Lnet/minecraft/entity/decoration/DisplayEntity;TRANSLATION:Lnet/minecraft/entity/data/TrackedData;}
@@ -156,17 +159,20 @@
     */
    private static final int NO_GLOW_COLOR_OVERRIDE = -1;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hdayzsvy Lnet/minecraft/unmapped/C_zdeutotk;f_hdayzsvy:Ljava/lang/String;}
+    * @mapping {@literal named TELEPORT_DURATION_KEY Lnet/minecraft/entity/decoration/DisplayEntity;TELEPORT_DURATION_KEY:Ljava/lang/String;}
     */
-   public static final String f_hdayzsvy = "teleport_duration";
+   public static final String TELEPORT_DURATION_KEY = "teleport_duration";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jwgnncfg Lnet/minecraft/unmapped/C_zdeutotk;f_jwgnncfg:Ljava/lang/String;}
+    * @mapping {@literal named INTERPOLATION_DURATION_KEY Lnet/minecraft/entity/decoration/DisplayEntity;INTERPOLATION_DURATION_KEY:Ljava/lang/String;}
     */
-   public static final String f_jwgnncfg = "interpolation_duration";
+   public static final String INTERPOLATION_DURATION_KEY = "interpolation_duration";
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_wfsednzd Lnet/minecraft/unmapped/C_zdeutotk;f_wfsednzd:Ljava/lang/String;}
+    * @mapping {@literal named START_INTERPOLATION_KEY Lnet/minecraft/entity/decoration/DisplayEntity;START_INTERPOLATION_KEY:Ljava/lang/String;}
     */
-   public static final String f_wfsednzd = "start_interpolation";
+   public static final String START_INTERPOLATION_KEY = "start_interpolation";
    /**
     * @mapping {@literal hashed f_ifxsoavw Lnet/minecraft/unmapped/C_zdeutotk;f_ifxsoavw:Ljava/lang/String;}
     * @mapping {@literal named TRANSFORMATION_KEY Lnet/minecraft/entity/decoration/DisplayEntity;TRANSFORMATION_KEY:Ljava/lang/String;}
@@ -254,10 +260,11 @@
    @Nullable
    private DisplayEntity.RenderState renderState;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ufuxdfdq Lnet/minecraft/unmapped/C_zdeutotk;f_ufuxdfdq:Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw;}
+    * @mapping {@literal named interpolationTarget Lnet/minecraft/entity/decoration/DisplayEntity;interpolationTarget:Lnet/minecraft/entity/decoration/DisplayEntity$InterpolationTarget;}
     */
    @Nullable
-   private DisplayEntity.C_xolajlpw f_ufuxdfdq;
+   private DisplayEntity.InterpolationTarget interpolationTarget;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zdeutotk;<init>(Lnet/minecraft/unmapped/C_ogavsvbr;Lnet/minecraft/unmapped/C_cdctfzbn;)V}
@@ -280,11 +287,11 @@
          this.updateVisibleBoundingBox();
       }
 
-      if (f_irdedhug.equals(data)) {
+      if (START_INTERPOLATION.equals(data)) {
          this.updateStartTick = true;
       }
 
-      if (f_xlyoeing.equals(data)) {
+      if (INTERPOLATION_DURATION.equals(data)) {
          this.updateInterpolationDuration = true;
       }
 
@@ -318,13 +325,13 @@
       if (this.getWorld().isClient) {
          if (this.updateStartTick) {
             this.updateStartTick = false;
-            int i = this.m_gmqcteqd();
+            int i = this.setStartInterpolation();
             this.interpolationStart = (long)(this.age + i);
          }
 
          if (this.updateInterpolationDuration) {
             this.updateInterpolationDuration = false;
-            this.interpolationDuration = this.m_itauevfq();
+            this.interpolationDuration = this.getInterpolationDuration();
          }
 
          if (this.updateRenderState) {
@@ -339,16 +346,16 @@
             this.updateRenderData(bl, this.interpolationProgress);
          }
 
-         if (this.f_ufuxdfdq != null) {
-            if (this.f_ufuxdfdq.f_fzdvwmjb == 0) {
-               this.f_ufuxdfdq.m_uwoebelk(this);
+         if (this.interpolationTarget != null) {
+            if (this.interpolationTarget.steps == 0) {
+               this.interpolationTarget.apply(this);
                this.resetPosition();
-               this.f_ufuxdfdq = null;
+               this.interpolationTarget = null;
             } else {
-               this.f_ufuxdfdq.m_mdvvhgfr(this);
-               this.f_ufuxdfdq.f_fzdvwmjb--;
-               if (this.f_ufuxdfdq.f_fzdvwmjb == 0) {
-                  this.f_ufuxdfdq = null;
+               this.interpolationTarget.applyLerpStep(this);
+               this.interpolationTarget.steps--;
+               if (this.interpolationTarget.steps == 0) {
+                  this.interpolationTarget = null;
                }
             }
          }
@@ -366,9 +373,9 @@
     */
    @Override
    protected void initDataTracker(DataTracker.Builder builder) {
-      builder.add(f_exeyhnpz, 0);
-      builder.add(f_irdedhug, 0);
-      builder.add(f_xlyoeing, 0);
+      builder.add(TELEPORT_DURATION, 0);
+      builder.add(START_INTERPOLATION, 0);
+      builder.add(INTERPOLATION_DURATION, 0);
       builder.add(TRANSLATION, new Vector3f());
       builder.add(SCALE, new Vector3f(1.0F, 1.0F, 1.0F));
       builder.add(RIGHT_ROTATION, new Quaternionf());
@@ -397,17 +404,17 @@
 
       if (nbt.contains("interpolation_duration", NbtElement.NUMBER_TYPE)) {
          int i = nbt.getInt("interpolation_duration");
-         this.m_ctwyttpa(i);
+         this.setInterpolationDuration(i);
       }
 
       if (nbt.contains("start_interpolation", NbtElement.NUMBER_TYPE)) {
          int j = nbt.getInt("start_interpolation");
-         this.m_rwbabbll(j);
+         this.getStartInterpolation(j);
       }
 
       if (nbt.contains("teleport_duration", NbtElement.NUMBER_TYPE)) {
          int k = nbt.getInt("teleport_duration");
-         this.m_rzowmixg(MathHelper.clamp(k, 0, 59));
+         this.setTeleportDuration(MathHelper.clamp(k, 0, 59));
       }
 
       if (nbt.contains("billboard", NbtElement.STRING_TYPE)) {
@@ -473,8 +480,8 @@
       DisplayEntity.BillboardRenderConstraints.CODEC
          .encodeStart(NbtOps.INSTANCE, this.getBillboardRenderConstraints())
          .ifSuccess(billboard -> nbt.put("billboard", billboard));
-      nbt.putInt("interpolation_duration", this.m_itauevfq());
-      nbt.putInt("teleport_duration", this.m_ujnphfqc());
+      nbt.putInt("interpolation_duration", this.getInterpolationDuration());
+      nbt.putInt("teleport_duration", this.getTeleportDuration());
       nbt.putFloat("view_range", this.getViewRange());
       nbt.putFloat("shadow_radius", this.getShadowRadius());
       nbt.putFloat("shadow_strength", this.setShadowStrength());
@@ -492,8 +499,8 @@
     */
    @Override
    public void updateTrackedPositionAndAngles(double x, double y, double z, float yaw, float pitch, int interpolationSteps) {
-      int j = this.m_ujnphfqc();
-      this.f_ufuxdfdq = new DisplayEntity.C_xolajlpw(j, x, y, z, (double)yaw, (double)pitch);
+      int j = this.getTeleportDuration();
+      this.interpolationTarget = new DisplayEntity.InterpolationTarget(j, x, y, z, (double)yaw, (double)pitch);
    }
 
    /**
@@ -501,7 +508,7 @@
     */
    @Override
    public double getLerpTargetX() {
-      return this.f_ufuxdfdq != null ? this.f_ufuxdfdq.f_yitdjloz : this.getX();
+      return this.interpolationTarget != null ? this.interpolationTarget.x : this.getX();
    }
 
    /**
@@ -509,7 +516,7 @@
     */
    @Override
    public double getLerpTargetY() {
-      return this.f_ufuxdfdq != null ? this.f_ufuxdfdq.f_ffuaxbkg : this.getY();
+      return this.interpolationTarget != null ? this.interpolationTarget.y : this.getY();
    }
 
    /**
@@ -517,7 +524,7 @@
     */
    @Override
    public double getLerpTargetZ() {
-      return this.f_ufuxdfdq != null ? this.f_ufuxdfdq.f_ycbbndrp : this.getZ();
+      return this.interpolationTarget != null ? this.interpolationTarget.z : this.getZ();
    }
 
    /**
@@ -525,7 +532,7 @@
     */
    @Override
    public float getLerpTargetPitch() {
-      return this.f_ufuxdfdq != null ? (float)this.f_ufuxdfdq.f_rxtmivsk : this.getPitch();
+      return this.interpolationTarget != null ? (float)this.interpolationTarget.pitch : this.getPitch();
    }
 
    /**
@@ -533,7 +540,7 @@
     */
    @Override
    public float getLerpTargetYaw() {
-      return this.f_ufuxdfdq != null ? (float)this.f_ufuxdfdq.f_iixifkpf : this.getYaw();
+      return this.interpolationTarget != null ? (float)this.interpolationTarget.yaw : this.getYaw();
    }
 
    /**
@@ -571,47 +578,50 @@
 
    /**
     * @mapping {@literal hashed m_ctwyttpa Lnet/minecraft/unmapped/C_zdeutotk;m_ctwyttpa(I)V}
-    * @mapping {@literal named m_ctwyttpa Lnet/minecraft/entity/decoration/DisplayEntity;m_ctwyttpa(I)V}
+    * @mapping {@literal named setInterpolationDuration Lnet/minecraft/entity/decoration/DisplayEntity;setInterpolationDuration(I)V}
     */
-   private void m_ctwyttpa(int i) {
-      this.dataTracker.set(f_xlyoeing, i);
+   private void setInterpolationDuration(int ticks) {
+      this.dataTracker.set(INTERPOLATION_DURATION, ticks);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_itauevfq Lnet/minecraft/unmapped/C_zdeutotk;m_itauevfq()I}
+    * @mapping {@literal named getInterpolationDuration Lnet/minecraft/entity/decoration/DisplayEntity;getInterpolationDuration()I}
     */
-   private int m_itauevfq() {
-      return this.dataTracker.get(f_xlyoeing);
+   private int getInterpolationDuration() {
+      return this.dataTracker.get(INTERPOLATION_DURATION);
    }
 
    /**
     * @mapping {@literal hashed m_rwbabbll Lnet/minecraft/unmapped/C_zdeutotk;m_rwbabbll(I)V}
-    * @mapping {@literal named m_rwbabbll Lnet/minecraft/entity/decoration/DisplayEntity;m_rwbabbll(I)V}
+    * @mapping {@literal named getStartInterpolation Lnet/minecraft/entity/decoration/DisplayEntity;getStartInterpolation(I)V}
     */
-   private void m_rwbabbll(int i) {
-      this.dataTracker.set(f_irdedhug, i, true);
+   private void getStartInterpolation(int i) {
+      this.dataTracker.set(START_INTERPOLATION, i, true);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_gmqcteqd Lnet/minecraft/unmapped/C_zdeutotk;m_gmqcteqd()I}
+    * @mapping {@literal named setStartInterpolation Lnet/minecraft/entity/decoration/DisplayEntity;setStartInterpolation()I}
     */
-   private int m_gmqcteqd() {
-      return this.dataTracker.get(f_irdedhug);
+   private int setStartInterpolation() {
+      return this.dataTracker.get(START_INTERPOLATION);
    }
 
    /**
     * @mapping {@literal hashed m_rzowmixg Lnet/minecraft/unmapped/C_zdeutotk;m_rzowmixg(I)V}
-    * @mapping {@literal named m_rzowmixg Lnet/minecraft/entity/decoration/DisplayEntity;m_rzowmixg(I)V}
+    * @mapping {@literal named setTeleportDuration Lnet/minecraft/entity/decoration/DisplayEntity;setTeleportDuration(I)V}
     */
-   private void m_rzowmixg(int i) {
-      this.dataTracker.set(f_exeyhnpz, i);
+   private void setTeleportDuration(int i) {
+      this.dataTracker.set(TELEPORT_DURATION, i);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ujnphfqc Lnet/minecraft/unmapped/C_zdeutotk;m_ujnphfqc()I}
+    * @mapping {@literal named getTeleportDuration Lnet/minecraft/entity/decoration/DisplayEntity;getTeleportDuration()I}
     */
-   private int m_ujnphfqc() {
-      return this.dataTracker.get(f_exeyhnpz);
+   private int getTeleportDuration() {
+      return this.dataTracker.get(TELEPORT_DURATION);
    }
 
    /**
@@ -1072,64 +1082,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_zdeutotk$C_xolajlpw}
-    * @mapping {@literal named net/minecraft/entity/decoration/DisplayEntity$C_xolajlpw}
-    */
-   static class C_xolajlpw {
-      /**
-       * Mapping not found
-       */
-      int f_fzdvwmjb;
-      /**
-       * Mapping not found
-       */
-      final double f_yitdjloz;
-      /**
-       * Mapping not found
-       */
-      final double f_ffuaxbkg;
-      /**
-       * Mapping not found
-       */
-      final double f_ycbbndrp;
-      /**
-       * Mapping not found
-       */
-      final double f_iixifkpf;
-      /**
-       * Mapping not found
-       */
-      final double f_rxtmivsk;
-
-      /**
-       * Mapping not found
-       */
-      C_xolajlpw(int i, double d, double e, double f, double g, double h) {
-         this.f_fzdvwmjb = i;
-         this.f_yitdjloz = d;
-         this.f_ffuaxbkg = e;
-         this.f_ycbbndrp = f;
-         this.f_iixifkpf = g;
-         this.f_rxtmivsk = h;
-      }
-
-      /**
-       * Mapping not found
-       */
-      void m_uwoebelk(Entity arg) {
-         arg.setPosition(this.f_yitdjloz, this.f_ffuaxbkg, this.f_ycbbndrp);
-         arg.setRotation((float)this.f_iixifkpf, (float)this.f_rxtmivsk);
-      }
-
-      /**
-       * Mapping not found
-       */
-      void m_mdvvhgfr(Entity arg) {
-         arg.lerpPosAndRotation(this.f_fzdvwmjb, this.f_yitdjloz, this.f_ffuaxbkg, this.f_ycbbndrp, this.f_iixifkpf, this.f_rxtmivsk);
-      }
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_zdeutotk$C_ncfzfjmg}
     * @mapping {@literal named net/minecraft/entity/decoration/DisplayEntity$FloatInterpolator}
     */
@@ -1172,6 +1124,73 @@
    }
 
    /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_zdeutotk$C_xolajlpw}
+    * @mapping {@literal named net/minecraft/entity/decoration/DisplayEntity$InterpolationTarget}
+    */
+   static class InterpolationTarget {
+      /**
+       * @mapping {@literal hashed f_fzdvwmjb Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw;f_fzdvwmjb:I}
+       * @mapping {@literal named steps Lnet/minecraft/entity/decoration/DisplayEntity$InterpolationTarget;steps:I}
+       */
+      int steps;
+      /**
+       * @mapping {@literal hashed f_yitdjloz Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw;f_yitdjloz:D}
+       * @mapping {@literal named x Lnet/minecraft/entity/decoration/DisplayEntity$InterpolationTarget;x:D}
+       */
+      final double x;
+      /**
+       * @mapping {@literal hashed f_ffuaxbkg Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw;f_ffuaxbkg:D}
+       * @mapping {@literal named y Lnet/minecraft/entity/decoration/DisplayEntity$InterpolationTarget;y:D}
+       */
+      final double y;
+      /**
+       * @mapping {@literal hashed f_ycbbndrp Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw;f_ycbbndrp:D}
+       * @mapping {@literal named z Lnet/minecraft/entity/decoration/DisplayEntity$InterpolationTarget;z:D}
+       */
+      final double z;
+      /**
+       * @mapping {@literal hashed f_iixifkpf Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw;f_iixifkpf:D}
+       * @mapping {@literal named yaw Lnet/minecraft/entity/decoration/DisplayEntity$InterpolationTarget;yaw:D}
+       */
+      final double yaw;
+      /**
+       * @mapping {@literal hashed f_rxtmivsk Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw;f_rxtmivsk:D}
+       * @mapping {@literal named pitch Lnet/minecraft/entity/decoration/DisplayEntity$InterpolationTarget;pitch:D}
+       */
+      final double pitch;
+
+      /**
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw;<init>(IDDDDD)V}
+       * @mapping {@literal named <init> Lnet/minecraft/entity/decoration/DisplayEntity$InterpolationTarget;<init>(IDDDDD)V}
+       */
+      InterpolationTarget(int steps, double x, double y, double z, double yaw, double pitch) {
+         this.steps = steps;
+         this.x = x;
+         this.y = y;
+         this.z = z;
+         this.yaw = yaw;
+         this.pitch = pitch;
+      }
+
+      /**
+       * @mapping {@literal hashed m_uwoebelk Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw;m_uwoebelk(Lnet/minecraft/unmapped/C_astfners;)V}
+       * @mapping {@literal named apply Lnet/minecraft/entity/decoration/DisplayEntity$InterpolationTarget;apply(Lnet/minecraft/entity/Entity;)V}
+       */
+      void apply(Entity entity) {
+         entity.setPosition(this.x, this.y, this.z);
+         entity.setRotation((float)this.yaw, (float)this.pitch);
+      }
+
+      /**
+       * @mapping {@literal hashed m_mdvvhgfr Lnet/minecraft/unmapped/C_zdeutotk$C_xolajlpw;m_mdvvhgfr(Lnet/minecraft/unmapped/C_astfners;)V}
+       * @mapping {@literal named applyLerpStep Lnet/minecraft/entity/decoration/DisplayEntity$InterpolationTarget;applyLerpStep(Lnet/minecraft/entity/Entity;)V}
+       */
+      void applyLerpStep(Entity entity) {
+         entity.lerpPosAndRotation(this.steps, this.x, this.y, this.z, this.yaw, this.pitch);
+      }
+   }
+
+   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_zdeutotk$C_yooamzmm}
     * @mapping {@literal named net/minecraft/entity/decoration/DisplayEntity$ItemDisplayEntity}
     */
@@ -1685,7 +1704,7 @@
             String string = nbt.getString("text");
 
             try {
-               Text lv = Text.Serializer.m_npeyudcr(string, this.getRegistryManager());
+               Text lv = Text.SerializationUtil.fromJson(string, this.getRegistryManager());
                if (lv != null) {
                   ServerCommandSource lv2 = this.getCommandSource().withLevel(2);
                   Text lv3 = Texts.parse(lv2, lv, this, 0);
@@ -1713,7 +1732,7 @@
       @Override
       protected void writeCustomDataToNbt(NbtCompound nbt) {
          super.writeCustomDataToNbt(nbt);
-         nbt.putString("text", Text.Serializer.toJson(this.getText(), this.getRegistryManager()));
+         nbt.putString("text", Text.SerializationUtil.toJson(this.getText(), this.getRegistryManager()));
          nbt.putInt("line_width", this.getLineWidth());
          nbt.putInt("background", this.getBackgroundColor());
          nbt.putByte("text_opacity", this.getTextOpacity());
diff -bur namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java
--- namedTargetSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-04-03 14:10:47.829675440 +0000
+++ namedSrc/net/minecraft/entity/decoration/painting/PaintingEntity.java	2024-04-03 14:09:37.217378083 +0000
@@ -51,13 +51,15 @@
     */
    private static final RegistryKey<PaintingVariant> VARIANT_KEY = PaintingVariants.KEBAB;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hgphohxe Lnet/minecraft/unmapped/C_xypmuulf;f_hgphohxe:Lcom/mojang/serialization/MapCodec;}
+    * @mapping {@literal named MAP_CODEC Lnet/minecraft/entity/decoration/painting/PaintingEntity;MAP_CODEC:Lcom/mojang/serialization/MapCodec;}
     */
-   public static final MapCodec<Holder<PaintingVariant>> f_hgphohxe = Registries.PAINTING_VARIANT.holderByNameCodec().fieldOf("variant");
+   public static final MapCodec<Holder<PaintingVariant>> MAP_CODEC = Registries.PAINTING_VARIANT.holderByNameCodec().fieldOf("variant");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jaaowbsw Lnet/minecraft/unmapped/C_xypmuulf;f_jaaowbsw:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/entity/decoration/painting/PaintingEntity;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<Holder<PaintingVariant>> f_jaaowbsw = f_hgphohxe.codec();
+   public static final Codec<Holder<PaintingVariant>> CODEC = MAP_CODEC.codec();
 
    /**
     * @mapping {@literal hashed m_vdasoboj Lnet/minecraft/unmapped/C_xypmuulf;m_vdasoboj()Lnet/minecraft/unmapped/C_cjzoxshv;}
@@ -183,7 +185,7 @@
     */
    @Override
    public void readCustomDataFromNbt(NbtCompound nbt) {
-      Holder<PaintingVariant> lv = (Holder<PaintingVariant>)f_jaaowbsw.parse(NbtOps.INSTANCE, nbt).result().orElseGet(PaintingEntity::getDefaultVariant);
+      Holder<PaintingVariant> lv = (Holder<PaintingVariant>)CODEC.parse(NbtOps.INSTANCE, nbt).result().orElseGet(PaintingEntity::getDefaultVariant);
       this.setVariant(lv);
       this.facing = Direction.fromHorizontal(nbt.getByte("facing"));
       super.readCustomDataFromNbt(nbt);
@@ -195,7 +197,7 @@
     * @mapping {@literal named writeVariant Lnet/minecraft/entity/decoration/painting/PaintingEntity;writeVariant(Lnet/minecraft/nbt/NbtCompound;Lnet/minecraft/registry/Holder;)V}
     */
    public static void writeVariant(NbtCompound nbt, Holder<PaintingVariant> variant) {
-      f_jaaowbsw.encodeStart(NbtOps.INSTANCE, variant).ifSuccess(arg2 -> nbt.copyFrom((NbtCompound)arg2));
+      CODEC.encodeStart(NbtOps.INSTANCE, variant).ifSuccess(arg2 -> nbt.copyFrom((NbtCompound)arg2));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java namedSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java	2024-04-03 14:10:47.833675458 +0000
+++ namedSrc/net/minecraft/entity/effect/BadOmenStatusEffect.java	2024-04-03 14:09:37.225378117 +0000
@@ -36,7 +36,7 @@
       if (entity instanceof ServerPlayerEntity lv && !lv.isSpectator()) {
          ServerWorld lv2 = lv.getServerWorld();
          if (!lv2.getEnabledFlags().hasFlag(FeatureFlags.UPDATE_1_21)) {
-            return this.m_osjwoqxb(lv, lv2);
+            return this.tryStartRaid(lv, lv2);
          }
 
          if (lv2.getDifficulty() != Difficulty.PEACEFUL && lv2.isNearOccupiedPointOfInterest(lv.getBlockPos())) {
@@ -54,9 +54,9 @@
 
    /**
     * @mapping {@literal hashed m_osjwoqxb Lnet/minecraft/unmapped/C_rqetedul;m_osjwoqxb(Lnet/minecraft/unmapped/C_mxrobsgg;Lnet/minecraft/unmapped/C_bdwnwhiu;)Z}
-    * @mapping {@literal named m_osjwoqxb Lnet/minecraft/entity/effect/BadOmenStatusEffect;m_osjwoqxb(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/server/world/ServerWorld;)Z}
+    * @mapping {@literal named tryStartRaid Lnet/minecraft/entity/effect/BadOmenStatusEffect;tryStartRaid(Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/server/world/ServerWorld;)Z}
     */
-   private boolean m_osjwoqxb(ServerPlayerEntity player, ServerWorld world) {
+   private boolean tryStartRaid(ServerPlayerEntity player, ServerWorld world) {
       BlockPos lv = player.getBlockPos();
       if (world.getDifficulty() != Difficulty.PEACEFUL && world.isNearOccupiedPointOfInterest(lv)) {
          world.getRaidManager().startRaid(player, lv);
diff -bur namedTargetSrc/net/minecraft/entity/effect/InfestedStatusEffect.java namedSrc/net/minecraft/entity/effect/InfestedStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/InfestedStatusEffect.java	2024-04-03 14:10:48.065676446 +0000
+++ namedSrc/net/minecraft/entity/effect/InfestedStatusEffect.java	2024-04-03 14:09:37.513379327 +0000
@@ -37,12 +37,12 @@
     * Mapping not found
     */
    @Override
-   public void m_ntlsrlro(LivingEntity arg, int i, DamageSource arg2, float f) {
-      if (arg.getRandom().nextFloat() <= this.f_wjzspyfs) {
-         int j = this.f_ivvbwqfr.applyAsInt(arg.getRandom());
+   public void onEntityHurt(LivingEntity entity, int amplifier, DamageSource source, float amount) {
+      if (entity.getRandom().nextFloat() <= this.f_wjzspyfs) {
+         int j = this.f_ivvbwqfr.applyAsInt(entity.getRandom());
 
          for (int k = 0; k < j; k++) {
-            this.m_qnqnjewe(arg.getWorld(), arg.getX(), arg.getY() + 0.5, arg.getZ());
+            this.m_qnqnjewe(entity.getWorld(), entity.getX(), entity.getY() + 0.5, entity.getZ());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/effect/OozingStatusEffect.java namedSrc/net/minecraft/entity/effect/OozingStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/OozingStatusEffect.java	2024-04-03 14:10:48.049676378 +0000
+++ namedSrc/net/minecraft/entity/effect/OozingStatusEffect.java	2024-04-03 14:09:37.489379226 +0000
@@ -33,12 +33,12 @@
     * Mapping not found
     */
    @Override
-   public void m_tlfwwrri(LivingEntity arg, int i, Entity.RemovalReason arg2) {
-      if (arg2 == Entity.RemovalReason.KILLED) {
-         int j = this.slimeSpawnCountFunction.applyAsInt(arg.getRandom());
+   public void onEntityRemoved(LivingEntity entity, int amplifier, Entity.RemovalReason reason) {
+      if (reason == Entity.RemovalReason.KILLED) {
+         int j = this.slimeSpawnCountFunction.applyAsInt(entity.getRandom());
 
          for (int k = 0; k < j; k++) {
-            this.spawnSlimes(arg.getWorld(), arg.getX(), arg.getY() + 0.5, arg.getZ());
+            this.spawnSlimes(entity.getWorld(), entity.getX(), entity.getY() + 0.5, entity.getZ());
          }
       }
    }
diff -bur namedTargetSrc/net/minecraft/entity/effect/StatusEffectInstance.java namedSrc/net/minecraft/entity/effect/StatusEffectInstance.java
--- namedTargetSrc/net/minecraft/entity/effect/StatusEffectInstance.java	2024-04-03 14:10:47.989676123 +0000
+++ namedSrc/net/minecraft/entity/effect/StatusEffectInstance.java	2024-04-03 14:09:37.405378873 +0000
@@ -42,13 +42,15 @@
     */
    public static final int INFINITE_DURATION = -1;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_jzszemkt Lnet/minecraft/unmapped/C_wpfizwve;f_jzszemkt:I}
+    * @mapping {@literal named MIN_AMPLIFIER Lnet/minecraft/entity/effect/StatusEffectInstance;MIN_AMPLIFIER:I}
     */
-   public static final int f_jzszemkt = 0;
+   public static final int MIN_AMPLIFIER = 0;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bjwawrjq Lnet/minecraft/unmapped/C_wpfizwve;f_bjwawrjq:I}
+    * @mapping {@literal named MAX_AMPLIFIER Lnet/minecraft/entity/effect/StatusEffectInstance;MAX_AMPLIFIER:I}
     */
-   public static final int f_bjwawrjq = 255;
+   public static final int MAX_AMPLIFIER = 255;
    /**
     * @mapping {@literal hashed f_oaxuofvb Lnet/minecraft/unmapped/C_wpfizwve;f_oaxuofvb:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named CODEC Lnet/minecraft/entity/effect/StatusEffectInstance;CODEC:Lcom/mojang/serialization/Codec;}
@@ -56,7 +58,7 @@
    public static final Codec<StatusEffectInstance> CODEC = RecordCodecBuilder.create(
       instance -> instance.group(
                Registries.STATUS_EFFECT.holderByNameCodec().fieldOf("id").forGetter(StatusEffectInstance::getEffectType),
-               StatusEffectInstance.C_ivhzuvgd.CODEC.forGetter(StatusEffectInstance::m_cxsaifnx)
+               StatusEffectInstance.Details.CODEC.forGetter(StatusEffectInstance::getDetails)
             )
             .apply(instance, StatusEffectInstance::new)
    );
@@ -67,8 +69,8 @@
    public static final PacketCodec<RegistryByteBuf, StatusEffectInstance> PACKET_CODEC = PacketCodec.tuple(
       PacketCodecs.holder(RegistryKeys.STATUS_EFFECT),
       StatusEffectInstance::getEffectType,
-      StatusEffectInstance.C_ivhzuvgd.PACKET_CODEC,
-      StatusEffectInstance::m_cxsaifnx,
+      StatusEffectInstance.Details.PACKET_CODEC,
+      StatusEffectInstance::getDetails,
       StatusEffectInstance::new
    );
    /**
@@ -186,31 +188,32 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_wpfizwve;<init>(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_wpfizwve$C_ivhzuvgd;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/entity/effect/StatusEffectInstance;<init>(Lnet/minecraft/registry/Holder;Lnet/minecraft/entity/effect/StatusEffectInstance$C_ivhzuvgd;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/entity/effect/StatusEffectInstance;<init>(Lnet/minecraft/registry/Holder;Lnet/minecraft/entity/effect/StatusEffectInstance$Details;)V}
     */
-   private StatusEffectInstance(Holder<StatusEffect> type, StatusEffectInstance.C_ivhzuvgd arg2) {
+   private StatusEffectInstance(Holder<StatusEffect> type, StatusEffectInstance.Details details) {
       this(
          type,
-         arg2.duration(),
-         arg2.amplifier(),
-         arg2.ambient(),
-         arg2.showParticles(),
-         arg2.showIcon(),
-         (StatusEffectInstance)arg2.hiddenEffect().map(arg2x -> new StatusEffectInstance(type, arg2x)).orElse(null)
+         details.duration(),
+         details.amplifier(),
+         details.ambient(),
+         details.showParticles(),
+         details.showIcon(),
+         (StatusEffectInstance)details.hiddenEffect().map(arg2 -> new StatusEffectInstance(type, arg2)).orElse(null)
       );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cxsaifnx Lnet/minecraft/unmapped/C_wpfizwve;m_cxsaifnx()Lnet/minecraft/unmapped/C_wpfizwve$C_ivhzuvgd;}
+    * @mapping {@literal named getDetails Lnet/minecraft/entity/effect/StatusEffectInstance;getDetails()Lnet/minecraft/entity/effect/StatusEffectInstance$Details;}
     */
-   private StatusEffectInstance.C_ivhzuvgd m_cxsaifnx() {
-      return new StatusEffectInstance.C_ivhzuvgd(
+   private StatusEffectInstance.Details getDetails() {
+      return new StatusEffectInstance.Details(
          this.getAmplifier(),
          this.getDuration(),
          this.isAmbient(),
          this.shouldShowParticles(),
          this.shouldShowIcon(),
-         Optional.ofNullable(this.hiddenEffect).map(StatusEffectInstance::m_cxsaifnx)
+         Optional.ofNullable(this.hiddenEffect).map(StatusEffectInstance::getDetails)
       );
    }
 
@@ -223,10 +226,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bspyvfdb Lnet/minecraft/unmapped/C_wpfizwve;m_bspyvfdb()Lnet/minecraft/unmapped/C_nqucohct;}
+    * @mapping {@literal named createParticle Lnet/minecraft/entity/effect/StatusEffectInstance;createParticle()Lnet/minecraft/particle/ParticleEffect;}
     */
-   public ParticleEffect m_bspyvfdb() {
-      return this.type.value().m_uosrujfk(this);
+   public ParticleEffect createParticle() {
+      return this.type.value().createParticle(this);
    }
 
    /**
@@ -422,17 +426,19 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zxegsuzr Lnet/minecraft/unmapped/C_wpfizwve;m_zxegsuzr(Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_astfners$C_emmohndu;)V}
+    * @mapping {@literal named onEntityRemoved Lnet/minecraft/entity/effect/StatusEffectInstance;onEntityRemoved(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/Entity$RemovalReason;)V}
     */
-   public void m_zxegsuzr(LivingEntity arg, Entity.RemovalReason arg2) {
-      this.type.value().m_tlfwwrri(arg, this.amplifier, arg2);
+   public void onEntityRemoved(LivingEntity entity, Entity.RemovalReason reason) {
+      this.type.value().onEntityRemoved(entity, this.amplifier, reason);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_osynuyei Lnet/minecraft/unmapped/C_wpfizwve;m_osynuyei(Lnet/minecraft/unmapped/C_usxaxydn;Lnet/minecraft/unmapped/C_sbxfkpyv;F)V}
+    * @mapping {@literal named onEntityHurt Lnet/minecraft/entity/effect/StatusEffectInstance;onEntityHurt(Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/damage/DamageSource;F)V}
     */
-   public void m_osynuyei(LivingEntity arg, DamageSource arg2, float f) {
-      this.type.value().m_ntlsrlro(arg, this.amplifier, arg2, f);
+   public void onEntityHurt(LivingEntity entity, DamageSource source, float amount) {
+      this.type.value().onEntityHurt(entity, this.amplifier, source, amount);
    }
 
    /**
@@ -534,10 +540,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_entcpiae Lnet/minecraft/unmapped/C_wpfizwve;m_entcpiae(Lnet/minecraft/unmapped/C_usxaxydn;)V}
+    * @mapping {@literal named onEffectApplied Lnet/minecraft/entity/effect/StatusEffectInstance;onEffectApplied(Lnet/minecraft/entity/LivingEntity;)V}
     */
-   public void m_entcpiae(LivingEntity arg) {
-      this.type.value().m_rkyihfiu(arg, this.amplifier);
+   public void onEffectApplied(LivingEntity entity) {
+      this.type.value().onEffectApplied(entity, this.amplifier);
    }
 
    /**
@@ -648,59 +655,59 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_wpfizwve$C_ivhzuvgd}
-    * @mapping {@literal named net/minecraft/entity/effect/StatusEffectInstance$C_ivhzuvgd}
+    * @mapping {@literal named net/minecraft/entity/effect/StatusEffectInstance$Details}
     */
-   static record C_ivhzuvgd(
-      int amplifier, int duration, boolean ambient, boolean showParticles, boolean showIcon, Optional<StatusEffectInstance.C_ivhzuvgd> hiddenEffect
+   static record Details(
+      int amplifier, int duration, boolean ambient, boolean showParticles, boolean showIcon, Optional<StatusEffectInstance.Details> hiddenEffect
    ) {
       /**
        * @mapping {@literal hashed f_nqqokkdi Lnet/minecraft/unmapped/C_wpfizwve$C_ivhzuvgd;f_nqqokkdi:Lcom/mojang/serialization/MapCodec;}
-       * @mapping {@literal named CODEC Lnet/minecraft/entity/effect/StatusEffectInstance$C_ivhzuvgd;CODEC:Lcom/mojang/serialization/MapCodec;}
+       * @mapping {@literal named CODEC Lnet/minecraft/entity/effect/StatusEffectInstance$Details;CODEC:Lcom/mojang/serialization/MapCodec;}
        */
-      public static final MapCodec<StatusEffectInstance.C_ivhzuvgd> CODEC = MapCodec.recursive(
+      public static final MapCodec<StatusEffectInstance.Details> CODEC = MapCodec.recursive(
          "MobEffectInstance.Details",
          codec -> RecordCodecBuilder.mapCodec(
                instance -> instance.group(
-                        Codecs.UNSIGNED_BYTE.optionalFieldOf("amplifier", 0).forGetter(StatusEffectInstance.C_ivhzuvgd::amplifier),
-                        Codec.INT.optionalFieldOf("duration", Integer.valueOf(0)).forGetter(StatusEffectInstance.C_ivhzuvgd::duration),
-                        Codec.BOOL.optionalFieldOf("ambient", Boolean.valueOf(false)).forGetter(StatusEffectInstance.C_ivhzuvgd::ambient),
-                        Codec.BOOL.optionalFieldOf("show_particles", Boolean.valueOf(true)).forGetter(StatusEffectInstance.C_ivhzuvgd::showParticles),
+                        Codecs.UNSIGNED_BYTE.optionalFieldOf("amplifier", 0).forGetter(StatusEffectInstance.Details::amplifier),
+                        Codec.INT.optionalFieldOf("duration", Integer.valueOf(0)).forGetter(StatusEffectInstance.Details::duration),
+                        Codec.BOOL.optionalFieldOf("ambient", Boolean.valueOf(false)).forGetter(StatusEffectInstance.Details::ambient),
+                        Codec.BOOL.optionalFieldOf("show_particles", Boolean.valueOf(true)).forGetter(StatusEffectInstance.Details::showParticles),
                         Codec.BOOL.optionalFieldOf("show_icon").forGetter(arg -> Optional.of(arg.showIcon())),
-                        codec.optionalFieldOf("hidden_effect").forGetter(StatusEffectInstance.C_ivhzuvgd::hiddenEffect)
+                        codec.optionalFieldOf("hidden_effect").forGetter(StatusEffectInstance.Details::hiddenEffect)
                      )
-                     .apply(instance, StatusEffectInstance.C_ivhzuvgd::m_frzuuwir)
+                     .apply(instance, StatusEffectInstance.Details::create)
             )
       );
       /**
        * @mapping {@literal hashed f_axasinhf Lnet/minecraft/unmapped/C_wpfizwve$C_ivhzuvgd;f_axasinhf:Lnet/minecraft/unmapped/C_qsrmwluu;}
-       * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/effect/StatusEffectInstance$C_ivhzuvgd;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
+       * @mapping {@literal named PACKET_CODEC Lnet/minecraft/entity/effect/StatusEffectInstance$Details;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
        */
-      public static final PacketCodec<ByteBuf, StatusEffectInstance.C_ivhzuvgd> PACKET_CODEC = PacketCodec.recursive(
+      public static final PacketCodec<ByteBuf, StatusEffectInstance.Details> PACKET_CODEC = PacketCodec.recursive(
          packetCodec -> PacketCodec.tuple(
                PacketCodecs.VAR_INT,
-               StatusEffectInstance.C_ivhzuvgd::amplifier,
+               StatusEffectInstance.Details::amplifier,
                PacketCodecs.VAR_INT,
-               StatusEffectInstance.C_ivhzuvgd::duration,
+               StatusEffectInstance.Details::duration,
                PacketCodecs.BOOL,
-               StatusEffectInstance.C_ivhzuvgd::ambient,
+               StatusEffectInstance.Details::ambient,
                PacketCodecs.BOOL,
-               StatusEffectInstance.C_ivhzuvgd::showParticles,
+               StatusEffectInstance.Details::showParticles,
                PacketCodecs.BOOL,
-               StatusEffectInstance.C_ivhzuvgd::showIcon,
+               StatusEffectInstance.Details::showIcon,
                packetCodec.apply(PacketCodecs::optional),
-               StatusEffectInstance.C_ivhzuvgd::hiddenEffect,
-               StatusEffectInstance.C_ivhzuvgd::new
+               StatusEffectInstance.Details::hiddenEffect,
+               StatusEffectInstance.Details::new
             )
       );
 
       /**
        * @mapping {@literal hashed m_frzuuwir Lnet/minecraft/unmapped/C_wpfizwve$C_ivhzuvgd;m_frzuuwir(IIZZLjava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/unmapped/C_wpfizwve$C_ivhzuvgd;}
-       * @mapping {@literal named m_frzuuwir Lnet/minecraft/entity/effect/StatusEffectInstance$C_ivhzuvgd;m_frzuuwir(IIZZLjava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/entity/effect/StatusEffectInstance$C_ivhzuvgd;}
+       * @mapping {@literal named create Lnet/minecraft/entity/effect/StatusEffectInstance$Details;create(IIZZLjava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/entity/effect/StatusEffectInstance$Details;}
        */
-      private static StatusEffectInstance.C_ivhzuvgd m_frzuuwir(
-         int amplifier, int duration, boolean ambient, boolean bl2, Optional<Boolean> optional, Optional<StatusEffectInstance.C_ivhzuvgd> hiddenEffect
+      private static StatusEffectInstance.Details create(
+         int amplifier, int duration, boolean ambient, boolean showParticles, Optional<Boolean> showIcon, Optional<StatusEffectInstance.Details> hiddenEffect
       ) {
-         return new StatusEffectInstance.C_ivhzuvgd(amplifier, duration, ambient, bl2, (Boolean)optional.orElse(bl2), hiddenEffect);
+         return new StatusEffectInstance.Details(amplifier, duration, ambient, showParticles, (Boolean)showIcon.orElse(showParticles), hiddenEffect);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/entity/effect/StatusEffect.java namedSrc/net/minecraft/entity/effect/StatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/StatusEffect.java	2024-04-03 14:10:47.949675952 +0000
+++ namedSrc/net/minecraft/entity/effect/StatusEffect.java	2024-04-03 14:09:37.361378688 +0000
@@ -19,7 +19,7 @@
 import net.minecraft.feature_flags.FeatureFlagBitSet;
 import net.minecraft.feature_flags.FeatureFlags;
 import net.minecraft.feature_flags.GatedFeature;
-import net.minecraft.particle.EntityEffectParticleEffect;
+import net.minecraft.particle.ColoredParticleEffect;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.Holder;
@@ -36,9 +36,10 @@
  */
 public class StatusEffect implements GatedFeature {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_hrqsqyvx Lnet/minecraft/unmapped/C_jaqasomh;f_hrqsqyvx:I}
+    * @mapping {@literal named AMBIENT_PARTICLE_ALPHA Lnet/minecraft/entity/effect/StatusEffect;AMBIENT_PARTICLE_ALPHA:I}
     */
-   private static final int f_hrqsqyvx = MathHelper.floor(38.25F);
+   private static final int AMBIENT_PARTICLE_ALPHA = MathHelper.floor(38.25F);
    /**
     * @mapping {@literal hashed f_rqynlpsa Lnet/minecraft/unmapped/C_jaqasomh;f_rqynlpsa:Ljava/util/Map;}
     * @mapping {@literal named attributeModifiers Lnet/minecraft/entity/effect/StatusEffect;attributeModifiers:Ljava/util/Map;}
@@ -55,9 +56,10 @@
     */
    private final int color;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fromvzcw Lnet/minecraft/unmapped/C_jaqasomh;f_fromvzcw:Ljava/util/function/Function;}
+    * @mapping {@literal named particleFactory Lnet/minecraft/entity/effect/StatusEffect;particleFactory:Ljava/util/function/Function;}
     */
-   private final Function<StatusEffectInstance, ParticleEffect> f_fromvzcw;
+   private final Function<StatusEffectInstance, ParticleEffect> particleFactory;
    /**
     * @mapping {@literal hashed f_yqqwyxsb Lnet/minecraft/unmapped/C_jaqasomh;f_yqqwyxsb:Ljava/lang/String;}
     * @mapping {@literal named translationKey Lnet/minecraft/entity/effect/StatusEffect;translationKey:Ljava/lang/String;}
@@ -70,13 +72,15 @@
     */
    private int blendDuration;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ohrjpsvc Lnet/minecraft/unmapped/C_jaqasomh;f_ohrjpsvc:Ljava/util/Optional;}
+    * @mapping {@literal named applySound Lnet/minecraft/entity/effect/StatusEffect;applySound:Ljava/util/Optional;}
     */
-   private Optional<SoundEvent> f_ohrjpsvc = Optional.empty();
+   private Optional<SoundEvent> applySound = Optional.empty();
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ejiuuoay Lnet/minecraft/unmapped/C_jaqasomh;f_ejiuuoay:Lnet/minecraft/unmapped/C_czxxrbcp;}
+    * @mapping {@literal named requiredFeatures Lnet/minecraft/entity/effect/StatusEffect;requiredFeatures:Lnet/minecraft/feature_flags/FeatureFlagBitSet;}
     */
-   private FeatureFlagBitSet f_ejiuuoay = FeatureFlags.DEFAULT_SET;
+   private FeatureFlagBitSet requiredFeatures = FeatureFlags.DEFAULT_SET;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jaqasomh;<init>(Lnet/minecraft/unmapped/C_mbktilxo;I)V}
@@ -85,9 +89,9 @@
    protected StatusEffect(StatusEffectType type, int color) {
       this.type = type;
       this.color = color;
-      this.f_fromvzcw = arg -> {
-         int j = arg.isAmbient() ? f_hrqsqyvx : 255;
-         return EntityEffectParticleEffect.m_isvlspbn(ParticleTypes.ENTITY_EFFECT, ColorUtil.Argb32.m_bixluiis(j, color));
+      this.particleFactory = effect -> {
+         int j = effect.isAmbient() ? AMBIENT_PARTICLE_ALPHA : 255;
+         return ColoredParticleEffect.create(ParticleTypes.ENTITY_EFFECT, ColorUtil.Argb32.of(j, color));
       };
    }
 
@@ -95,10 +99,10 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_jaqasomh;<init>(Lnet/minecraft/unmapped/C_mbktilxo;ILnet/minecraft/unmapped/C_nqucohct;)V}
     * @mapping {@literal named <init> Lnet/minecraft/entity/effect/StatusEffect;<init>(Lnet/minecraft/entity/effect/StatusEffectType;ILnet/minecraft/particle/ParticleEffect;)V}
     */
-   protected StatusEffect(StatusEffectType type, int color, ParticleEffect arg2) {
+   protected StatusEffect(StatusEffectType type, int color, ParticleEffect particle) {
       this.type = type;
       this.color = color;
-      this.f_fromvzcw = arg2x -> arg2;
+      this.particleFactory = statusEffect -> particle;
    }
 
    /**
@@ -141,22 +145,26 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_rkyihfiu Lnet/minecraft/unmapped/C_jaqasomh;m_rkyihfiu(Lnet/minecraft/unmapped/C_usxaxydn;I)V}
+    * @mapping {@literal named onEffectApplied Lnet/minecraft/entity/effect/StatusEffect;onEffectApplied(Lnet/minecraft/entity/LivingEntity;I)V}
     */
-   public void m_rkyihfiu(LivingEntity arg, int i) {
-      this.f_ohrjpsvc.ifPresent(arg2 -> arg.getWorld().playSound(null, arg.getX(), arg.getY(), arg.getZ(), arg2, arg.getSoundCategory(), 1.0F, 1.0F));
+   public void onEffectApplied(LivingEntity entity, int amplifier) {
+      this.applySound
+         .ifPresent(arg2 -> entity.getWorld().playSound(null, entity.getX(), entity.getY(), entity.getZ(), arg2, entity.getSoundCategory(), 1.0F, 1.0F));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tlfwwrri Lnet/minecraft/unmapped/C_jaqasomh;m_tlfwwrri(Lnet/minecraft/unmapped/C_usxaxydn;ILnet/minecraft/unmapped/C_astfners$C_emmohndu;)V}
+    * @mapping {@literal named onEntityRemoved Lnet/minecraft/entity/effect/StatusEffect;onEntityRemoved(Lnet/minecraft/entity/LivingEntity;ILnet/minecraft/entity/Entity$RemovalReason;)V}
     */
-   public void m_tlfwwrri(LivingEntity arg, int i, Entity.RemovalReason arg2) {
+   public void onEntityRemoved(LivingEntity entity, int amplifier, Entity.RemovalReason reason) {
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ntlsrlro Lnet/minecraft/unmapped/C_jaqasomh;m_ntlsrlro(Lnet/minecraft/unmapped/C_usxaxydn;ILnet/minecraft/unmapped/C_sbxfkpyv;F)V}
+    * @mapping {@literal named onEntityHurt Lnet/minecraft/entity/effect/StatusEffect;onEntityHurt(Lnet/minecraft/entity/LivingEntity;ILnet/minecraft/entity/damage/DamageSource;F)V}
     */
-   public void m_ntlsrlro(LivingEntity arg, int i, DamageSource arg2, float f) {
+   public void onEntityHurt(LivingEntity entity, int amplifier, DamageSource source, float amount) {
    }
 
    /**
@@ -273,27 +281,28 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_uosrujfk Lnet/minecraft/unmapped/C_jaqasomh;m_uosrujfk(Lnet/minecraft/unmapped/C_wpfizwve;)Lnet/minecraft/unmapped/C_nqucohct;}
+    * @mapping {@literal named createParticle Lnet/minecraft/entity/effect/StatusEffect;createParticle(Lnet/minecraft/entity/effect/StatusEffectInstance;)Lnet/minecraft/particle/ParticleEffect;}
     */
-   public ParticleEffect m_uosrujfk(StatusEffectInstance arg) {
-      return (ParticleEffect)this.f_fromvzcw.apply(arg);
+   public ParticleEffect createParticle(StatusEffectInstance statusEffect) {
+      return (ParticleEffect)this.particleFactory.apply(statusEffect);
    }
 
    /**
     * @mapping {@literal hashed m_masoeeuk Lnet/minecraft/unmapped/C_jaqasomh;m_masoeeuk(Lnet/minecraft/unmapped/C_avavozay;)Lnet/minecraft/unmapped/C_jaqasomh;}
-    * @mapping {@literal named m_masoeeuk Lnet/minecraft/entity/effect/StatusEffect;m_masoeeuk(Lnet/minecraft/sound/SoundEvent;)Lnet/minecraft/entity/effect/StatusEffect;}
+    * @mapping {@literal named setApplySound Lnet/minecraft/entity/effect/StatusEffect;setApplySound(Lnet/minecraft/sound/SoundEvent;)Lnet/minecraft/entity/effect/StatusEffect;}
     */
-   public StatusEffect m_masoeeuk(SoundEvent value) {
-      this.f_ohrjpsvc = Optional.of(value);
+   public StatusEffect setApplySound(SoundEvent sound) {
+      this.applySound = Optional.of(sound);
       return this;
    }
 
    /**
     * @mapping {@literal hashed m_abuwruad Lnet/minecraft/unmapped/C_jaqasomh;m_abuwruad([Lnet/minecraft/unmapped/C_kksdgidr;)Lnet/minecraft/unmapped/C_jaqasomh;}
-    * @mapping {@literal named m_abuwruad Lnet/minecraft/entity/effect/StatusEffect;m_abuwruad([Lnet/minecraft/feature_flags/FeatureFlag;)Lnet/minecraft/entity/effect/StatusEffect;}
+    * @mapping {@literal named setRequiredFeatures Lnet/minecraft/entity/effect/StatusEffect;setRequiredFeatures([Lnet/minecraft/feature_flags/FeatureFlag;)Lnet/minecraft/entity/effect/StatusEffect;}
     */
-   public StatusEffect m_abuwruad(FeatureFlag... a) {
-      this.f_ejiuuoay = FeatureFlags.MAIN_REGISTRY.bitSetOf(a);
+   public StatusEffect setRequiredFeatures(FeatureFlag... flags) {
+      this.requiredFeatures = FeatureFlags.MAIN_REGISTRY.bitSetOf(flags);
       return this;
    }
 
@@ -302,7 +311,7 @@
     */
    @Override
    public FeatureFlagBitSet getRequiredFlags() {
-      return this.f_ejiuuoay;
+      return this.requiredFeatures;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/effect/StatusEffects.java namedSrc/net/minecraft/entity/effect/StatusEffects.java
--- namedTargetSrc/net/minecraft/entity/effect/StatusEffects.java	2024-04-03 14:10:47.933675884 +0000
+++ namedSrc/net/minecraft/entity/effect/StatusEffects.java	2024-04-03 14:09:37.345378621 +0000
@@ -239,7 +239,7 @@
     * @mapping {@literal named BAD_OMEN Lnet/minecraft/entity/effect/StatusEffects;BAD_OMEN:Lnet/minecraft/registry/Holder;}
     */
    public static final Holder<StatusEffect> BAD_OMEN = register(
-      "bad_omen", new BadOmenStatusEffect(StatusEffectType.NEUTRAL, 745784).m_masoeeuk(SoundEvents.EVENT_MOB_EFFECT_BAD_OMEN)
+      "bad_omen", new BadOmenStatusEffect(StatusEffectType.NEUTRAL, 745784).setApplySound(SoundEvents.EVENT_MOB_EFFECT_BAD_OMEN)
    );
    /**
     * @mapping {@literal hashed f_tiwwumvg Lnet/minecraft/unmapped/C_srfncnhx;f_tiwwumvg:Lnet/minecraft/unmapped/C_cjzoxshv;}
@@ -258,8 +258,8 @@
    public static final Holder<StatusEffect> TRIAL_OMEN = register(
       "trial_omen",
       new StatusEffect(StatusEffectType.NEUTRAL, 1484454, ParticleTypes.TRIAL_OMEN)
-         .m_masoeeuk(SoundEvents.EVENT_MOB_EFFECT_TRIAL_OMEN)
-         .m_abuwruad(FeatureFlags.UPDATE_1_21)
+         .setApplySound(SoundEvents.EVENT_MOB_EFFECT_TRIAL_OMEN)
+         .setRequiredFeatures(FeatureFlags.UPDATE_1_21)
    );
    /**
     * @mapping {@literal hashed f_rhaxrsow Lnet/minecraft/unmapped/C_srfncnhx;f_rhaxrsow:Lnet/minecraft/unmapped/C_cjzoxshv;}
@@ -268,15 +268,15 @@
    public static final Holder<StatusEffect> RAID_OMEN = register(
       "raid_omen",
       new RaidOmenStatusEffect(StatusEffectType.NEUTRAL, 14565464, ParticleTypes.RAID_OMEN)
-         .m_masoeeuk(SoundEvents.EVENT_MOB_EFFECT_RAID_OMEN)
-         .m_abuwruad(FeatureFlags.UPDATE_1_21)
+         .setApplySound(SoundEvents.EVENT_MOB_EFFECT_RAID_OMEN)
+         .setRequiredFeatures(FeatureFlags.UPDATE_1_21)
    );
    /**
     * @mapping {@literal hashed f_wnclglyv Lnet/minecraft/unmapped/C_srfncnhx;f_wnclglyv:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named WIND_CHARGED Lnet/minecraft/entity/effect/StatusEffects;WIND_CHARGED:Lnet/minecraft/registry/Holder;}
     */
    public static final Holder<StatusEffect> WIND_CHARGED = register(
-      "wind_charged", new WindChargedStatusEffect(StatusEffectType.HARMFUL, 12438015).m_abuwruad(new FeatureFlag[]{FeatureFlags.UPDATE_1_21})
+      "wind_charged", new WindChargedStatusEffect(StatusEffectType.HARMFUL, 12438015).setRequiredFeatures(new FeatureFlag[]{FeatureFlags.UPDATE_1_21})
    );
    /**
     * @mapping {@literal hashed f_jjbfzjae Lnet/minecraft/unmapped/C_srfncnhx;f_jjbfzjae:Lnet/minecraft/unmapped/C_cjzoxshv;}
@@ -285,14 +285,14 @@
    public static final Holder<StatusEffect> WEAVING = register(
       "weaving",
       new WeavingStatusEffect(StatusEffectType.HARMFUL, 7891290, random -> MathHelper.nextBetween(random, 1, 3))
-         .m_abuwruad(new FeatureFlag[]{FeatureFlags.UPDATE_1_21})
+         .setRequiredFeatures(new FeatureFlag[]{FeatureFlags.UPDATE_1_21})
    );
    /**
     * @mapping {@literal hashed f_kotkabsd Lnet/minecraft/unmapped/C_srfncnhx;f_kotkabsd:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named OOZING Lnet/minecraft/entity/effect/StatusEffects;OOZING:Lnet/minecraft/registry/Holder;}
     */
    public static final Holder<StatusEffect> OOZING = register(
-      "oozing", new OozingStatusEffect(StatusEffectType.HARMFUL, 10092451, random -> 2).m_abuwruad(new FeatureFlag[]{FeatureFlags.UPDATE_1_21})
+      "oozing", new OozingStatusEffect(StatusEffectType.HARMFUL, 10092451, random -> 2).setRequiredFeatures(new FeatureFlag[]{FeatureFlags.UPDATE_1_21})
    );
    /**
     * @mapping {@literal hashed f_khbydqyn Lnet/minecraft/unmapped/C_srfncnhx;f_khbydqyn:Lnet/minecraft/unmapped/C_cjzoxshv;}
@@ -301,7 +301,7 @@
    public static final Holder<StatusEffect> INFESTED = register(
       "infested",
       new InfestedStatusEffect(StatusEffectType.HARMFUL, 9214860, 0.05F, random -> MathHelper.nextBetween(random, 1, 3))
-         .m_abuwruad(new FeatureFlag[]{FeatureFlags.UPDATE_1_21})
+         .setRequiredFeatures(new FeatureFlag[]{FeatureFlags.UPDATE_1_21})
    );
 
    /**
diff -bur namedTargetSrc/net/minecraft/entity/effect/WeavingStatusEffect.java namedSrc/net/minecraft/entity/effect/WeavingStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/WeavingStatusEffect.java	2024-04-03 14:10:48.077676497 +0000
+++ namedSrc/net/minecraft/entity/effect/WeavingStatusEffect.java	2024-04-03 14:09:37.533379411 +0000
@@ -36,9 +36,9 @@
     * Mapping not found
     */
    @Override
-   public void m_tlfwwrri(LivingEntity arg, int i, Entity.RemovalReason arg2) {
-      if (arg2 == Entity.RemovalReason.KILLED) {
-         this.m_ordwiosb(arg.getWorld(), arg.getRandom(), arg.getSteppingPosition());
+   public void onEntityRemoved(LivingEntity entity, int amplifier, Entity.RemovalReason reason) {
+      if (reason == Entity.RemovalReason.KILLED) {
+         this.m_ordwiosb(entity.getWorld(), entity.getRandom(), entity.getSteppingPosition());
       }
    }
 
diff -bur namedTargetSrc/net/minecraft/entity/effect/WindChargedStatusEffect.java namedSrc/net/minecraft/entity/effect/WindChargedStatusEffect.java
--- namedTargetSrc/net/minecraft/entity/effect/WindChargedStatusEffect.java	2024-04-03 14:10:47.893675713 +0000
+++ namedSrc/net/minecraft/entity/effect/WindChargedStatusEffect.java	2024-04-03 14:09:37.297378419 +0000
@@ -24,16 +24,16 @@
     * Mapping not found
     */
    @Override
-   public void m_tlfwwrri(LivingEntity arg, int i, Entity.RemovalReason arg2) {
-      if (arg2 == Entity.RemovalReason.KILLED && arg.getWorld() instanceof ServerWorld lv) {
-         double d = arg.getX();
-         double e = arg.getY() + (double)(arg.getHeight() / 2.0F);
-         double f = arg.getZ();
-         float g = 3.0F + arg.getRandom().nextFloat() * 2.0F;
-         lv.m_kyovuptu(
-            arg,
+   public void onEntityRemoved(LivingEntity entity, int amplifier, Entity.RemovalReason reason) {
+      if (reason == Entity.RemovalReason.KILLED && entity.getWorld() instanceof ServerWorld lv) {
+         double d = entity.getX();
+         double e = entity.getY() + (double)(entity.getHeight() / 2.0F);
+         double f = entity.getZ();
+         float g = 3.0F + entity.getRandom().nextFloat() * 2.0F;
+         lv.createExplosion(
+            entity,
             null,
-            WindChargeProjectileEntity.f_whsjpufz,
+            WindChargeProjectileEntity.EXPLOSION_BEHAVIOR,
             d,
             e,
             f,
Only in namedSrc/net/minecraft/entity: EntityAttachments.java
diff -bur namedTargetSrc/net/minecraft/entity/EntityDimensions.java namedSrc/net/minecraft/entity/EntityDimensions.java
--- namedTargetSrc/net/minecraft/entity/EntityDimensions.java	2024-04-03 14:10:47.997676157 +0000
+++ namedSrc/net/minecraft/entity/EntityDimensions.java	2024-04-03 14:09:37.413378907 +0000
@@ -1,6 +1,5 @@
 package net.minecraft.entity;
 
-import net.minecraft.unmapped.C_pubtmkke;
 import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Vec3d;
 
@@ -8,13 +7,13 @@
  * @mapping {@literal hashed net/minecraft/unmapped/C_sszpscpo}
  * @mapping {@literal named net/minecraft/entity/EntityDimensions}
  */
-public record EntityDimensions(float width, float height, float eyeHeight, C_pubtmkke attachments, boolean fixed) {
+public record EntityDimensions(float width, float height, float eyeHeight, EntityAttachments attachments, boolean fixed) {
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_sszpscpo;<init>(FFZ)V}
     * @mapping {@literal named <init> Lnet/minecraft/entity/EntityDimensions;<init>(FFZ)V}
     */
    private EntityDimensions(float width, float height, boolean fixed) {
-      this(width, height, getDefaultEyeHeight(height), C_pubtmkke.m_kcgksuvu(width, height), fixed);
+      this(width, height, getDefaultEyeHeight(height), EntityAttachments.createDefault(width, height), fixed);
    }
 
    /**
@@ -61,7 +60,7 @@
             this.width * widthRatio,
             this.height * heightRatio,
             this.eyeHeight * heightRatio,
-            this.attachments.m_wvcatfpr(widthRatio, heightRatio, widthRatio),
+            this.attachments.scale(widthRatio, heightRatio, widthRatio),
             false
          )
          : this;
@@ -93,9 +92,9 @@
 
    /**
     * @mapping {@literal hashed m_parcrqff Lnet/minecraft/unmapped/C_sszpscpo;m_parcrqff(Lnet/minecraft/unmapped/C_pubtmkke$C_qexjibym;)Lnet/minecraft/unmapped/C_sszpscpo;}
-    * @mapping {@literal named withAttachments Lnet/minecraft/entity/EntityDimensions;withAttachments(Lnet/minecraft/unmapped/C_pubtmkke$C_qexjibym;)Lnet/minecraft/entity/EntityDimensions;}
+    * @mapping {@literal named withAttachments Lnet/minecraft/entity/EntityDimensions;withAttachments(Lnet/minecraft/entity/EntityAttachments$Builder;)Lnet/minecraft/entity/EntityDimensions;}
     */
-   public EntityDimensions withAttachments(C_pubtmkke.C_qexjibym attachments) {
-      return new EntityDimensions(this.width, this.height, this.eyeHeight, attachments.m_zjbeuwok(this.width, this.height), this.fixed);
+   public EntityDimensions withAttachments(EntityAttachments.Builder attachments) {
+      return new EntityDimensions(this.width, this.height, this.eyeHeight, attachments.build(this.width, this.height), this.fixed);
    }
 }


The remaining diff is too long!

Please sign in to comment.