Skip to content

Commit

Permalink
Armor mappings (#544)
Browse files Browse the repository at this point in the history 
* Armor mappings

* Oops

* Update mappings/net/minecraft/item/ArmorMaterial.mapping

Co-authored-by: Iota <[email protected]>

* Update mappings/net/minecraft/item/ArmorMaterial.mapping

Co-authored-by: Iota <[email protected]>

---------

Co-authored-by: Iota <[email protected]>
  • Loading branch information
@OroArmor @IotaBread
OroArmor and IotaBread authored Feb 1, 2024
1 parent 93bdbe8 commit c872daf
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 1 deletion.
10 changes: 10 additions & 0 deletions mappings/net/minecraft/item/AnimalArmorItem.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
CLASS net/minecraft/unmapped/C_bbljnksk net/minecraft/item/AnimalArmorItem
FIELD f_iimkkhka type Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;
FIELD f_ludhudle texture Lnet/minecraft/unmapped/C_ncpywfca;
METHOD m_hrdduwff getTexture ()Lnet/minecraft/unmapped/C_ncpywfca;
METHOD m_jrgzvqyh type ()Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;
CLASS C_rtwzapnt Type
FIELD f_melzgwgg textureLocator Ljava/util/function/Function;
METHOD m_ktoepqvs (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 0 material
METHOD m_pefcxouq (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 0 material
METHOD m_siekoptx (Ljava/lang/String;)Ljava/lang/String;
ARG 0 materialType
5 changes: 4 additions & 1 deletion mappings/net/minecraft/item/ArmorItem.mapping
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CLASS net/minecraft/unmapped/C_fxxorins net/minecraft/item/ArmorItem
FIELD f_gmumlgwi type Lnet/minecraft/unmapped/C_cjzoxshv;
FIELD f_gmumlgwi material Lnet/minecraft/unmapped/C_cjzoxshv;
FIELD f_hlvfwlnv SLOT_UUID_MODIFIERS Ljava/util/EnumMap;
FIELD f_jztfkhpa attributeModifiers Ljava/util/function/Supplier;
FIELD f_mbpotsct DISPENSER_BEHAVIOR Lnet/minecraft/unmapped/C_ooeeaffg;
Expand All @@ -20,4 +20,7 @@ CLASS net/minecraft/unmapped/C_fxxorins net/minecraft/item/ArmorItem
ARG 3 equipmentSlot
ARG 4 translationKey
METHOD m_jdikuqoa getTranslationKey ()Ljava/lang/String;
METHOD m_jmsphvxs getBaseDurability (I)I
ARG 1 multiplier
METHOD m_mslqofbv getEquipmentSlot ()Lnet/minecraft/unmapped/C_yuycoehb;
METHOD m_nsmbimhv supportsTrim ()Z
17 changes: 17 additions & 0 deletions mappings/net/minecraft/item/ArmorMaterial.mapping
View file
Original file line number Diff line number Diff line change
@@ -1 +1,18 @@
CLASS net/minecraft/unmapped/C_fwzogbap net/minecraft/item/ArmorMaterial
METHOD m_pbezkfps getDefense (Lnet/minecraft/unmapped/C_fxxorins$C_rhnguwzk;)I
ARG 1 slot
CLASS C_zppthdag Layer
FIELD f_idoyjzoh innerTexture Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_ljskcqxs suffix Ljava/lang/String;
FIELD f_maplsngd dyeable Z
FIELD f_nvqoxxma assetName Lnet/minecraft/unmapped/C_ncpywfca;
FIELD f_ohziprrt outerTexture Lnet/minecraft/unmapped/C_ncpywfca;
METHOD <init> (Lnet/minecraft/unmapped/C_ncpywfca;)V
ARG 1 assetName
METHOD m_anlpxkiu texture (Z)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 1 innerTexture
METHOD m_dsxupwpw (ZLjava/lang/String;)Ljava/lang/String;
ARG 2 asset
METHOD m_gabvscqb resolveTexture (Z)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 1 outerTexture
METHOD m_scfgoteb isDyeable ()Z
12 changes: 12 additions & 0 deletions mappings/net/minecraft/item/ArmorMaterials.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,17 @@ CLASS net/minecraft/unmapped/C_asebjgum net/minecraft/item/ArmorMaterials
ARG 0 map
METHOD m_ohqtczev (Ljava/util/EnumMap;)V
ARG 0 map
METHOD m_tfqnkndt register (Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/unmapped/C_cjzoxshv;FFLjava/util/function/Supplier;Ljava/util/List;)Lnet/minecraft/unmapped/C_cjzoxshv;
ARG 0 name
ARG 1 defense
ARG 2 enchantmentValue
ARG 3 equipSound
ARG 4 toughness
ARG 5 knockbackResistance
ARG 6 repairIngredient
ARG 7 layers
METHOD m_ufkcvlpi (Ljava/util/EnumMap;)V
ARG 0 map
METHOD m_wkcelnza register (Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/unmapped/C_cjzoxshv;FFLjava/util/function/Supplier;)Lnet/minecraft/unmapped/C_cjzoxshv;
ARG 0 name
METHOD m_xrjlzjae bootstrap (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_cjzoxshv;
7 changes: 7 additions & 0 deletions mappings/net/minecraft/item/trim/ArmorTrimPermutation.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,27 @@ CLASS net/minecraft/unmapped/C_vglbnrob net/minecraft/item/trim/ArmorTrimPermuta
METHOD m_bhtolzio (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD m_clrggaww getBodyTexture (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 1 material
METHOD m_cvftufhl getPermutationFromStack (Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_sddaxwyk;Z)Ljava/util/Optional;
ARG 2 ignoreWarnings
METHOD m_elyrxtbt equals (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_cjzoxshv;)Z
ARG 1 pattern
ARG 2 material
METHOD m_gosigodc getColorPaletteSuffix (Lnet/minecraft/unmapped/C_cjzoxshv;)Ljava/lang/String;
ARG 1 material
METHOD m_hltcxmev (ZLjava/lang/String;)V
ARG 1 warning
METHOD m_hndklqwv (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 2 legMaterial
METHOD m_kzjqgjez tryAddPermutationToStack (Lnet/minecraft/unmapped/C_wqxmvzdq;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_vglbnrob;)Z
ARG 2 permutation
METHOD m_nilecwwa addTooltipLines (Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_wqxmvzdq;Ljava/util/List;)V
ARG 2 lines
METHOD m_shwsycqc (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
ARG 1 path
METHOD m_vfsylkpb (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 2 bodyMaterial
METHOD m_wnaylgoh getLeggingsTexture (Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ncpywfca;
ARG 1 material
METHOD m_yxaatpkm (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
ARG 1 path

3 comments on commit c872daf

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

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

With commit c872daf, 47 file(s) were updated with 760 line(s) added and 640 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementCriterion.java namedSrc/net/minecraft/advancement/AdvancementCriterion.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementCriterion.java	2024-02-01 16:28:49.393882997 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementCriterion.java	2024-02-01 16:27:36.133852783 +0000
@@ -20,9 +20,10 @@
       "trigger", "conditions", Criteria.CODEC, AdvancementCriterion::trigger, AdvancementCriterion::getCodec
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bijaoybp Lnet/minecraft/unmapped/C_rzypsigz;f_bijaoybp:Lcom/mojang/serialization/Codec;}
+    * @mapping {@literal named CODEC Lnet/minecraft/advancement/AdvancementCriterion;CODEC:Lcom/mojang/serialization/Codec;}
     */
-   public static final Codec<AdvancementCriterion<?>> f_bijaoybp = MAP_CODEC.codec();
+   public static final Codec<AdvancementCriterion<?>> CODEC = MAP_CODEC.codec();
 
    /**
     * @mapping {@literal hashed m_uxddutmc Lnet/minecraft/unmapped/C_rzypsigz;m_uxddutmc(Lnet/minecraft/unmapped/C_mysyaxfs;)Lcom/mojang/serialization/Codec;}
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementDisplay.java namedSrc/net/minecraft/advancement/AdvancementDisplay.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementDisplay.java	2024-02-01 16:28:49.369882988 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementDisplay.java	2024-02-01 16:27:36.109852772 +0000
@@ -34,9 +34,10 @@
             .apply(instance, AdvancementDisplay::new)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ktnisvwv Lnet/minecraft/unmapped/C_bvqakncm;f_ktnisvwv:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/advancement/AdvancementDisplay;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, AdvancementDisplay> f_ktnisvwv = PacketCodec.create(
+   public static final PacketCodec<RegistryByteBuf, AdvancementDisplay> PACKET_CODEC = PacketCodec.create(
       AdvancementDisplay::toPacket, AdvancementDisplay::fromPacket
    );
    /**
@@ -207,11 +208,11 @@
     * @mapping {@literal hashed m_jhcmytjo Lnet/minecraft/unmapped/C_bvqakncm;m_jhcmytjo(Lnet/minecraft/unmapped/C_bngyzsts;)V}
     * @mapping {@literal named toPacket Lnet/minecraft/advancement/AdvancementDisplay;toPacket(Lnet/minecraft/network/RegistryByteBuf;)V}
     */
-   private void toPacket(RegistryByteBuf arg) {
-      TextCodecs.f_byaedzcu.encode(arg, this.title);
-      TextCodecs.f_byaedzcu.encode(arg, this.description);
-      ItemStack.f_bnghiwgu.encode(arg, this.icon);
-      arg.writeEnumConstant(this.type);
+   private void toPacket(RegistryByteBuf buf) {
+      TextCodecs.f_byaedzcu.encode(buf, this.title);
+      TextCodecs.f_byaedzcu.encode(buf, this.description);
+      ItemStack.f_bnghiwgu.encode(buf, this.icon);
+      buf.writeEnumConstant(this.type);
       int i = 0;
       if (this.background.isPresent()) {
          i |= 1;
@@ -225,27 +226,27 @@
          i |= 4;
       }
 
-      arg.writeInt(i);
-      this.background.ifPresent(arg::writeIdentifier);
-      arg.writeFloat(this.x);
-      arg.writeFloat(this.y);
+      buf.writeInt(i);
+      this.background.ifPresent(buf::writeIdentifier);
+      buf.writeFloat(this.x);
+      buf.writeFloat(this.y);
    }
 
    /**
     * @mapping {@literal hashed m_asmgeqym Lnet/minecraft/unmapped/C_bvqakncm;m_asmgeqym(Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_bvqakncm;}
     * @mapping {@literal named fromPacket Lnet/minecraft/advancement/AdvancementDisplay;fromPacket(Lnet/minecraft/network/RegistryByteBuf;)Lnet/minecraft/advancement/AdvancementDisplay;}
     */
-   private static AdvancementDisplay fromPacket(RegistryByteBuf arg) {
-      Text lv = TextCodecs.f_byaedzcu.decode(arg);
-      Text lv2 = TextCodecs.f_byaedzcu.decode(arg);
-      ItemStack lv3 = ItemStack.f_bnghiwgu.decode(arg);
-      AdvancementType lv4 = arg.readEnumConstant(AdvancementType.class);
-      int i = arg.readInt();
-      Optional<Identifier> optional = (i & 1) != 0 ? Optional.of(arg.readIdentifier()) : Optional.empty();
+   private static AdvancementDisplay fromPacket(RegistryByteBuf buf) {
+      Text lv = TextCodecs.f_byaedzcu.decode(buf);
+      Text lv2 = TextCodecs.f_byaedzcu.decode(buf);
+      ItemStack lv3 = ItemStack.f_bnghiwgu.decode(buf);
+      AdvancementType lv4 = buf.readEnumConstant(AdvancementType.class);
+      int i = buf.readInt();
+      Optional<Identifier> optional = (i & 1) != 0 ? Optional.of(buf.readIdentifier()) : Optional.empty();
       boolean bl = (i & 2) != 0;
       boolean bl2 = (i & 4) != 0;
       AdvancementDisplay lv5 = new AdvancementDisplay(lv3, lv, lv2, optional, lv4, bl, false, bl2);
-      lv5.setPos(arg.readFloat(), arg.readFloat());
+      lv5.setPos(buf.readFloat(), buf.readFloat());
       return lv5;
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/AdvancementHolder.java namedSrc/net/minecraft/advancement/AdvancementHolder.java
--- namedTargetSrc/net/minecraft/advancement/AdvancementHolder.java	2024-02-01 16:28:49.593883077 +0000
+++ namedSrc/net/minecraft/advancement/AdvancementHolder.java	2024-02-01 16:27:36.377852894 +0000
@@ -12,15 +12,17 @@
  */
 public record AdvancementHolder(Identifier id, Advancement data) {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_epmbxpwm Lnet/minecraft/unmapped/C_unoypvme;f_epmbxpwm:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/advancement/AdvancementHolder;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, AdvancementHolder> f_epmbxpwm = PacketCodec.create(
-      Identifier.f_sbbaqjle, AdvancementHolder::id, Advancement.f_bihtcblh, AdvancementHolder::data, AdvancementHolder::new
+   public static final PacketCodec<RegistryByteBuf, AdvancementHolder> PACKET_CODEC = PacketCodec.create(
+      Identifier.f_sbbaqjle, AdvancementHolder::id, Advancement.PACKET_CODEC, AdvancementHolder::data, AdvancementHolder::new
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_wpifnhgy Lnet/minecraft/unmapped/C_unoypvme;f_wpifnhgy:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named LIST_PACKET_CODEC Lnet/minecraft/advancement/AdvancementHolder;LIST_PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, List<AdvancementHolder>> f_wpifnhgy = f_epmbxpwm.apply(PacketCodecs.m_bobeiocn());
+   public static final PacketCodec<RegistryByteBuf, List<AdvancementHolder>> LIST_PACKET_CODEC = PACKET_CODEC.apply(PacketCodecs.m_bobeiocn());
 
    /**
     * @mapping {@literal hashed equals Lnet/minecraft/unmapped/C_unoypvme;equals(Ljava/lang/Object;)Z}
diff -bur namedTargetSrc/net/minecraft/advancement/Advancement.java namedSrc/net/minecraft/advancement/Advancement.java
--- namedTargetSrc/net/minecraft/advancement/Advancement.java	2024-02-01 16:28:49.445883019 +0000
+++ namedSrc/net/minecraft/advancement/Advancement.java	2024-02-01 16:27:36.185852807 +0000
@@ -43,7 +43,7 @@
     * @mapping {@literal named CRITERIA_CODEC Lnet/minecraft/advancement/Advancement;CRITERIA_CODEC:Lcom/mojang/serialization/Codec;}
     */
    private static final Codec<Map<String, AdvancementCriterion<?>>> CRITERIA_CODEC = Codecs.validate(
-      Codec.unboundedMap(Codec.STRING, AdvancementCriterion.f_bijaoybp),
+      Codec.unboundedMap(Codec.STRING, AdvancementCriterion.CODEC),
       map -> map.isEmpty() ? DataResult.error(() -> "Advancement criteria cannot be empty") : DataResult.success(map)
    );
    /**
@@ -69,9 +69,10 @@
       Advancement::validate
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bihtcblh Lnet/minecraft/unmapped/C_kdwyuhdb;f_bihtcblh:Lnet/minecraft/unmapped/C_qsrmwluu;}
+    * @mapping {@literal named PACKET_CODEC Lnet/minecraft/advancement/Advancement;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
-   public static final PacketCodec<RegistryByteBuf, Advancement> f_bihtcblh = PacketCodec.create(Advancement::toPacket, Advancement::fromPacket);
+   public static final PacketCodec<RegistryByteBuf, Advancement> PACKET_CODEC = PacketCodec.create(Advancement::toPacket, Advancement::fromPacket);
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kdwyuhdb;<init>(Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/unmapped/C_wptigggq;Ljava/util/Map;Lnet/minecraft/unmapped/C_wbfyxnvb;Z)V}
@@ -120,25 +121,25 @@
     * @mapping {@literal hashed m_xfimowjn Lnet/minecraft/unmapped/C_kdwyuhdb;m_xfimowjn(Lnet/minecraft/unmapped/C_bngyzsts;)V}
     * @mapping {@literal named toPacket Lnet/minecraft/advancement/Advancement;toPacket(Lnet/minecraft/network/RegistryByteBuf;)V}
     */
-   private void toPacket(RegistryByteBuf arg) {
-      arg.writeOptional(this.parent, PacketByteBuf::writeIdentifier);
-      AdvancementDisplay.f_ktnisvwv.apply(PacketCodecs::m_ciouqnhu).encode(arg, this.display);
-      this.requirements.toPacket(arg);
-      arg.writeBoolean(this.sendsTelemetryEvent);
+   private void toPacket(RegistryByteBuf requirements) {
+      requirements.writeOptional(this.parent, PacketByteBuf::writeIdentifier);
+      AdvancementDisplay.PACKET_CODEC.apply(PacketCodecs::m_ciouqnhu).encode(requirements, this.display);
+      this.requirements.toPacket(requirements);
+      requirements.writeBoolean(this.sendsTelemetryEvent);
    }
 
    /**
     * @mapping {@literal hashed m_hpxxrezd Lnet/minecraft/unmapped/C_kdwyuhdb;m_hpxxrezd(Lnet/minecraft/unmapped/C_bngyzsts;)Lnet/minecraft/unmapped/C_kdwyuhdb;}
     * @mapping {@literal named fromPacket Lnet/minecraft/advancement/Advancement;fromPacket(Lnet/minecraft/network/RegistryByteBuf;)Lnet/minecraft/advancement/Advancement;}
     */
-   private static Advancement fromPacket(RegistryByteBuf arg) {
+   private static Advancement fromPacket(RegistryByteBuf requirements) {
       return new Advancement(
-         arg.readOptional(PacketByteBuf::readIdentifier),
-         (Optional<AdvancementDisplay>)AdvancementDisplay.f_ktnisvwv.apply(PacketCodecs::m_ciouqnhu).decode(arg),
+         requirements.readOptional(PacketByteBuf::readIdentifier),
+         (Optional<AdvancementDisplay>)AdvancementDisplay.PACKET_CODEC.apply(PacketCodecs::m_ciouqnhu).decode(requirements),
          AdvancementRewards.NONE,
          Map.of(),
-         new AdvancementRequirements(arg),
-         arg.readBoolean()
+         new AdvancementRequirements(requirements),
+         requirements.readBoolean()
       );
    }
 
@@ -155,9 +156,9 @@
     * @mapping {@literal named validateCriteria Lnet/minecraft/advancement/Advancement;validateCriteria(Lnet/minecraft/util/ErrorReporter;Lnet/minecraft/loot/LootDataLookup;)V}
     */
    public void validateCriteria(ErrorReporter reporter, LootDataLookup dataLookup) {
-      this.criteria.forEach((string, arg3) -> {
-         CriterionValidator lv = new CriterionValidator(reporter.forChild(string), dataLookup);
-         arg3.conditions().validate(lv);
+      this.criteria.forEach((criterion, advancement) -> {
+         CriterionValidator lv = new CriterionValidator(reporter.forChild(criterion), dataLookup);
+         advancement.conditions().validate(lv);
       });
    }
 
Only in namedSrc/net/minecraft/advancement/criterion: AnyBlockUseCriterionTrigger.java
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/Criteria.java namedSrc/net/minecraft/advancement/criterion/Criteria.java
--- namedTargetSrc/net/minecraft/advancement/criterion/Criteria.java	2024-02-01 16:28:49.393882997 +0000
+++ namedSrc/net/minecraft/advancement/criterion/Criteria.java	2024-02-01 16:27:36.137852785 +0000
@@ -3,8 +3,6 @@
 import com.mojang.serialization.Codec;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
-import net.minecraft.unmapped.C_kpxhjwrb;
-import net.minecraft.unmapped.C_ocazivhc;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_hmkjzbjo}
@@ -214,13 +212,15 @@
     */
    public static final ItemUsedOnLocationCriterionTrigger ITEM_USED_ON_BLOCK = register("item_used_on_block", new ItemUsedOnLocationCriterionTrigger());
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_mzjwnwho Lnet/minecraft/unmapped/C_hmkjzbjo;f_mzjwnwho:Lnet/minecraft/unmapped/C_ocazivhc;}
+    * @mapping {@literal named DEFAULT_BLOCK_USED Lnet/minecraft/advancement/criterion/Criteria;DEFAULT_BLOCK_USED:Lnet/minecraft/advancement/criterion/DefaultBlockUseCriterionTrigger;}
     */
-   public static final C_ocazivhc f_mzjwnwho = register("default_block_use", new C_ocazivhc());
+   public static final DefaultBlockUseCriterionTrigger DEFAULT_BLOCK_USED = register("default_block_use", new DefaultBlockUseCriterionTrigger());
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_kpaajnbe Lnet/minecraft/unmapped/C_hmkjzbjo;f_kpaajnbe:Lnet/minecraft/unmapped/C_kpxhjwrb;}
+    * @mapping {@literal named ANY_BLOCK_USED Lnet/minecraft/advancement/criterion/Criteria;ANY_BLOCK_USED:Lnet/minecraft/advancement/criterion/AnyBlockUseCriterionTrigger;}
     */
-   public static final C_kpxhjwrb f_kpaajnbe = register("any_block_use", new C_kpxhjwrb());
+   public static final AnyBlockUseCriterionTrigger ANY_BLOCK_USED = register("any_block_use", new AnyBlockUseCriterionTrigger());
    /**
     * @mapping {@literal hashed f_rgoglrbb Lnet/minecraft/unmapped/C_hmkjzbjo;f_rgoglrbb:Lnet/minecraft/unmapped/C_ccuyenqy;}
     * @mapping {@literal named PLAYER_GENERATES_CONTAINER_LOOT Lnet/minecraft/advancement/criterion/Criteria;PLAYER_GENERATES_CONTAINER_LOOT:Lnet/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterionTrigger;}
Only in namedSrc/net/minecraft/advancement/criterion: DefaultBlockUseCriterionTrigger.java
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java namedSrc/net/minecraft/block/DecoratedPotBlock.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotBlock.java	2024-02-01 16:28:49.381882993 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotBlock.java	2024-02-01 16:27:36.121852778 +0000
@@ -142,14 +142,14 @@
          if (world.isClient) {
             return C_gqmsalid.CONSUME;
          } else {
-            ItemStack lv3 = lv.m_xwjsgxrp();
+            ItemStack lv3 = lv.getStack();
             if (!stack.isEmpty() && (lv3.isEmpty() || ItemStack.canCombine(lv3, stack) && lv3.getCount() < lv3.getMaxCount())) {
                lv.m_faozmaju(DecoratedPotBlockEntity.C_qjewosgd.POSITIVE);
                player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem()));
                ItemStack lv4 = player.isCreative() ? stack.withCount(1) : stack.split(1);
                float f;
                if (lv.isEmpty()) {
-                  lv.m_bkmnewbu(lv4);
+                  lv.setStack(lv4);
                   f = (float)lv4.getCount() / (float)lv4.getMaxCount();
                } else {
                   lv3.increment(1);
diff -bur namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-02-01 16:28:49.573883070 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2024-02-01 16:27:36.353852883 +0000
@@ -180,8 +180,8 @@
     * Mapping not found
     */
    @Override
-   public void setLootTableId(@Nullable Identifier arg) {
-      this.identifier = arg;
+   public void setLootTableId(@Nullable Identifier id) {
+      this.identifier = id;
    }
 
    /**
@@ -196,15 +196,15 @@
     * Mapping not found
     */
    @Override
-   public void setLootTableSeed(long l) {
-      this.lootTableSeed = l;
+   public void setLootTableSeed(long seed) {
+      this.lootTableSeed = seed;
    }
 
    /**
     * Mapping not found
     */
    @Override
-   public ItemStack m_xwjsgxrp() {
+   public ItemStack getStack() {
       this.setupLoot(null);
       return this.stack;
    }
@@ -213,9 +213,9 @@
     * Mapping not found
     */
    @Override
-   public ItemStack m_htpnuxlo(int i) {
+   public ItemStack decreaseStack(int count) {
       this.setupLoot(null);
-      ItemStack lv = this.stack.split(i);
+      ItemStack lv = this.stack.split(count);
       if (this.stack.isEmpty()) {
          this.stack = ItemStack.EMPTY;
       }
@@ -224,11 +224,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_bkmnewbu Lnet/minecraft/unmapped/C_snnddtnv;m_bkmnewbu(Lnet/minecraft/unmapped/C_sddaxwyk;)V}
-    * @mapping {@literal named m_bkmnewbu Lnet/minecraft/block/entity/DecoratedPotBlockEntity;m_bkmnewbu(Lnet/minecraft/item/ItemStack;)V}
+    * Mapping not found
     */
    @Override
-   public void m_bkmnewbu(ItemStack stack) {
+   public void setStack(ItemStack stack) {
       this.setupLoot(null);
       this.stack = stack;
    }
@@ -237,7 +236,7 @@
     * Mapping not found
     */
    @Override
-   public BlockEntity m_ejhbwvaa() {
+   public BlockEntity getBlockEntity() {
       return this;
    }
 
diff -bur namedTargetSrc/net/minecraft/block/entity/JukeboxBlockEntity.java namedSrc/net/minecraft/block/entity/JukeboxBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/JukeboxBlockEntity.java	2024-02-01 16:28:49.561883064 +0000
+++ namedSrc/net/minecraft/block/entity/JukeboxBlockEntity.java	2024-02-01 16:27:36.341852877 +0000
@@ -89,8 +89,8 @@
    @Override
    protected void writeNbt(NbtCompound nbt, HolderLookup.Provider arg2) {
       super.writeNbt(nbt, arg2);
-      if (!this.m_xwjsgxrp().isEmpty()) {
-         nbt.put("RecordItem", this.m_xwjsgxrp().writeNbt(new NbtCompound()));
+      if (!this.getStack().isEmpty()) {
+         nbt.put("RecordItem", this.getStack().writeNbt(new NbtCompound()));
       }
 
       nbt.putBoolean("IsPlaying", this.isPlaying);
@@ -103,7 +103,7 @@
     * @mapping {@literal named isPlaying Lnet/minecraft/block/entity/JukeboxBlockEntity;isPlaying()Z}
     */
    public boolean isPlaying() {
-      return !this.m_xwjsgxrp().isEmpty() && this.isPlaying;
+      return !this.getStack().isEmpty() && this.isPlaying;
    }
 
    /**
@@ -126,7 +126,7 @@
       this.recordStartTick = this.tickCount;
       this.isPlaying = true;
       this.world.updateNeighborsAlways(this.getPos(), this.getCachedState().getBlock());
-      this.world.syncWorldEvent(null, 1010, this.getPos(), Item.getRawId(this.m_xwjsgxrp().getItem()));
+      this.world.syncWorldEvent(null, 1010, this.getPos(), Item.getRawId(this.getStack().getItem()));
       this.markDirty();
    }
 
@@ -148,7 +148,7 @@
     */
    private void tick(World world, BlockPos pos, BlockState state) {
       this.ticksSinceLastEvent++;
-      if (this.isPlaying() && this.m_xwjsgxrp().getItem() instanceof MusicDiscItem lv) {
+      if (this.isPlaying() && this.getStack().getItem() instanceof MusicDiscItem lv) {
          if (this.isDiscFinishedPlaying(lv)) {
             this.stopPlaying();
          } else if (this.oneSecondWithoutEvents()) {
@@ -181,7 +181,7 @@
     * Mapping not found
     */
    @Override
-   public ItemStack m_xwjsgxrp() {
+   public ItemStack getStack() {
       return this.stack;
    }
 
@@ -189,7 +189,7 @@
     * Mapping not found
     */
    @Override
-   public ItemStack m_htpnuxlo(int i) {
+   public ItemStack decreaseStack(int count) {
       ItemStack lv = this.stack;
       this.stack = ItemStack.EMPTY;
       if (!lv.isEmpty()) {
@@ -201,17 +201,16 @@
    }
 
    /**
-    * @mapping {@literal hashed m_bkmnewbu Lnet/minecraft/unmapped/C_qgqgzpda;m_bkmnewbu(Lnet/minecraft/unmapped/C_sddaxwyk;)V}
-    * @mapping {@literal named m_bkmnewbu Lnet/minecraft/block/entity/JukeboxBlockEntity;m_bkmnewbu(Lnet/minecraft/item/ItemStack;)V}
+    * Mapping not found
     */
    @Override
-   public void m_bkmnewbu(ItemStack stack) {
+   public void setStack(ItemStack stack) {
       if (stack.isIn(ItemTags.MUSIC_DISCS) && this.world != null) {
          this.stack = stack;
          this.setState(null, true);
          this.startPlaying();
       } else if (stack.isEmpty()) {
-         this.m_htpnuxlo(1);
+         this.decreaseStack(1);
       }
    }
 
@@ -227,7 +226,7 @@
     * Mapping not found
     */
    @Override
-   public BlockEntity m_ejhbwvaa() {
+   public BlockEntity getBlockEntity() {
       return this;
    }
 
@@ -266,9 +265,9 @@
    public void dropDisc() {
       if (this.world != null && !this.world.isClient) {
          BlockPos lv = this.getPos();
-         ItemStack lv2 = this.m_xwjsgxrp();
+         ItemStack lv2 = this.getStack();
          if (!lv2.isEmpty()) {
-            this.m_brueltfr();
+            this.emptyStack();
             Vec3d lv3 = Vec3d.offset(lv, 0.5, 1.01, 0.5).addRandom(this.world.random, 0.7F);
             ItemStack lv4 = lv2.copy();
             ItemEntity lv5 = new ItemEntity(this.world, lv3.getX(), lv3.getY(), lv3.getZ(), lv4);
diff -bur namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-02-01 16:28:49.417883007 +0000
+++ namedSrc/net/minecraft/block/entity/LootableContainerBlockEntity.java	2024-02-01 16:27:36.157852794 +0000
@@ -51,8 +51,8 @@
     * Mapping not found
     */
    @Override
-   public void setLootTableId(@Nullable Identifier arg) {
-      this.lootTableId = arg;
+   public void setLootTableId(@Nullable Identifier id) {
+      this.lootTableId = id;
    }
 
    /**
@@ -67,8 +67,8 @@
     * Mapping not found
     */
    @Override
-   public void setLootTableSeed(long l) {
-      this.lootTableSeed = l;
+   public void setLootTableSeed(long seed) {
+      this.lootTableSeed = seed;
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/JukeboxBlock.java namedSrc/net/minecraft/block/JukeboxBlock.java
--- namedTargetSrc/net/minecraft/block/JukeboxBlock.java	2024-02-01 16:28:49.425883010 +0000
+++ namedSrc/net/minecraft/block/JukeboxBlock.java	2024-02-01 16:27:36.165852798 +0000
@@ -135,7 +135,7 @@
     */
    @Override
    protected int getComparatorOutput(BlockState state, World world, BlockPos pos) {
-      if (world.getBlockEntity(pos) instanceof JukeboxBlockEntity lv && lv.m_xwjsgxrp().getItem() instanceof MusicDiscItem lv2) {
+      if (world.getBlockEntity(pos) instanceof JukeboxBlockEntity lv && lv.getStack().getItem() instanceof MusicDiscItem lv2) {
          return lv2.getComparatorOutput();
       }
 
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-02-01 16:28:49.377882991 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/ArmorFeatureRenderer.java	2024-02-01 16:27:36.121852778 +0000
@@ -89,11 +89,11 @@
             ArmorMaterial lv4 = lv2.getMaterial().value();
             int j = lv.isIn(ItemTags.DYEABLE) ? DyeableItem.getColor(lv) : -1;
 
-            for (ArmorMaterial.C_zppthdag lv5 : lv4.layers()) {
+            for (ArmorMaterial.Layer lv5 : lv4.layers()) {
                float f;
                float g;
                float h;
-               if (lv5.m_scfgoteb() && j != -1) {
+               if (lv5.isDyeable() && j != -1) {
                   f = (float)ColorUtil.ARGB32.getRed(j) / 255.0F;
                   g = (float)ColorUtil.ARGB32.getGreen(j) / 255.0F;
                   h = (float)ColorUtil.ARGB32.getBlue(j) / 255.0F;
@@ -103,7 +103,7 @@
                   h = 1.0F;
                }
 
-               this.renderArmorParts(matrices, vertexConsumers, light, model, f, g, h, lv5.m_anlpxkiu(bl));
+               this.renderArmorParts(matrices, vertexConsumers, light, model, f, g, h, lv5.texture(bl));
             }
 
             ArmorTrimPermutation.getPermutationFromStack(entity.getWorld().getRegistryManager(), lv, true)
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-02-01 16:28:49.385882994 +0000
+++ namedSrc/net/minecraft/client/render/entity/feature/HorseArmorFeatureRenderer.java	2024-02-01 16:27:36.125852779 +0000
@@ -45,7 +45,7 @@
       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();
-      if (lv.getItem() instanceof AnimalArmorItem lv2 && lv2.m_jrgzvqyh() == AnimalArmorItem.C_rtwzapnt.EQUESTRIAN) {
+      if (lv.getItem() instanceof AnimalArmorItem lv2 && lv2.type() == AnimalArmorItem.Type.EQUESTRIAN) {
          this.getContextModel().copyStateTo(this.model);
          this.model.animateModel(arg3, f, g, h);
          this.model.setAngles(arg3, f, g, j, k, l);
diff -bur namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java namedSrc/net/minecraft/data/client/ItemModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-02-01 16:28:49.669883108 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2024-02-01 16:27:36.445852925 +0000
@@ -158,7 +158,7 @@
     * @mapping {@literal named registerArmor Lnet/minecraft/data/client/ItemModelGenerator;registerArmor(Lnet/minecraft/item/ArmorItem;)V}
     */
    private void registerArmor(ArmorItem armor) {
-      if (armor.getArmorSlot().m_nsmbimhv()) {
+      if (armor.getArmorSlot().supportsTrim()) {
          Identifier lv = ModelIds.getItemModelId(armor);
          Identifier lv2 = Texture.getId(armor);
          Identifier lv3 = Texture.getSubId(armor, "_overlay");
diff -bur namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java
--- namedTargetSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-02-01 16:28:49.497883039 +0000
+++ namedSrc/net/minecraft/entity/data/TrackedDataHandlerRegistry.java	2024-02-01 16:27:36.257852839 +0000
@@ -205,7 +205,7 @@
     * @mapping {@literal hashed f_yoecocbx Lnet/minecraft/unmapped/C_fegtripb;f_yoecocbx:Lnet/minecraft/unmapped/C_xrzqxzbg;}
     * @mapping {@literal named VILLAGER_DATA Lnet/minecraft/entity/data/TrackedDataHandlerRegistry;VILLAGER_DATA:Lnet/minecraft/entity/data/TrackedDataHandler;}
     */
-   public static final TrackedDataHandler<VillagerData> VILLAGER_DATA = TrackedDataHandler.m_eoamrvbe(VillagerData.f_xovgoapg);
+   public static final TrackedDataHandler<VillagerData> VILLAGER_DATA = TrackedDataHandler.m_eoamrvbe(VillagerData.PACKET_CODEC);
    /**
     * Mapping not found
     */
diff -bur namedTargetSrc/net/minecraft/entity/passive/HorseBaseEntity.java namedSrc/net/minecraft/entity/passive/HorseBaseEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/HorseBaseEntity.java	2024-02-01 16:28:49.361882985 +0000
+++ namedSrc/net/minecraft/entity/passive/HorseBaseEntity.java	2024-02-01 16:27:36.101852769 +0000
@@ -302,16 +302,15 @@
        * Mapping not found
        */
       @Override
-      public ItemStack m_xwjsgxrp() {
+      public ItemStack getStack() {
          return HorseBaseEntity.this.m_faldjosq();
       }
 
       /**
-       * @mapping {@literal hashed m_bkmnewbu Lnet/minecraft/unmapped/C_ktznyhaj$C_ousebsze;m_bkmnewbu(Lnet/minecraft/unmapped/C_sddaxwyk;)V}
-       * @mapping {@literal named m_bkmnewbu Lnet/minecraft/entity/passive/HorseBaseEntity$C_ousebsze;m_bkmnewbu(Lnet/minecraft/item/ItemStack;)V}
+       * Mapping not found
        */
       @Override
-      public void m_bkmnewbu(ItemStack stack) {
+      public void setStack(ItemStack stack) {
          HorseBaseEntity.this.m_utndsklm(stack);
       }
 
diff -bur namedTargetSrc/net/minecraft/entity/passive/HorseEntity.java namedSrc/net/minecraft/entity/passive/HorseEntity.java
--- namedTargetSrc/net/minecraft/entity/passive/HorseEntity.java	2024-02-01 16:28:49.489883036 +0000
+++ namedSrc/net/minecraft/entity/passive/HorseEntity.java	2024-02-01 16:27:36.241852832 +0000
@@ -303,7 +303,7 @@
     */
    @Override
    public boolean m_rvknxdfs(ItemStack stack) {
-      if (stack.getItem() instanceof AnimalArmorItem lv && lv.m_jrgzvqyh() == AnimalArmorItem.C_rtwzapnt.EQUESTRIAN) {
+      if (stack.getItem() instanceof AnimalArmorItem lv && lv.type() == AnimalArmorItem.Type.EQUESTRIAN) {
          return true;
       }
 
diff -bur namedTargetSrc/net/minecraft/inventory/Inventory.java namedSrc/net/minecraft/inventory/Inventory.java
--- namedTargetSrc/net/minecraft/inventory/Inventory.java	2024-02-01 16:28:49.437883016 +0000
+++ namedSrc/net/minecraft/inventory/Inventory.java	2024-02-01 16:27:36.177852804 +0000
@@ -21,9 +21,10 @@
     */
    int MAX_COUNT_PER_STACK = 64;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vlssyyaw Lnet/minecraft/unmapped/C_pjtstjoq;f_vlssyyaw:F}
+    * @mapping {@literal named DEFAULT_MAX_INTERACTION_RANGE Lnet/minecraft/inventory/Inventory;DEFAULT_MAX_INTERACTION_RANGE:F}
     */
-   float f_vlssyyaw = 4.0F;
+   float DEFAULT_MAX_INTERACTION_RANGE = 4.0F;
 
    /**
     * @mapping {@literal hashed m_dmbfvefd Lnet/minecraft/unmapped/C_pjtstjoq;m_dmbfvefd()I}
@@ -181,20 +182,20 @@
     * @mapping {@literal named canPlayerUse Lnet/minecraft/inventory/Inventory;canPlayerUse(Lnet/minecraft/block/entity/BlockEntity;Lnet/minecraft/entity/player/PlayerEntity;)Z}
     */
    static boolean canPlayerUse(BlockEntity blockEntity, PlayerEntity entity) {
-      return m_crvopqlx(blockEntity, entity, 4.0F);
+      return canPlayerUse(blockEntity, entity, 4.0F);
    }
 
    /**
     * @mapping {@literal hashed m_crvopqlx Lnet/minecraft/unmapped/C_pjtstjoq;m_crvopqlx(Lnet/minecraft/unmapped/C_kvegafmh;Lnet/minecraft/unmapped/C_jzrpycqo;F)Z}
-    * @mapping {@literal named m_crvopqlx Lnet/minecraft/inventory/Inventory;m_crvopqlx(Lnet/minecraft/block/entity/BlockEntity;Lnet/minecraft/entity/player/PlayerEntity;F)Z}
+    * @mapping {@literal named canPlayerUse Lnet/minecraft/inventory/Inventory;canPlayerUse(Lnet/minecraft/block/entity/BlockEntity;Lnet/minecraft/entity/player/PlayerEntity;F)Z}
     */
-   static boolean m_crvopqlx(BlockEntity arg, PlayerEntity player, float f) {
-      World lv = arg.getWorld();
-      BlockPos lv2 = arg.getPos();
+   static boolean canPlayerUse(BlockEntity entity, PlayerEntity player, float additionalRange) {
+      World lv = entity.getWorld();
+      BlockPos lv2 = entity.getPos();
       if (lv == null) {
          return false;
       } else {
-         return lv.getBlockEntity(lv2) != arg ? false : player.m_tblbycwa(lv2, (double)f);
+         return lv.getBlockEntity(lv2) != entity ? false : player.m_tblbycwa(lv2, (double)additionalRange);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/inventory/JukeboxInventory.java namedSrc/net/minecraft/inventory/JukeboxInventory.java
--- namedTargetSrc/net/minecraft/inventory/JukeboxInventory.java	2024-02-01 16:28:49.649883100 +0000
+++ namedSrc/net/minecraft/inventory/JukeboxInventory.java	2024-02-01 16:27:36.421852914 +0000
@@ -10,29 +10,31 @@
  */
 public interface JukeboxInventory extends Inventory {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xwjsgxrp Lnet/minecraft/unmapped/C_rsrfiyeu;m_xwjsgxrp()Lnet/minecraft/unmapped/C_sddaxwyk;}
+    * @mapping {@literal named getStack Lnet/minecraft/inventory/JukeboxInventory;getStack()Lnet/minecraft/item/ItemStack;}
     */
-   ItemStack m_xwjsgxrp();
+   ItemStack getStack();
 
    /**
     * @mapping {@literal hashed m_htpnuxlo Lnet/minecraft/unmapped/C_rsrfiyeu;m_htpnuxlo(I)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named m_htpnuxlo Lnet/minecraft/inventory/JukeboxInventory;m_htpnuxlo(I)Lnet/minecraft/item/ItemStack;}
+    * @mapping {@literal named decreaseStack Lnet/minecraft/inventory/JukeboxInventory;decreaseStack(I)Lnet/minecraft/item/ItemStack;}
     */
-   default ItemStack m_htpnuxlo(int a) {
-      return this.m_xwjsgxrp().split(a);
+   default ItemStack decreaseStack(int count) {
+      return this.getStack().split(count);
    }
 
    /**
     * @mapping {@literal hashed m_bkmnewbu Lnet/minecraft/unmapped/C_rsrfiyeu;m_bkmnewbu(Lnet/minecraft/unmapped/C_sddaxwyk;)V}
-    * @mapping {@literal named m_bkmnewbu Lnet/minecraft/inventory/JukeboxInventory;m_bkmnewbu(Lnet/minecraft/item/ItemStack;)V}
+    * @mapping {@literal named setStack Lnet/minecraft/inventory/JukeboxInventory;setStack(Lnet/minecraft/item/ItemStack;)V}
     */
-   void m_bkmnewbu(ItemStack stack);
+   void setStack(ItemStack stack);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_brueltfr Lnet/minecraft/unmapped/C_rsrfiyeu;m_brueltfr()Lnet/minecraft/unmapped/C_sddaxwyk;}
+    * @mapping {@literal named emptyStack Lnet/minecraft/inventory/JukeboxInventory;emptyStack()Lnet/minecraft/item/ItemStack;}
     */
-   default ItemStack m_brueltfr() {
-      return this.m_htpnuxlo(this.getMaxCountPerStack());
+   default ItemStack emptyStack() {
+      return this.decreaseStack(this.getMaxCountPerStack());
    }
 
    /**
@@ -48,7 +50,7 @@
     */
    @Override
    default boolean isEmpty() {
-      return this.m_xwjsgxrp().isEmpty();
+      return this.getStack().isEmpty();
    }
 
    /**
@@ -56,7 +58,7 @@
     */
    @Override
    default void clear() {
-      this.m_brueltfr();
+      this.emptyStack();
    }
 
    /**
@@ -72,7 +74,7 @@
     */
    @Override
    default ItemStack getStack(int slot) {
-      return slot == 0 ? this.m_xwjsgxrp() : ItemStack.EMPTY;
+      return slot == 0 ? this.getStack() : ItemStack.EMPTY;
    }
 
    /**
@@ -80,7 +82,7 @@
     */
    @Override
    default ItemStack removeStack(int slot, int amount) {
-      return slot != 0 ? ItemStack.EMPTY : this.m_htpnuxlo(amount);
+      return slot != 0 ? ItemStack.EMPTY : this.decreaseStack(amount);
    }
 
    /**
@@ -89,7 +91,7 @@
    @Override
    default void setStack(int slot, ItemStack stack) {
       if (slot == 0) {
-         this.m_bkmnewbu(stack);
+         this.setStack(stack);
       }
    }
 
@@ -99,16 +101,17 @@
     */
    public interface C_ecqzlsuf extends JukeboxInventory {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_ejhbwvaa Lnet/minecraft/unmapped/C_rsrfiyeu$C_ecqzlsuf;m_ejhbwvaa()Lnet/minecraft/unmapped/C_kvegafmh;}
+       * @mapping {@literal named getBlockEntity Lnet/minecraft/inventory/JukeboxInventory$C_ecqzlsuf;getBlockEntity()Lnet/minecraft/block/entity/BlockEntity;}
        */
-      BlockEntity m_ejhbwvaa();
+      BlockEntity getBlockEntity();
 
       /**
        * Mapping not found
        */
       @Override
       default boolean canPlayerUse(PlayerEntity player) {
-         return Inventory.canPlayerUse(this.m_ejhbwvaa(), player);
+         return Inventory.canPlayerUse(this.getBlockEntity(), player);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/inventory/LootableInventory.java namedSrc/net/minecraft/inventory/LootableInventory.java
--- namedTargetSrc/net/minecraft/inventory/LootableInventory.java	2024-02-01 16:28:49.633883093 +0000
+++ namedSrc/net/minecraft/inventory/LootableInventory.java	2024-02-01 16:27:36.405852906 +0000
@@ -45,15 +45,15 @@
     * @mapping {@literal hashed m_canflxyp Lnet/minecraft/unmapped/C_ehawoasn;m_canflxyp(Lnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named setLootTableId Lnet/minecraft/inventory/LootableInventory;setLootTableId(Lnet/minecraft/util/Identifier;)V}
     */
-   void setLootTableId(@Nullable Identifier arg);
+   void setLootTableId(@Nullable Identifier id);
 
    /**
     * @mapping {@literal hashed m_ssvygaxw Lnet/minecraft/unmapped/C_ehawoasn;m_ssvygaxw(Lnet/minecraft/unmapped/C_ncpywfca;J)V}
     * @mapping {@literal named setupLootTable Lnet/minecraft/inventory/LootableInventory;setupLootTable(Lnet/minecraft/util/Identifier;J)V}
     */
-   default void setupLootTable(Identifier arg, long l) {
-      this.setLootTableId(arg);
-      this.setLootTableSeed(l);
+   default void setupLootTable(Identifier id, long seed) {
+      this.setLootTableId(id);
+      this.setLootTableSeed(seed);
    }
 
    /**
@@ -66,7 +66,7 @@
     * @mapping {@literal hashed m_ubdtdnuf Lnet/minecraft/unmapped/C_ehawoasn;m_ubdtdnuf(J)V}
     * @mapping {@literal named setLootTableSeed Lnet/minecraft/inventory/LootableInventory;setLootTableSeed(J)V}
     */
-   void setLootTableSeed(long l);
+   void setLootTableSeed(long seed);
 
    /**
     * @mapping {@literal hashed m_qihknhoq Lnet/minecraft/unmapped/C_ehawoasn;m_qihknhoq()Lnet/minecraft/unmapped/C_hynzadkk;}
@@ -85,9 +85,9 @@
     * @mapping {@literal hashed m_vhsehsrn Lnet/minecraft/unmapped/C_ehawoasn;m_vhsehsrn(Lnet/minecraft/unmapped/C_peaveboq;Lnet/minecraft/unmapped/C_rlomrsco;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_ncpywfca;)V}
     * @mapping {@literal named setupLootTable Lnet/minecraft/inventory/LootableInventory;setupLootTable(Lnet/minecraft/world/BlockView;Lnet/minecraft/util/random/RandomGenerator;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Identifier;)V}
     */
-   static void setupLootTable(BlockView world, RandomGenerator random, BlockPos pos, Identifier arg4) {
+   static void setupLootTable(BlockView world, RandomGenerator random, BlockPos pos, Identifier id) {
       if (world.getBlockEntity(pos) instanceof LootableInventory lv2) {
-         lv2.setupLootTable(arg4, random.nextLong());
+         lv2.setupLootTable(id, random.nextLong());
       }
    }
 
@@ -95,10 +95,10 @@
     * @mapping {@literal hashed m_njtcujiz Lnet/minecraft/unmapped/C_ehawoasn;m_njtcujiz(Lnet/minecraft/unmapped/C_hhlwcnih;)Z}
     * @mapping {@literal named readLootTableNbt Lnet/minecraft/inventory/LootableInventory;readLootTableNbt(Lnet/minecraft/nbt/NbtCompound;)Z}
     */
-   default boolean readLootTableNbt(NbtCompound arg) {
-      if (arg.contains("LootTable", NbtElement.STRING_TYPE)) {
-         this.setLootTableId(new Identifier(arg.getString("LootTable")));
-         this.setLootTableSeed(arg.getLong("LootTableSeed"));
+   default boolean readLootTableNbt(NbtCompound nbt) {
+      if (nbt.contains("LootTable", NbtElement.STRING_TYPE)) {
+         this.setLootTableId(new Identifier(nbt.getString("LootTable")));
+         this.setLootTableSeed(nbt.getLong("LootTableSeed"));
          return true;
       } else {
          return false;
@@ -109,15 +109,15 @@
     * @mapping {@literal hashed m_ycwokqel Lnet/minecraft/unmapped/C_ehawoasn;m_ycwokqel(Lnet/minecraft/unmapped/C_hhlwcnih;)Z}
     * @mapping {@literal named writeLootTableNbt Lnet/minecraft/inventory/LootableInventory;writeLootTableNbt(Lnet/minecraft/nbt/NbtCompound;)Z}
     */
-   default boolean writeLootTableNbt(NbtCompound arg) {
+   default boolean writeLootTableNbt(NbtCompound nbt) {
       Identifier lv = this.getLootTableId();
       if (lv == null) {
          return false;
       } else {
-         arg.putString("LootTable", lv.toString());
+         nbt.putString("LootTable", lv.toString());
          long l = this.getLootTableSeed();
          if (l != 0L) {
-            arg.putLong("LootTableSeed", l);
+            nbt.putLong("LootTableSeed", l);
          }
 
          return true;
diff -bur namedTargetSrc/net/minecraft/inventory/SimpleInventory.java namedSrc/net/minecraft/inventory/SimpleInventory.java
--- namedTargetSrc/net/minecraft/inventory/SimpleInventory.java	2024-02-01 16:28:49.489883036 +0000
+++ namedSrc/net/minecraft/inventory/SimpleInventory.java	2024-02-01 16:27:36.241852832 +0000
@@ -346,9 +346,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_kcvdipnh Lnet/minecraft/unmapped/C_rsloiwzx;m_kcvdipnh()Lnet/minecraft/unmapped/C_rnrfftze;}
+    * @mapping {@literal named stacks Lnet/minecraft/inventory/SimpleInventory;stacks()Lnet/minecraft/util/collection/DefaultedList;}
     */
-   public DefaultedList<ItemStack> m_kcvdipnh() {
+   public DefaultedList<ItemStack> stacks() {
       return this.stacks;
    }
 }
diff -bur namedTargetSrc/net/minecraft/item/AnimalArmorItem.java namedSrc/net/minecraft/item/AnimalArmorItem.java
--- namedTargetSrc/net/minecraft/item/AnimalArmorItem.java	2024-02-01 16:28:49.517883048 +0000
+++ namedSrc/net/minecraft/item/AnimalArmorItem.java	2024-02-01 16:27:36.281852850 +0000
@@ -17,18 +17,19 @@
     */
    private final Identifier texture;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_iimkkhka Lnet/minecraft/unmapped/C_bbljnksk;f_iimkkhka:Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;}
+    * @mapping {@literal named type Lnet/minecraft/item/AnimalArmorItem;type:Lnet/minecraft/item/AnimalArmorItem$Type;}
     */
-   private final AnimalArmorItem.C_rtwzapnt f_iimkkhka;
+   private final AnimalArmorItem.Type type;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bbljnksk;<init>(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/item/AnimalArmorItem;<init>(Lnet/minecraft/registry/Holder;Lnet/minecraft/item/AnimalArmorItem$C_rtwzapnt;Lnet/minecraft/item/Item$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/item/AnimalArmorItem;<init>(Lnet/minecraft/registry/Holder;Lnet/minecraft/item/AnimalArmorItem$Type;Lnet/minecraft/item/Item$Settings;)V}
     */
-   public AnimalArmorItem(Holder<ArmorMaterial> type, AnimalArmorItem.C_rtwzapnt arg2, Item.Settings settings) {
-      super(type, ArmorItem.ArmorSlot.BODY, settings);
-      this.f_iimkkhka = arg2;
-      this.texture = (Identifier)arg2.f_melzgwgg.apply(((RegistryKey)type.getKey().orElseThrow()).getValue());
+   public AnimalArmorItem(Holder<ArmorMaterial> material, AnimalArmorItem.Type type, Item.Settings settings) {
+      super(material, ArmorItem.ArmorSlot.BODY, settings);
+      this.type = type;
+      this.texture = (Identifier)type.textureLocator.apply(((RegistryKey)material.getKey().orElseThrow()).getValue());
    }
 
    /**
@@ -40,38 +41,41 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_jrgzvqyh Lnet/minecraft/unmapped/C_bbljnksk;m_jrgzvqyh()Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;}
+    * @mapping {@literal named type Lnet/minecraft/item/AnimalArmorItem;type()Lnet/minecraft/item/AnimalArmorItem$Type;}
     */
-   public AnimalArmorItem.C_rtwzapnt m_jrgzvqyh() {
-      return this.f_iimkkhka;
+   public AnimalArmorItem.Type type() {
+      return this.type;
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_bbljnksk$C_rtwzapnt}
-    * @mapping {@literal named net/minecraft/item/AnimalArmorItem$C_rtwzapnt}
+    * @mapping {@literal named net/minecraft/item/AnimalArmorItem$Type}
     */
-   public static enum C_rtwzapnt {
+   public static enum Type {
       /**
        * @mapping {@literal hashed f_pggndxuc Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;f_pggndxuc:Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;}
-       * @mapping {@literal named EQUESTRIAN Lnet/minecraft/item/AnimalArmorItem$C_rtwzapnt;EQUESTRIAN:Lnet/minecraft/item/AnimalArmorItem$C_rtwzapnt;}
+       * @mapping {@literal named EQUESTRIAN Lnet/minecraft/item/AnimalArmorItem$Type;EQUESTRIAN:Lnet/minecraft/item/AnimalArmorItem$Type;}
        */
-      EQUESTRIAN(arg -> arg.withPath((UnaryOperator<String>)(string -> "textures/entity/horse/armor/horse_armor_" + string + ".png"))),
+      EQUESTRIAN(material -> material.withPath((UnaryOperator<String>)(materialType -> "textures/entity/horse/armor/horse_armor_" + materialType + ".png"))),
       /**
        * @mapping {@literal hashed f_ddkutnmw Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;f_ddkutnmw:Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;}
-       * @mapping {@literal named CANINE Lnet/minecraft/item/AnimalArmorItem$C_rtwzapnt;CANINE:Lnet/minecraft/item/AnimalArmorItem$C_rtwzapnt;}
+       * @mapping {@literal named CANINE Lnet/minecraft/item/AnimalArmorItem$Type;CANINE:Lnet/minecraft/item/AnimalArmorItem$Type;}
        */
-      CANINE(arg -> arg.withPath("textures/entity/wolf/wolf_armor.png"));
+      CANINE(material -> material.withPath("textures/entity/wolf/wolf_armor.png"));
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_melzgwgg Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;f_melzgwgg:Ljava/util/function/Function;}
+       * @mapping {@literal named textureLocator Lnet/minecraft/item/AnimalArmorItem$Type;textureLocator:Ljava/util/function/Function;}
        */
-      final Function<Identifier, Identifier> f_melzgwgg;
+      final Function<Identifier, Identifier> textureLocator;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_bbljnksk$C_rtwzapnt;<init>(Ljava/lang/String;ILjava/util/function/Function;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/item/AnimalArmorItem$Type;<init>(Ljava/lang/String;ILjava/util/function/Function;)V}
        */
-      private C_rtwzapnt(Function<Identifier, Identifier> function) {
-         this.f_melzgwgg = function;
+      private Type(Function<Identifier, Identifier> textureLocator) {
+         this.textureLocator = textureLocator;
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/item/ArmorItem.java namedSrc/net/minecraft/item/ArmorItem.java
--- namedTargetSrc/net/minecraft/item/ArmorItem.java	2024-02-01 16:28:49.541883057 +0000
+++ namedSrc/net/minecraft/item/ArmorItem.java	2024-02-01 16:27:36.321852869 +0000
@@ -67,9 +67,9 @@
    protected final ArmorItem.ArmorSlot armorSlot;
    /**
     * @mapping {@literal hashed f_gmumlgwi Lnet/minecraft/unmapped/C_fxxorins;f_gmumlgwi:Lnet/minecraft/unmapped/C_cjzoxshv;}
-    * @mapping {@literal named type Lnet/minecraft/item/ArmorItem;type:Lnet/minecraft/registry/Holder;}
+    * @mapping {@literal named material Lnet/minecraft/item/ArmorItem;material:Lnet/minecraft/registry/Holder;}
     */
-   protected final Holder<ArmorMaterial> type;
+   protected final Holder<ArmorMaterial> material;
    /**
     * @mapping {@literal hashed f_jztfkhpa Lnet/minecraft/unmapped/C_fxxorins;f_jztfkhpa:Ljava/util/function/Supplier;}
     * @mapping {@literal named attributeModifiers Lnet/minecraft/item/ArmorItem;attributeModifiers:Ljava/util/function/Supplier;}
@@ -104,15 +104,15 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fxxorins;<init>(Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_fxxorins$C_rhnguwzk;Lnet/minecraft/unmapped/C_vorddnax$C_bfrytpdl;)V}
     * @mapping {@literal named <init> Lnet/minecraft/item/ArmorItem;<init>(Lnet/minecraft/registry/Holder;Lnet/minecraft/item/ArmorItem$ArmorSlot;Lnet/minecraft/item/Item$Settings;)V}
     */
-   public ArmorItem(Holder<ArmorMaterial> type, ArmorItem.ArmorSlot armorSlot, Item.Settings settings) {
+   public ArmorItem(Holder<ArmorMaterial> material, ArmorItem.ArmorSlot armorSlot, Item.Settings settings) {
       super(settings);
-      this.type = type;
+      this.material = material;
       this.armorSlot = armorSlot;
       DispenserBlock.registerBehavior(this, DISPENSER_BEHAVIOR);
       this.attributeModifiers = Suppliers.memoize(
          () -> {
-            int i = type.value().m_pbezkfps(armorSlot);
-            float f = type.value().toughness();
+            int i = material.value().getDefense(armorSlot);
+            float f = material.value().toughness();
             Builder<Holder<EntityAttribute>, EntityAttributeModifier> builder = ImmutableMultimap.builder();
             UUID uUID = (UUID)SLOT_UUID_MODIFIERS.get(armorSlot);
             builder.put(
@@ -122,7 +122,7 @@
                EntityAttributes.GENERIC_ARMOR_TOUGHNESS,
                new EntityAttributeModifier(uUID, "Armor toughness", (double)f, EntityAttributeModifier.Operation.ADDITION)
             );
-            float g = type.value().knockbackResistance();
+            float g = material.value().knockbackResistance();
             if (g > 0.0F) {
                builder.put(
                   EntityAttributes.GENERIC_KNOCKBACK_RESISTANCE,
@@ -148,7 +148,7 @@
     */
    @Override
    public int getEnchantability() {
-      return this.type.value().enchantmentValue();
+      return this.material.value().enchantmentValue();
    }
 
    /**
@@ -156,7 +156,7 @@
     * @mapping {@literal named getMaterial Lnet/minecraft/item/ArmorItem;getMaterial()Lnet/minecraft/registry/Holder;}
     */
    public Holder<ArmorMaterial> getMaterial() {
-      return this.type;
+      return this.material;
    }
 
    /**
@@ -164,7 +164,7 @@
     */
    @Override
    public boolean canRepair(ItemStack stack, ItemStack ingredient) {
-      return ((Ingredient)this.type.value().repairIngredient().get()).test(ingredient) || super.canRepair(stack, ingredient);
+      return ((Ingredient)this.material.value().repairIngredient().get()).test(ingredient) || super.canRepair(stack, ingredient);
    }
 
    /**
@@ -188,7 +188,7 @@
     * @mapping {@literal named getProtection Lnet/minecraft/item/ArmorItem;getProtection()I}
     */
    public int getProtection() {
-      return this.type.value().m_pbezkfps(this.armorSlot);
+      return this.material.value().getDefense(this.armorSlot);
    }
 
    /**
@@ -196,7 +196,7 @@
     * @mapping {@literal named getToughness Lnet/minecraft/item/ArmorItem;getToughness()F}
     */
    public float getToughness() {
-      return this.type.value().toughness();
+      return this.material.value().toughness();
    }
 
    /**
@@ -272,16 +272,17 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_jmsphvxs Lnet/minecraft/unmapped/C_fxxorins$C_rhnguwzk;m_jmsphvxs(I)I}
+       * @mapping {@literal named getBaseDurability Lnet/minecraft/item/ArmorItem$ArmorSlot;getBaseDurability(I)I}
        */
-      public int m_jmsphvxs(int i) {
+      public int getBaseDurability(int multiplier) {
          return switch (this) {
             case HELMET -> 11;
             case CHESTPLATE -> 16;
             case LEGGINGS -> 15;
             case BOOTS -> 13;
             case BODY -> 20;
-         } * i;
+         } * multiplier;
       }
 
       /**
@@ -301,9 +302,10 @@
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_nsmbimhv Lnet/minecraft/unmapped/C_fxxorins$C_rhnguwzk;m_nsmbimhv()Z}
+       * @mapping {@literal named supportsTrim Lnet/minecraft/item/ArmorItem$ArmorSlot;supportsTrim()Z}
        */
-      public boolean m_nsmbimhv() {
+      public boolean supportsTrim() {
          return this == HELMET || this == CHESTPLATE || this == LEGGINGS || this == BOOTS;
       }
 
diff -bur namedTargetSrc/net/minecraft/item/ArmorMaterial.java namedSrc/net/minecraft/item/ArmorMaterial.java
--- namedTargetSrc/net/minecraft/item/ArmorMaterial.java	2024-02-01 16:28:49.333882974 +0000
+++ namedSrc/net/minecraft/item/ArmorMaterial.java	2024-02-01 16:27:36.073852756 +0000
@@ -20,7 +20,7 @@
    int enchantmentValue,
    Holder<SoundEvent> equipSound,
    Supplier<Ingredient> repairIngredient,
-   List<ArmorMaterial.C_zppthdag> layers,
+   List<ArmorMaterial.Layer> layers,
    float toughness,
    float knockbackResistance
 ) {
@@ -32,78 +32,88 @@
 
    /**
     * @mapping {@literal hashed m_pbezkfps Lnet/minecraft/unmapped/C_fwzogbap;m_pbezkfps(Lnet/minecraft/unmapped/C_fxxorins$C_rhnguwzk;)I}
-    * @mapping {@literal named m_pbezkfps Lnet/minecraft/item/ArmorMaterial;m_pbezkfps(Lnet/minecraft/item/ArmorItem$ArmorSlot;)I}
+    * @mapping {@literal named getDefense Lnet/minecraft/item/ArmorMaterial;getDefense(Lnet/minecraft/item/ArmorItem$ArmorSlot;)I}
     */
-   public int m_pbezkfps(ArmorItem.ArmorSlot key) {
-      return (Integer)this.defense.getOrDefault(key, 0);
+   public int getDefense(ArmorItem.ArmorSlot slot) {
+      return (Integer)this.defense.getOrDefault(slot, 0);
    }
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_fwzogbap$C_zppthdag}
-    * @mapping {@literal named net/minecraft/item/ArmorMaterial$C_zppthdag}
+    * @mapping {@literal named net/minecraft/item/ArmorMaterial$Layer}
     */
-   public static final class C_zppthdag {
+   public static final class Layer {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_nvqoxxma Lnet/minecraft/unmapped/C_fwzogbap$C_zppthdag;f_nvqoxxma:Lnet/minecraft/unmapped/C_ncpywfca;}
+       * @mapping {@literal named assetName Lnet/minecraft/item/ArmorMaterial$Layer;assetName:Lnet/minecraft/util/Identifier;}
        */
-      private final Identifier f_nvqoxxma;
+      private final Identifier assetName;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ljskcqxs Lnet/minecraft/unmapped/C_fwzogbap$C_zppthdag;f_ljskcqxs:Ljava/lang/String;}
+       * @mapping {@literal named suffix Lnet/minecraft/item/ArmorMaterial$Layer;suffix:Ljava/lang/String;}
        */
-      private final String f_ljskcqxs;
+      private final String suffix;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_maplsngd Lnet/minecraft/unmapped/C_fwzogbap$C_zppthdag;f_maplsngd:Z}
+       * @mapping {@literal named dyeable Lnet/minecraft/item/ArmorMaterial$Layer;dyeable:Z}
        */
-      private final boolean f_maplsngd;
+      private final boolean dyeable;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_idoyjzoh Lnet/minecraft/unmapped/C_fwzogbap$C_zppthdag;f_idoyjzoh:Lnet/minecraft/unmapped/C_ncpywfca;}
+       * @mapping {@literal named innerTexture Lnet/minecraft/item/ArmorMaterial$Layer;innerTexture:Lnet/minecraft/util/Identifier;}
        */
-      private final Identifier f_idoyjzoh;
+      private final Identifier innerTexture;
       /**
-       * Mapping not found
+       * @mapping {@literal hashed f_ohziprrt Lnet/minecraft/unmapped/C_fwzogbap$C_zppthdag;f_ohziprrt:Lnet/minecraft/unmapped/C_ncpywfca;}
+       * @mapping {@literal named outerTexture Lnet/minecraft/item/ArmorMaterial$Layer;outerTexture:Lnet/minecraft/util/Identifier;}
        */
-      private final Identifier f_ohziprrt;
+      private final Identifier outerTexture;
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fwzogbap$C_zppthdag;<init>(Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/String;Z)V}
+       * @mapping {@literal named <init> Lnet/minecraft/item/ArmorMaterial$Layer;<init>(Lnet/minecraft/util/Identifier;Ljava/lang/String;Z)V}
        */
-      public C_zppthdag(Identifier arg, String string, boolean bl) {
-         this.f_nvqoxxma = arg;
-         this.f_ljskcqxs = string;
-         this.f_maplsngd = bl;
-         this.f_idoyjzoh = this.m_gabvscqb(true);
-         this.f_ohziprrt = this.m_gabvscqb(false);
+      public Layer(Identifier assetName, String suffix, boolean dyeable) {
+         this.assetName = assetName;
+         this.suffix = suffix;
+         this.dyeable = dyeable;
+         this.innerTexture = this.resolveTexture(true);
+         this.outerTexture = this.resolveTexture(false);
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_fwzogbap$C_zppthdag;<init>(Lnet/minecraft/unmapped/C_ncpywfca;)V}
+       * @mapping {@literal named <init> Lnet/minecraft/item/ArmorMaterial$Layer;<init>(Lnet/minecraft/util/Identifier;)V}
        */
-      public C_zppthdag(Identifier arg) {
-         this(arg, "", false);
+      public Layer(Identifier assetName) {
+         this(assetName, "", false);
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_gabvscqb Lnet/minecraft/unmapped/C_fwzogbap$C_zppthdag;m_gabvscqb(Z)Lnet/minecraft/unmapped/C_ncpywfca;}
+       * @mapping {@literal named resolveTexture Lnet/minecraft/item/ArmorMaterial$Layer;resolveTexture(Z)Lnet/minecraft/util/Identifier;}
        */
-      private Identifier m_gabvscqb(boolean bl) {
-         return this.f_nvqoxxma
+      private Identifier resolveTexture(boolean outerTexture) {
+         return this.assetName
             .withPath(
-               (UnaryOperator<String>)(string -> "textures/models/armor/" + this.f_nvqoxxma.getPath() + "_layer_" + (bl ? 2 : 1) + this.f_ljskcqxs + ".png")
+               (UnaryOperator<String>)(asset -> "textures/models/armor/" + this.assetName.getPath() + "_layer_" + (outerTexture ? 2 : 1) + this.suffix + ".png")
             );
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_anlpxkiu Lnet/minecraft/unmapped/C_fwzogbap$C_zppthdag;m_anlpxkiu(Z)Lnet/minecraft/unmapped/C_ncpywfca;}
+       * @mapping {@literal named texture Lnet/minecraft/item/ArmorMaterial$Layer;texture(Z)Lnet/minecraft/util/Identifier;}
        */
-      public Identifier m_anlpxkiu(boolean bl) {
-         return bl ? this.f_idoyjzoh : this.f_ohziprrt;
+      public Identifier texture(boolean innerTexture) {
+         return innerTexture ? this.innerTexture : this.outerTexture;
       }
 
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_scfgoteb Lnet/minecraft/unmapped/C_fwzogbap$C_zppthdag;m_scfgoteb()Z}
+       * @mapping {@literal named isDyeable Lnet/minecraft/item/ArmorMaterial$Layer;isDyeable()Z}
        */
-      public boolean m_scfgoteb() {
-         return this.f_maplsngd;
+      public boolean isDyeable() {
+         return this.dyeable;
       }
    }
 }

@github-actions
Copy link
Contributor

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/item/ArmorMaterials.java namedSrc/net/minecraft/item/ArmorMaterials.java
--- namedTargetSrc/net/minecraft/item/ArmorMaterials.java	2024-02-01 16:28:49.581883073 +0000
+++ namedSrc/net/minecraft/item/ArmorMaterials.java	2024-02-01 16:27:36.365852888 +0000
@@ -21,7 +21,7 @@
     * @mapping {@literal hashed f_qnmspwes Lnet/minecraft/unmapped/C_asebjgum;f_qnmspwes:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named LEATHER Lnet/minecraft/item/ArmorMaterials;LEATHER:Lnet/minecraft/registry/Holder;}
     */
-   public static final Holder<ArmorMaterial> LEATHER = m_tfqnkndt(
+   public static final Holder<ArmorMaterial> LEATHER = register(
       "leather",
       Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
          map.put(ArmorItem.ArmorSlot.BOOTS, 1);
@@ -35,13 +35,13 @@
       0.0F,
       0.0F,
       () -> Ingredient.ofItems(Items.LEATHER),
-      List.of(new ArmorMaterial.C_zppthdag(new Identifier("leather"), "", true), new ArmorMaterial.C_zppthdag(new Identifier("leather"), "_overlay", false))
+      List.of(new ArmorMaterial.Layer(new Identifier("leather"), "", true), new ArmorMaterial.Layer(new Identifier("leather"), "_overlay", false))
    );
    /**
     * @mapping {@literal hashed f_llfjdxry Lnet/minecraft/unmapped/C_asebjgum;f_llfjdxry:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named CHAIN Lnet/minecraft/item/ArmorMaterials;CHAIN:Lnet/minecraft/registry/Holder;}
     */
-   public static final Holder<ArmorMaterial> CHAIN = m_wkcelnza("chain", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
+   public static final Holder<ArmorMaterial> CHAIN = register("chain", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
       map.put(ArmorItem.ArmorSlot.BOOTS, 1);
       map.put(ArmorItem.ArmorSlot.LEGGINGS, 4);
       map.put(ArmorItem.ArmorSlot.CHESTPLATE, 5);
@@ -52,7 +52,7 @@
     * @mapping {@literal hashed f_bptallii Lnet/minecraft/unmapped/C_asebjgum;f_bptallii:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named IRON Lnet/minecraft/item/ArmorMaterials;IRON:Lnet/minecraft/registry/Holder;}
     */
-   public static final Holder<ArmorMaterial> IRON = m_wkcelnza("iron", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
+   public static final Holder<ArmorMaterial> IRON = register("iron", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
       map.put(ArmorItem.ArmorSlot.BOOTS, 2);
       map.put(ArmorItem.ArmorSlot.LEGGINGS, 5);
       map.put(ArmorItem.ArmorSlot.CHESTPLATE, 6);
@@ -63,7 +63,7 @@
     * @mapping {@literal hashed f_orrxpewa Lnet/minecraft/unmapped/C_asebjgum;f_orrxpewa:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named GOLD Lnet/minecraft/item/ArmorMaterials;GOLD:Lnet/minecraft/registry/Holder;}
     */
-   public static final Holder<ArmorMaterial> GOLD = m_wkcelnza("gold", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
+   public static final Holder<ArmorMaterial> GOLD = register("gold", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
       map.put(ArmorItem.ArmorSlot.BOOTS, 1);
       map.put(ArmorItem.ArmorSlot.LEGGINGS, 3);
       map.put(ArmorItem.ArmorSlot.CHESTPLATE, 5);
@@ -74,7 +74,7 @@
     * @mapping {@literal hashed f_xzjsgnqf Lnet/minecraft/unmapped/C_asebjgum;f_xzjsgnqf:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named DIAMOND Lnet/minecraft/item/ArmorMaterials;DIAMOND:Lnet/minecraft/registry/Holder;}
     */
-   public static final Holder<ArmorMaterial> DIAMOND = m_wkcelnza("diamond", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
+   public static final Holder<ArmorMaterial> DIAMOND = register("diamond", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
       map.put(ArmorItem.ArmorSlot.BOOTS, 3);
       map.put(ArmorItem.ArmorSlot.LEGGINGS, 6);
       map.put(ArmorItem.ArmorSlot.CHESTPLATE, 8);
@@ -85,7 +85,7 @@
     * @mapping {@literal hashed f_cthdamgm Lnet/minecraft/unmapped/C_asebjgum;f_cthdamgm:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named TURTLE Lnet/minecraft/item/ArmorMaterials;TURTLE:Lnet/minecraft/registry/Holder;}
     */
-   public static final Holder<ArmorMaterial> TURTLE = m_wkcelnza("turtle", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
+   public static final Holder<ArmorMaterial> TURTLE = register("turtle", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
       map.put(ArmorItem.ArmorSlot.BOOTS, 2);
       map.put(ArmorItem.ArmorSlot.LEGGINGS, 5);
       map.put(ArmorItem.ArmorSlot.CHESTPLATE, 6);
@@ -96,7 +96,7 @@
     * @mapping {@literal hashed f_lhflbnxk Lnet/minecraft/unmapped/C_asebjgum;f_lhflbnxk:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named NETHERITE Lnet/minecraft/item/ArmorMaterials;NETHERITE:Lnet/minecraft/registry/Holder;}
     */
-   public static final Holder<ArmorMaterial> NETHERITE = m_wkcelnza("netherite", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
+   public static final Holder<ArmorMaterial> NETHERITE = register("netherite", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
       map.put(ArmorItem.ArmorSlot.BOOTS, 3);
       map.put(ArmorItem.ArmorSlot.LEGGINGS, 6);
       map.put(ArmorItem.ArmorSlot.CHESTPLATE, 8);
@@ -107,7 +107,7 @@
     * @mapping {@literal hashed f_rndpreey Lnet/minecraft/unmapped/C_asebjgum;f_rndpreey:Lnet/minecraft/unmapped/C_cjzoxshv;}
     * @mapping {@literal named ARMADILLO Lnet/minecraft/item/ArmorMaterials;ARMADILLO:Lnet/minecraft/registry/Holder;}
     */
-   public static final Holder<ArmorMaterial> ARMADILLO = m_wkcelnza("armadillo", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
+   public static final Holder<ArmorMaterial> ARMADILLO = register("armadillo", Util.make(new EnumMap(ArmorItem.ArmorSlot.class), map -> {
       map.put(ArmorItem.ArmorSlot.BOOTS, 3);
       map.put(ArmorItem.ArmorSlot.LEGGINGS, 6);
       map.put(ArmorItem.ArmorSlot.CHESTPLATE, 8);
@@ -117,41 +117,53 @@
 
    /**
     * @mapping {@literal hashed m_xrjlzjae Lnet/minecraft/unmapped/C_asebjgum;m_xrjlzjae(Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_cjzoxshv;}
-    * @mapping {@literal named m_xrjlzjae Lnet/minecraft/item/ArmorMaterials;m_xrjlzjae(Lnet/minecraft/registry/Registry;)Lnet/minecraft/registry/Holder;}
+    * @mapping {@literal named bootstrap Lnet/minecraft/item/ArmorMaterials;bootstrap(Lnet/minecraft/registry/Registry;)Lnet/minecraft/registry/Holder;}
     */
-   public static Holder<ArmorMaterial> m_xrjlzjae(Registry<ArmorMaterial> registry) {
+   public static Holder<ArmorMaterial> bootstrap(Registry<ArmorMaterial> registry) {
       return LEATHER;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_wkcelnza Lnet/minecraft/unmapped/C_asebjgum;m_wkcelnza(Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/unmapped/C_cjzoxshv;FFLjava/util/function/Supplier;)Lnet/minecraft/unmapped/C_cjzoxshv;}
+    * @mapping {@literal named register Lnet/minecraft/item/ArmorMaterials;register(Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/registry/Holder;FFLjava/util/function/Supplier;)Lnet/minecraft/registry/Holder;}
     */
-   private static Holder<ArmorMaterial> m_wkcelnza(
-      String string, EnumMap<ArmorItem.ArmorSlot, Integer> enumMap, int i, Holder<SoundEvent> arg, float f, float g, Supplier<Ingredient> supplier
+   private static Holder<ArmorMaterial> register(
+      String name,
+      EnumMap<ArmorItem.ArmorSlot, Integer> defense,
+      int enchantmentValue,
+      Holder<SoundEvent> equipSound,
+      float toughness,
+      float knockbackResistance,
+      Supplier<Ingredient> repairIngredient
    ) {
-      List<ArmorMaterial.C_zppthdag> list = List.of(new ArmorMaterial.C_zppthdag(new Identifier(string)));
-      return m_tfqnkndt(string, enumMap, i, arg, f, g, supplier, list);
+      List<ArmorMaterial.Layer> list = List.of(new ArmorMaterial.Layer(new Identifier(name)));
+      return register(name, defense, enchantmentValue, equipSound, toughness, knockbackResistance, repairIngredient, list);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_tfqnkndt Lnet/minecraft/unmapped/C_asebjgum;m_tfqnkndt(Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/unmapped/C_cjzoxshv;FFLjava/util/function/Supplier;Ljava/util/List;)Lnet/minecraft/unmapped/C_cjzoxshv;}
+    * @mapping {@literal named register Lnet/minecraft/item/ArmorMaterials;register(Ljava/lang/String;Ljava/util/EnumMap;ILnet/minecraft/registry/Holder;FFLjava/util/function/Supplier;Ljava/util/List;)Lnet/minecraft/registry/Holder;}
     */
-   private static Holder<ArmorMaterial> m_tfqnkndt(
-      String string,
-      EnumMap<ArmorItem.ArmorSlot, Integer> enumMap,
-      int i,
-      Holder<SoundEvent> arg,
-      float f,
-      float g,
-      Supplier<Ingredient> supplier,
-      List<ArmorMaterial.C_zppthdag> list
+   private static Holder<ArmorMaterial> register(
+      String name,
+      EnumMap<ArmorItem.ArmorSlot, Integer> defense,
+      int enchantmentValue,
+      Holder<SoundEvent> equipSound,
+      float toughness,
+      float knockbackResistance,
+      Supplier<Ingredient> repairIngredient,
+      List<ArmorMaterial.Layer> layers
    ) {
       EnumMap<ArmorItem.ArmorSlot, Integer> enumMap2 = new EnumMap(ArmorItem.ArmorSlot.class);
 
       for (ArmorItem.ArmorSlot lv : ArmorItem.ArmorSlot.values()) {
-         enumMap2.put(lv, (Integer)enumMap.get(lv));
+         enumMap2.put(lv, (Integer)defense.get(lv));
       }
 
-      return Registry.registerHolder(Registries.ARMOR_MATERIAL, new Identifier(string), new ArmorMaterial(enumMap2, i, arg, supplier, list, f, g));
+      return Registry.registerHolder(
+         Registries.ARMOR_MATERIAL,
+         new Identifier(name),
+         new ArmorMaterial(enumMap2, enchantmentValue, equipSound, repairIngredient, layers, toughness, knockbackResistance)
+      );
    }
 }
diff -bur namedTargetSrc/net/minecraft/item/Items.java namedSrc/net/minecraft/item/Items.java
--- namedTargetSrc/net/minecraft/item/Items.java	2024-02-01 16:28:49.389882996 +0000
+++ namedSrc/net/minecraft/item/Items.java	2024-02-01 16:27:36.129852781 +0000
@@ -4041,7 +4041,7 @@
     * @mapping {@literal named WOLF_ARMOR Lnet/minecraft/item/Items;WOLF_ARMOR:Lnet/minecraft/item/Item;}
     */
    public static final Item WOLF_ARMOR = register(
-      "wolf_armor", new AnimalArmorItem(ArmorMaterials.ARMADILLO, AnimalArmorItem.C_rtwzapnt.CANINE, new Item.Settings().maxCount(1))
+      "wolf_armor", new AnimalArmorItem(ArmorMaterials.ARMADILLO, AnimalArmorItem.Type.CANINE, new Item.Settings().maxCount(1))
    );
    /**
     * @mapping {@literal hashed f_cbkgawxm Lnet/minecraft/unmapped/C_zxoagntf;f_cbkgawxm:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4343,7 +4343,7 @@
     */
    public static final Item LEATHER_HELMET = register(
       "leather_helmet",
-      new ArmorItem(ArmorMaterials.LEATHER, ArmorItem.ArmorSlot.HELMET, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.m_jmsphvxs(5)))
+      new ArmorItem(ArmorMaterials.LEATHER, ArmorItem.ArmorSlot.HELMET, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.getBaseDurability(5)))
    );
    /**
     * @mapping {@literal hashed f_utkibeqz Lnet/minecraft/unmapped/C_zxoagntf;f_utkibeqz:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4351,7 +4351,9 @@
     */
    public static final Item LEATHER_CHESTPLATE = register(
       "leather_chestplate",
-      new ArmorItem(ArmorMaterials.LEATHER, ArmorItem.ArmorSlot.CHESTPLATE, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.m_jmsphvxs(5)))
+      new ArmorItem(
+         ArmorMaterials.LEATHER, ArmorItem.ArmorSlot.CHESTPLATE, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.getBaseDurability(5))
+      )
    );
    /**
     * @mapping {@literal hashed f_bhigmvmz Lnet/minecraft/unmapped/C_zxoagntf;f_bhigmvmz:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4359,7 +4361,9 @@
     */
    public static final Item LEATHER_LEGGINGS = register(
       "leather_leggings",
-      new ArmorItem(ArmorMaterials.LEATHER, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.m_jmsphvxs(5)))
+      new ArmorItem(
+         ArmorMaterials.LEATHER, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.getBaseDurability(5))
+      )
    );
    /**
     * @mapping {@literal hashed f_fpatkttl Lnet/minecraft/unmapped/C_zxoagntf;f_fpatkttl:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4367,7 +4371,7 @@
     */
    public static final Item LEATHER_BOOTS = register(
       "leather_boots",
-      new ArmorItem(ArmorMaterials.LEATHER, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.m_jmsphvxs(5)))
+      new ArmorItem(ArmorMaterials.LEATHER, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.getBaseDurability(5)))
    );
    /**
     * @mapping {@literal hashed f_lhknovze Lnet/minecraft/unmapped/C_zxoagntf;f_lhknovze:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4375,7 +4379,7 @@
     */
    public static final Item CHAINMAIL_HELMET = register(
       "chainmail_helmet",
-      new ArmorItem(ArmorMaterials.CHAIN, ArmorItem.ArmorSlot.HELMET, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.m_jmsphvxs(15)))
+      new ArmorItem(ArmorMaterials.CHAIN, ArmorItem.ArmorSlot.HELMET, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.getBaseDurability(15)))
    );
    /**
     * @mapping {@literal hashed f_lxtyvvqv Lnet/minecraft/unmapped/C_zxoagntf;f_lxtyvvqv:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4383,7 +4387,9 @@
     */
    public static final Item CHAINMAIL_CHESTPLATE = register(
       "chainmail_chestplate",
-      new ArmorItem(ArmorMaterials.CHAIN, ArmorItem.ArmorSlot.CHESTPLATE, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.m_jmsphvxs(15)))
+      new ArmorItem(
+         ArmorMaterials.CHAIN, ArmorItem.ArmorSlot.CHESTPLATE, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.getBaseDurability(15))
+      )
    );
    /**
     * @mapping {@literal hashed f_ldniibgr Lnet/minecraft/unmapped/C_zxoagntf;f_ldniibgr:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4391,7 +4397,9 @@
     */
    public static final Item CHAINMAIL_LEGGINGS = register(
       "chainmail_leggings",
-      new ArmorItem(ArmorMaterials.CHAIN, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.m_jmsphvxs(15)))
+      new ArmorItem(
+         ArmorMaterials.CHAIN, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.getBaseDurability(15))
+      )
    );
    /**
     * @mapping {@literal hashed f_vwzqxusf Lnet/minecraft/unmapped/C_zxoagntf;f_vwzqxusf:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4399,7 +4407,7 @@
     */
    public static final Item CHAINMAIL_BOOTS = register(
       "chainmail_boots",
-      new ArmorItem(ArmorMaterials.CHAIN, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.m_jmsphvxs(15)))
+      new ArmorItem(ArmorMaterials.CHAIN, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.getBaseDurability(15)))
    );
    /**
     * @mapping {@literal hashed f_jxysuuqz Lnet/minecraft/unmapped/C_zxoagntf;f_jxysuuqz:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4407,7 +4415,7 @@
     */
    public static final Item IRON_HELMET = register(
       "iron_helmet",
-      new ArmorItem(ArmorMaterials.IRON, ArmorItem.ArmorSlot.HELMET, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.m_jmsphvxs(15)))
+      new ArmorItem(ArmorMaterials.IRON, ArmorItem.ArmorSlot.HELMET, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.getBaseDurability(15)))
    );
    /**
     * @mapping {@literal hashed f_mvjszxte Lnet/minecraft/unmapped/C_zxoagntf;f_mvjszxte:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4415,7 +4423,9 @@
     */
    public static final Item IRON_CHESTPLATE = register(
       "iron_chestplate",
-      new ArmorItem(ArmorMaterials.IRON, ArmorItem.ArmorSlot.CHESTPLATE, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.m_jmsphvxs(15)))
+      new ArmorItem(
+         ArmorMaterials.IRON, ArmorItem.ArmorSlot.CHESTPLATE, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.getBaseDurability(15))
+      )
    );
    /**
     * @mapping {@literal hashed f_ibkppngd Lnet/minecraft/unmapped/C_zxoagntf;f_ibkppngd:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4423,7 +4433,9 @@
     */
    public static final Item IRON_LEGGINGS = register(
       "iron_leggings",
-      new ArmorItem(ArmorMaterials.IRON, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.m_jmsphvxs(15)))
+      new ArmorItem(
+         ArmorMaterials.IRON, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.getBaseDurability(15))
+      )
    );
    /**
     * @mapping {@literal hashed f_uibnkuao Lnet/minecraft/unmapped/C_zxoagntf;f_uibnkuao:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4431,7 +4443,7 @@
     */
    public static final Item IRON_BOOTS = register(
       "iron_boots",
-      new ArmorItem(ArmorMaterials.IRON, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.m_jmsphvxs(15)))
+      new ArmorItem(ArmorMaterials.IRON, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.getBaseDurability(15)))
    );
    /**
     * @mapping {@literal hashed f_jlbfgqdp Lnet/minecraft/unmapped/C_zxoagntf;f_jlbfgqdp:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4439,7 +4451,7 @@
     */
    public static final Item DIAMOND_HELMET = register(
       "diamond_helmet",
-      new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.ArmorSlot.HELMET, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.m_jmsphvxs(33)))
+      new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.ArmorSlot.HELMET, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.getBaseDurability(33)))
    );
    /**
     * @mapping {@literal hashed f_jtrlqnaa Lnet/minecraft/unmapped/C_zxoagntf;f_jtrlqnaa:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4448,7 +4460,7 @@
    public static final Item DIAMOND_CHESTPLATE = register(
       "diamond_chestplate",
       new ArmorItem(
-         ArmorMaterials.DIAMOND, ArmorItem.ArmorSlot.CHESTPLATE, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.m_jmsphvxs(33))
+         ArmorMaterials.DIAMOND, ArmorItem.ArmorSlot.CHESTPLATE, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.getBaseDurability(33))
       )
    );
    /**
@@ -4457,7 +4469,9 @@
     */
    public static final Item DIAMOND_LEGGINGS = register(
       "diamond_leggings",
-      new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.m_jmsphvxs(33)))
+      new ArmorItem(
+         ArmorMaterials.DIAMOND, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.getBaseDurability(33))
+      )
    );
    /**
     * @mapping {@literal hashed f_vivmrhrf Lnet/minecraft/unmapped/C_zxoagntf;f_vivmrhrf:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4465,7 +4479,7 @@
     */
    public static final Item DIAMOND_BOOTS = register(
       "diamond_boots",
-      new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.m_jmsphvxs(33)))
+      new ArmorItem(ArmorMaterials.DIAMOND, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.getBaseDurability(33)))
    );
    /**
     * @mapping {@literal hashed f_ijonrbyz Lnet/minecraft/unmapped/C_zxoagntf;f_ijonrbyz:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4473,7 +4487,7 @@
     */
    public static final Item GOLDEN_HELMET = register(
       "golden_helmet",
-      new ArmorItem(ArmorMaterials.GOLD, ArmorItem.ArmorSlot.HELMET, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.m_jmsphvxs(7)))
+      new ArmorItem(ArmorMaterials.GOLD, ArmorItem.ArmorSlot.HELMET, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.getBaseDurability(7)))
    );
    /**
     * @mapping {@literal hashed f_reyxmhuj Lnet/minecraft/unmapped/C_zxoagntf;f_reyxmhuj:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4481,7 +4495,9 @@
     */
    public static final Item GOLDEN_CHESTPLATE = register(
       "golden_chestplate",
-      new ArmorItem(ArmorMaterials.GOLD, ArmorItem.ArmorSlot.CHESTPLATE, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.m_jmsphvxs(7)))
+      new ArmorItem(
+         ArmorMaterials.GOLD, ArmorItem.ArmorSlot.CHESTPLATE, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.getBaseDurability(7))
+      )
    );
    /**
     * @mapping {@literal hashed f_btafpdpn Lnet/minecraft/unmapped/C_zxoagntf;f_btafpdpn:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4489,7 +4505,7 @@
     */
    public static final Item GOLDEN_LEGGINGS = register(
       "golden_leggings",
-      new ArmorItem(ArmorMaterials.GOLD, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.m_jmsphvxs(7)))
+      new ArmorItem(ArmorMaterials.GOLD, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.getBaseDurability(7)))
    );
    /**
     * @mapping {@literal hashed f_zdoufggp Lnet/minecraft/unmapped/C_zxoagntf;f_zdoufggp:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4497,7 +4513,7 @@
     */
    public static final Item GOLDEN_BOOTS = register(
       "golden_boots",
-      new ArmorItem(ArmorMaterials.GOLD, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.m_jmsphvxs(7)))
+      new ArmorItem(ArmorMaterials.GOLD, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.getBaseDurability(7)))
    );
    /**
     * @mapping {@literal hashed f_ysuwcryq Lnet/minecraft/unmapped/C_zxoagntf;f_ysuwcryq:Lnet/minecraft/unmapped/C_vorddnax;}
@@ -4506,7 +4522,9 @@
    public static final Item NETHERITE_HELMET = register(
       "netherite_helmet",
       new ArmorItem(
-         ArmorMaterials.NETHERITE, ArmorItem.ArmorSlot.HELMET, new Item.Settings().fireproof().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.m_jmsphvxs(37))
+         ArmorMaterials.NETHERITE,
+         ArmorItem.ArmorSlot.HELMET,
+         new Item.Settings().fireproof().maxDamageIfAbsent(ArmorItem.ArmorSlot.HELMET.getBaseDurability(37))
       )
    );
    /**
@@ -4518,7 +4536,7 @@
       new ArmorItem(
          ArmorMaterials.NETHERITE,
          ArmorItem.ArmorSlot.CHESTPLATE,
-         new Item.Settings().fireproof().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.m_jmsphvxs(37))
+         new Item.Settings().fireproof().maxDamageIfAbsent(ArmorItem.ArmorSlot.CHESTPLATE.getBaseDurability(37))
       )
    );
    /**
@@ -4528,7 +4546,9 @@
    public static final Item NETHERITE_LEGGINGS = register(
       "netherite_leggings",
       new ArmorItem(
-         ArmorMaterials.NETHERITE, ArmorItem.ArmorSlot.LEGGINGS, new Item.Settings().fireproof().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.m_jmsphvxs(37))
+         ArmorMaterials.NETHERITE,
+         ArmorItem.ArmorSlot.LEGGINGS,
+         new Item.Settings().fireproof().maxDamageIfAbsent(ArmorItem.ArmorSlot.LEGGINGS.getBaseDurability(37))
       )
    );
    /**
@@ -4538,7 +4558,9 @@
    public static final Item NETHERITE_BOOTS = register(
       "netherite_boots",
       new ArmorItem(
-         ArmorMaterials.NETHERITE, ArmorItem.ArmorSlot.BOOTS, new Item.Settings().fireproof().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.m_jmsphvxs(37))
+         ArmorMaterials.NETHERITE,
+         ArmorItem.ArmorSlot.BOOTS,
+         new Item.Settings().fireproof().maxDamageIfAbsent(ArmorItem.ArmorSlot.BOOTS.getBaseDurability(37))
       )
    );
    /**
@@ -5851,28 +5873,28 @@
     * @mapping {@literal named IRON_HORSE_ARMOR Lnet/minecraft/item/Items;IRON_HORSE_ARMOR:Lnet/minecraft/item/Item;}
     */
    public static final Item IRON_HORSE_ARMOR = register(
-      "iron_horse_armor", new AnimalArmorItem(ArmorMaterials.IRON, AnimalArmorItem.C_rtwzapnt.EQUESTRIAN, new Item.Settings().maxCount(1))
+      "iron_horse_armor", new AnimalArmorItem(ArmorMaterials.IRON, AnimalArmorItem.Type.EQUESTRIAN, new Item.Settings().maxCount(1))
    );
    /**
     * @mapping {@literal hashed f_ezarifpd Lnet/minecraft/unmapped/C_zxoagntf;f_ezarifpd:Lnet/minecraft/unmapped/C_vorddnax;}
     * @mapping {@literal named GOLDEN_HORSE_ARMOR Lnet/minecraft/item/Items;GOLDEN_HORSE_ARMOR:Lnet/minecraft/item/Item;}
     */
    public static final Item GOLDEN_HORSE_ARMOR = register(
-      "golden_horse_armor", new AnimalArmorItem(ArmorMaterials.GOLD, AnimalArmorItem.C_rtwzapnt.EQUESTRIAN, new Item.Settings().maxCount(1))
+      "golden_horse_armor", new AnimalArmorItem(ArmorMaterials.GOLD, AnimalArmorItem.Type.EQUESTRIAN, new Item.Settings().maxCount(1))
    );
    /**
     * @mapping {@literal hashed f_igqcffzv Lnet/minecraft/unmapped/C_zxoagntf;f_igqcffzv:Lnet/minecraft/unmapped/C_vorddnax;}
     * @mapping {@literal named DIAMOND_HORSE_ARMOR Lnet/minecraft/item/Items;DIAMOND_HORSE_ARMOR:Lnet/minecraft/item/Item;}
     */
    public static final Item DIAMOND_HORSE_ARMOR = register(
-      "diamond_horse_armor", new AnimalArmorItem(ArmorMaterials.DIAMOND, AnimalArmorItem.C_rtwzapnt.EQUESTRIAN, new Item.Settings().maxCount(1))
+      "diamond_horse_armor", new AnimalArmorItem(ArmorMaterials.DIAMOND, AnimalArmorItem.Type.EQUESTRIAN, new Item.Settings().maxCount(1))
    );
    /**
     * @mapping {@literal hashed f_chfbltvz Lnet/minecraft/unmapped/C_zxoagntf;f_chfbltvz:Lnet/minecraft/unmapped/C_vorddnax;}
     * @mapping {@literal named LEATHER_HORSE_ARMOR Lnet/minecraft/item/Items;LEATHER_HORSE_ARMOR:Lnet/minecraft/item/Item;}
     */
    public static final Item LEATHER_HORSE_ARMOR = register(
-      "leather_horse_armor", new AnimalArmorItem(ArmorMaterials.LEATHER, AnimalArmorItem.C_rtwzapnt.EQUESTRIAN, new Item.Settings().maxCount(1))
+      "leather_horse_armor", new AnimalArmorItem(ArmorMaterials.LEATHER, AnimalArmorItem.Type.EQUESTRIAN, new Item.Settings().maxCount(1))
    );
    /**
     * @mapping {@literal hashed f_zskthbqa Lnet/minecraft/unmapped/C_zxoagntf;f_zskthbqa:Lnet/minecraft/unmapped/C_vorddnax;}
diff -bur namedTargetSrc/net/minecraft/item/MusicDiscItem.java namedSrc/net/minecraft/item/MusicDiscItem.java
--- namedTargetSrc/net/minecraft/item/MusicDiscItem.java	2024-02-01 16:28:49.549883060 +0000
+++ namedSrc/net/minecraft/item/MusicDiscItem.java	2024-02-01 16:27:36.329852872 +0000
@@ -71,7 +71,7 @@
          if (!lv.isClient) {
             PlayerEntity lv5 = context.getPlayer();
             if (lv.getBlockEntity(lv2) instanceof JukeboxBlockEntity lv6) {
-               lv6.m_bkmnewbu(lv4.copy());
+               lv6.setStack(lv4.copy());
                lv.emitGameEvent(GameEvent.BLOCK_CHANGE, lv2, GameEvent.Context.create(lv5, lv3));
             }
 
diff -bur namedTargetSrc/net/minecraft/item/trim/ArmorTrimPermutation.java namedSrc/net/minecraft/item/trim/ArmorTrimPermutation.java
--- namedTargetSrc/net/minecraft/item/trim/ArmorTrimPermutation.java	2024-02-01 16:28:49.557883064 +0000
+++ namedSrc/net/minecraft/item/trim/ArmorTrimPermutation.java	2024-02-01 16:27:36.337852876 +0000
@@ -84,14 +84,14 @@
    public ArmorTrimPermutation(Holder<ArmorTrimMaterial> material, Holder<ArmorTrimPattern> pattern) {
       this.material = material;
       this.pattern = pattern;
-      this.leggingsTexture = Util.memoize((Function<Holder<ArmorMaterial>, Identifier>)(arg2 -> {
+      this.leggingsTexture = Util.memoize((Function<Holder<ArmorMaterial>, Identifier>)(legMaterial -> {
          Identifier lv = pattern.value().assetId();
-         String string = this.getColorPaletteSuffix(arg2);
+         String string = this.getColorPaletteSuffix(legMaterial);
          return lv.withPath((UnaryOperator<String>)(path -> "trims/models/armor/" + path + "_leggings_" + string));
       }));
-      this.bodyTexture = Util.memoize((Function<Holder<ArmorMaterial>, Identifier>)(arg2 -> {
+      this.bodyTexture = Util.memoize((Function<Holder<ArmorMaterial>, Identifier>)(bodyMaterial -> {
          Identifier lv = pattern.value().assetId();
-         String string = this.getColorPaletteSuffix(arg2);
+         String string = this.getColorPaletteSuffix(bodyMaterial);
          return lv.withPath((UnaryOperator<String>)(path -> "trims/models/armor/" + path + "_" + string));
       }));
    }
@@ -100,9 +100,9 @@
     * @mapping {@literal hashed m_gosigodc Lnet/minecraft/unmapped/C_vglbnrob;m_gosigodc(Lnet/minecraft/unmapped/C_cjzoxshv;)Ljava/lang/String;}
     * @mapping {@literal named getColorPaletteSuffix Lnet/minecraft/item/trim/ArmorTrimPermutation;getColorPaletteSuffix(Lnet/minecraft/registry/Holder;)Ljava/lang/String;}
     */
-   private String getColorPaletteSuffix(Holder<ArmorMaterial> arg) {
+   private String getColorPaletteSuffix(Holder<ArmorMaterial> material) {
       Map<Holder<ArmorMaterial>, String> map = this.material.value().overrideArmorMaterials();
-      String string = (String)map.get(arg);
+      String string = (String)map.get(material);
       return string != null ? string : this.material.value().assetName();
    }
 
@@ -134,16 +134,16 @@
     * @mapping {@literal hashed m_wnaylgoh Lnet/minecraft/unmapped/C_vglbnrob;m_wnaylgoh(Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named getLeggingsTexture Lnet/minecraft/item/trim/ArmorTrimPermutation;getLeggingsTexture(Lnet/minecraft/registry/Holder;)Lnet/minecraft/util/Identifier;}
     */
-   public Identifier getLeggingsTexture(Holder<ArmorMaterial> arg) {
-      return (Identifier)this.leggingsTexture.apply(arg);
+   public Identifier getLeggingsTexture(Holder<ArmorMaterial> material) {
+      return (Identifier)this.leggingsTexture.apply(material);
    }
 
    /**
     * @mapping {@literal hashed m_clrggaww Lnet/minecraft/unmapped/C_vglbnrob;m_clrggaww(Lnet/minecraft/unmapped/C_cjzoxshv;)Lnet/minecraft/unmapped/C_ncpywfca;}
     * @mapping {@literal named getBodyTexture Lnet/minecraft/item/trim/ArmorTrimPermutation;getBodyTexture(Lnet/minecraft/registry/Holder;)Lnet/minecraft/util/Identifier;}
     */
-   public Identifier getBodyTexture(Holder<ArmorMaterial> arg) {
-      return (Identifier)this.bodyTexture.apply(arg);
+   public Identifier getBodyTexture(Holder<ArmorMaterial> material) {
+      return (Identifier)this.bodyTexture.apply(material);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.java	2024-02-01 16:28:49.393882997 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/AdvancementUpdateS2CPacket.java	2024-02-01 16:27:36.133852783 +0000
@@ -68,7 +68,7 @@
     */
    private AdvancementUpdateS2CPacket(RegistryByteBuf buf) {
       this.clearCurrent = buf.readBoolean();
-      this.toShow = AdvancementHolder.f_wpifnhgy.decode(buf);
+      this.toShow = AdvancementHolder.LIST_PACKET_CODEC.decode(buf);
       this.toHide = buf.readCollection(Sets::newLinkedHashSetWithExpectedSize, PacketByteBuf::readIdentifier);
       this.toProgress = buf.m_eznoskdd(PacketByteBuf::readIdentifier, AdvancementProgress::fromPacket);
    }
@@ -79,7 +79,7 @@
     */
    private void write(RegistryByteBuf buf) {
       buf.writeBoolean(this.clearCurrent);
-      AdvancementHolder.f_wpifnhgy.encode(buf, this.toShow);
+      AdvancementHolder.LIST_PACKET_CODEC.encode(buf, this.toShow);
       buf.writeCollection(this.toHide, PacketByteBuf::writeIdentifier);
       buf.writeMap(this.toProgress, PacketByteBuf::writeIdentifier, (bufx, advancement) -> advancement.toPacket(bufx));
    }
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/StatisticsUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/StatisticsUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/StatisticsUpdateS2CPacket.java	2024-02-01 16:28:49.389882996 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/StatisticsUpdateS2CPacket.java	2024-02-01 16:27:36.129852781 +0000
@@ -21,7 +21,7 @@
     * @mapping {@literal named STATS_CODEC Lnet/minecraft/network/packet/s2c/play/StatisticsUpdateS2CPacket;STATS_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    private static final PacketCodec<RegistryByteBuf, Object2IntMap<Stat<?>>> STATS_CODEC = PacketCodecs.m_geuyjopi(
-      Object2IntOpenHashMap::new, Stat.f_uyanmote, PacketCodecs.VAR_INT
+      Object2IntOpenHashMap::new, Stat.PACKET_CODEC, PacketCodecs.VAR_INT
    );
    /**
     * @mapping {@literal hashed f_umxnxwdt Lnet/minecraft/unmapped/C_hcmoxswq;f_umxnxwdt:Lnet/minecraft/unmapped/C_qsrmwluu;}
diff -bur namedTargetSrc/net/minecraft/network/packet/s2c/play/TradeOffersUpdateS2CPacket.java namedSrc/net/minecraft/network/packet/s2c/play/TradeOffersUpdateS2CPacket.java
--- namedTargetSrc/net/minecraft/network/packet/s2c/play/TradeOffersUpdateS2CPacket.java	2024-02-01 16:28:49.637883096 +0000
+++ namedSrc/net/minecraft/network/packet/s2c/play/TradeOffersUpdateS2CPacket.java	2024-02-01 16:27:36.409852908 +0000
@@ -70,7 +70,7 @@
     */
    private TradeOffersUpdateS2CPacket(RegistryByteBuf buf) {
       this.syncId = buf.readVarInt();
-      this.recipes = TradeOfferList.f_fenmtrca.decode(buf);
+      this.recipes = TradeOfferList.PACKET_CODEC.decode(buf);
       this.levelProgress = buf.readVarInt();
       this.experience = buf.readVarInt();
       this.leveled = buf.readBoolean();
@@ -83,7 +83,7 @@
     */
    private void write(RegistryByteBuf buf) {
       buf.writeVarInt(this.syncId);
-      TradeOfferList.f_fenmtrca.encode(buf, this.recipes);
+      TradeOfferList.PACKET_CODEC.encode(buf, this.recipes);
       buf.writeVarInt(this.levelProgress);
       buf.writeVarInt(this.experience);
       buf.writeBoolean(this.leveled);
diff -bur namedTargetSrc/net/minecraft/registry/Registries.java namedSrc/net/minecraft/registry/Registries.java
--- namedTargetSrc/net/minecraft/registry/Registries.java	2024-02-01 16:28:49.561883064 +0000
+++ namedSrc/net/minecraft/registry/Registries.java	2024-02-01 16:27:36.341852877 +0000
@@ -555,7 +555,7 @@
     * @mapping {@literal hashed f_oasgsnpo Lnet/minecraft/unmapped/C_nusqeapl;f_oasgsnpo:Lnet/minecraft/unmapped/C_tqxyjqsk;}
     * @mapping {@literal named ARMOR_MATERIAL Lnet/minecraft/registry/Registries;ARMOR_MATERIAL:Lnet/minecraft/registry/Registry;}
     */
-   public static final Registry<ArmorMaterial> ARMOR_MATERIAL = registerSimple(RegistryKeys.ARMOR_MATERIAL, ArmorMaterials::m_xrjlzjae);
+   public static final Registry<ArmorMaterial> ARMOR_MATERIAL = registerSimple(RegistryKeys.ARMOR_MATERIAL, ArmorMaterials::bootstrap);
    /**
     * @mapping {@literal hashed f_oszjuuhn Lnet/minecraft/unmapped/C_nusqeapl;f_oszjuuhn:Lnet/minecraft/unmapped/C_tqxyjqsk;}
     * @mapping {@literal named ROOT Lnet/minecraft/registry/Registries;ROOT:Lnet/minecraft/registry/Registry;}
diff -bur namedTargetSrc/net/minecraft/screen/MerchantScreenHandler.java namedSrc/net/minecraft/screen/MerchantScreenHandler.java
--- namedTargetSrc/net/minecraft/screen/MerchantScreenHandler.java	2024-02-01 16:28:49.589883076 +0000
+++ namedSrc/net/minecraft/screen/MerchantScreenHandler.java	2024-02-01 16:27:36.373852892 +0000
@@ -336,7 +336,7 @@
 
          if (this.merchantInventory.getStack(0).isEmpty() && this.merchantInventory.getStack(1).isEmpty()) {
             TradeOffer lv3 = (TradeOffer)this.getRecipes().get(recipeIndex);
-            boolean bl = lv3.m_jxiehhbs();
+            boolean bl = lv3.shouldIgnoreNbt();
             ItemStack lv4 = lv3.getAdjustedFirstBuyItem();
             this.autofill(0, lv4, bl);
             ItemStack lv5 = lv3.getSecondBuyItem();
diff -bur namedTargetSrc/net/minecraft/server/command/CommandManager.java namedSrc/net/minecraft/server/command/CommandManager.java
--- namedTargetSrc/net/minecraft/server/command/CommandManager.java	2024-02-01 16:28:49.673883110 +0000
+++ namedSrc/net/minecraft/server/command/CommandManager.java	2024-02-01 16:27:36.453852928 +0000
@@ -57,6 +57,7 @@
 import net.minecraft.server.dedicated.command.SaveOnCommand;
 import net.minecraft.server.dedicated.command.SetIdleTimeoutCommand;
 import net.minecraft.server.dedicated.command.StopCommand;
+import net.minecraft.server.dedicated.command.TransferCommand;
 import net.minecraft.server.dedicated.command.WhitelistCommand;
 import net.minecraft.server.dedicated.command.dev.DebugConfigCommand;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -66,7 +67,6 @@
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.text.Texts;
-import net.minecraft.unmapped.C_alqsftvj;
 import net.minecraft.unmapped.C_fwdwgvbs;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Util;
@@ -218,7 +218,7 @@
          SaveOnCommand.register(this.dispatcher);
          SetIdleTimeoutCommand.register(this.dispatcher);
          StopCommand.register(this.dispatcher);
-         C_alqsftvj.m_pdboisxp(this.dispatcher);
+         TransferCommand.register(this.dispatcher);
          WhitelistCommand.register(this.dispatcher);
       }

@github-actions
Copy link
Contributor

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/server/command/ExecuteCommand.java namedSrc/net/minecraft/server/command/ExecuteCommand.java
--- namedTargetSrc/net/minecraft/server/command/ExecuteCommand.java	2024-02-01 16:28:49.673883110 +0000
+++ namedSrc/net/minecraft/server/command/ExecuteCommand.java	2024-02-01 16:27:36.453852928 +0000
@@ -114,31 +114,38 @@
  */
 public class ExecuteCommand {
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_krsbsqba Lnet/minecraft/unmapped/C_ytmhosha;f_krsbsqba:I}
+    * @mapping {@literal named MAX_TEST_AREA Lnet/minecraft/server/command/ExecuteCommand;MAX_TEST_AREA:I}
     */
-   private static final int f_krsbsqba = 32768;
+   private static final int MAX_TEST_AREA = 32768;
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_vxgbdzir Lnet/minecraft/unmapped/C_ytmhosha;f_vxgbdzir:Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;}
+    * @mapping {@literal named AREA_TOO_BIG_EXCEPTION Lnet/minecraft/server/command/ExecuteCommand;AREA_TOO_BIG_EXCEPTION:Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;}
     */
-   private static final Dynamic2CommandExceptionType f_vxgbdzir = new Dynamic2CommandExceptionType(
-      (object, object2) -> Text.stringifiedTranslatable("commands.execute.blocks.toobig", object, object2)
+   private static final Dynamic2CommandExceptionType AREA_TOO_BIG_EXCEPTION = new Dynamic2CommandExceptionType(
+      (max, specified) -> Text.stringifiedTranslatable("commands.execute.blocks.toobig", max, specified)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_rfjtwcvv Lnet/minecraft/unmapped/C_ytmhosha;f_rfjtwcvv:Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;}
+    * @mapping {@literal named TEST_FAILED_EXCEPTION Lnet/minecraft/server/command/ExecuteCommand;TEST_FAILED_EXCEPTION:Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType;}
     */
-   private static final SimpleCommandExceptionType f_rfjtwcvv = new SimpleCommandExceptionType(Text.translatable("commands.execute.conditional.fail"));
+   private static final SimpleCommandExceptionType TEST_FAILED_EXCEPTION = new SimpleCommandExceptionType(
+      Text.translatable("commands.execute.conditional.fail")
+   );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_czgympbj Lnet/minecraft/unmapped/C_ytmhosha;f_czgympbj:Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;}
+    * @mapping {@literal named TEST_FAILED_COUNT_EXCEPTION Lnet/minecraft/server/command/ExecuteCommand;TEST_FAILED_COUNT_EXCEPTION:Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;}
     */
-   private static final DynamicCommandExceptionType f_czgympbj = new DynamicCommandExceptionType(
-      object -> Text.stringifiedTranslatable("commands.execute.conditional.fail_count", object)
+   private static final DynamicCommandExceptionType TEST_FAILED_COUNT_EXCEPTION = new DynamicCommandExceptionType(
+      count -> Text.stringifiedTranslatable("commands.execute.conditional.fail_count", count)
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_japfbsrr Lnet/minecraft/unmapped/C_ytmhosha;f_japfbsrr:Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;}
+    * @mapping {@literal named FUNCTION_INSTANTIATION_FAILURE_EXCEPTION Lnet/minecraft/server/command/ExecuteCommand;FUNCTION_INSTANTIATION_FAILURE_EXCEPTION:Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType;}
     */
    @VisibleForTesting
-   public static final Dynamic2CommandExceptionType f_japfbsrr = new Dynamic2CommandExceptionType(
-      (object, object2) -> Text.stringifiedTranslatable("commands.execute.function.instantiationFailure", object, object2)
+   public static final Dynamic2CommandExceptionType FUNCTION_INSTANTIATION_FAILURE_EXCEPTION = new Dynamic2CommandExceptionType(
+      (function, message) -> Text.stringifiedTranslatable("commands.execute.function.instantiationFailure", function, message)
    );
    /**
     * Mapping not found
@@ -160,8 +167,8 @@
          CommandManager.literal("execute")
             .requires(source -> source.hasPermission(2))
             .then(CommandManager.literal("run").redirect(dispatcher.getRoot()))
-            .then(m_vygzakqf(literalCommandNode, CommandManager.literal("if"), true, context))
-            .then(m_vygzakqf(literalCommandNode, CommandManager.literal("unless"), false, context))
+            .then(addConditionArguments(literalCommandNode, CommandManager.literal("if"), true, context))
+            .then(addConditionArguments(literalCommandNode, CommandManager.literal("unless"), false, context))
             .then(CommandManager.literal("as").then(CommandManager.argument("targets", EntityArgumentType.entities()).fork(literalCommandNode, contextx -> {
                List<ServerCommandSource> list = Lists.<ServerCommandSource>newArrayList();
       
@@ -196,8 +203,8 @@
             )
             .then(
                CommandManager.literal("store")
-                  .then(m_pibuapkg(literalCommandNode, CommandManager.literal("result"), true))
-                  .then(m_pibuapkg(literalCommandNode, CommandManager.literal("success"), false))
+                  .then(addStoreArguments(literalCommandNode, CommandManager.literal("result"), true))
+                  .then(addStoreArguments(literalCommandNode, CommandManager.literal("success"), false))
             )
             .then(
                CommandManager.literal("positioned")
@@ -336,12 +343,13 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pibuapkg Lnet/minecraft/unmapped/C_ytmhosha;m_pibuapkg(Lcom/mojang/brigadier/tree/LiteralCommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;Z)Lcom/mojang/brigadier/builder/ArgumentBuilder;}
+    * @mapping {@literal named addStoreArguments Lnet/minecraft/server/command/ExecuteCommand;addStoreArguments(Lcom/mojang/brigadier/tree/LiteralCommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;Z)Lcom/mojang/brigadier/builder/ArgumentBuilder;}
     */
-   private static ArgumentBuilder<ServerCommandSource, ?> m_pibuapkg(
-      LiteralCommandNode<ServerCommandSource> literalCommandNode, LiteralArgumentBuilder<ServerCommandSource> literalArgumentBuilder, boolean bl
+   private static ArgumentBuilder<ServerCommandSource, ?> addStoreArguments(
+      LiteralCommandNode<ServerCommandSource> redirectTarget, LiteralArgumentBuilder<ServerCommandSource> builder, boolean storeResult
    ) {
-      literalArgumentBuilder.then(
+      builder.then(
          CommandManager.literal("score")
             .then(
                CommandManager.argument("targets", ScoreHolderArgumentType.scoreHolders())
@@ -349,36 +357,36 @@
                   .then(
                      CommandManager.argument("objective", ScoreboardObjectiveArgumentType.scoreboardObjective())
                         .redirect(
-                           literalCommandNode,
-                           context -> m_mhorrevj(
+                           redirectTarget,
+                           context -> executeStoreScore(
                                  context.getSource(),
                                  ScoreHolderArgumentType.getScoreHoldersWithGlobalWildcard(context, "targets"),
                                  ScoreboardObjectiveArgumentType.getObjective(context, "objective"),
-                                 bl
+                                 storeResult
                               )
                         )
                   )
             )
       );
-      literalArgumentBuilder.then(
+      builder.then(
          CommandManager.literal("bossbar")
             .then(
                CommandManager.argument("id", IdentifierArgumentType.identifier())
                   .suggests(BossBarCommand.SUGGESTION_PROVIDER)
                   .then(
                      CommandManager.literal("value")
-                        .redirect(literalCommandNode, context -> m_nmhnbskq(context.getSource(), BossBarCommand.getBossBar(context), true, bl))
+                        .redirect(redirectTarget, context -> executeStoreBossBar(context.getSource(), BossBarCommand.getBossBar(context), true, storeResult))
                   )
                   .then(
                      CommandManager.literal("max")
-                        .redirect(literalCommandNode, context -> m_nmhnbskq(context.getSource(), BossBarCommand.getBossBar(context), false, bl))
+                        .redirect(redirectTarget, context -> executeStoreBossBar(context.getSource(), BossBarCommand.getBossBar(context), false, storeResult))
                   )
             )
       );
 
       for (DataCommand.ObjectType lv : DataCommand.TARGET_OBJECT_TYPES) {
          lv.addArgumentsToBuilder(
-            literalArgumentBuilder,
+            builder,
             argumentBuilder -> argumentBuilder.then(
                   CommandManager.argument("path", NbtPathArgumentType.nbtPath())
                      .then(
@@ -386,13 +394,13 @@
                            .then(
                               CommandManager.argument("scale", DoubleArgumentType.doubleArg())
                                  .redirect(
-                                    literalCommandNode,
-                                    context -> m_xxktruvq(
+                                    redirectTarget,
+                                    context -> executeStoreData(
                                           context.getSource(),
                                           lv.getObject(context),
                                           NbtPathArgumentType.getNbtPath(context, "path"),
-                                          i -> NbtInt.of((int)((double)i * DoubleArgumentType.getDouble(context, "scale"))),
-                                          bl
+                                          value -> NbtInt.of((int)((double)value * DoubleArgumentType.getDouble(context, "scale"))),
+                                          storeResult
                                        )
                                  )
                            )
@@ -402,13 +410,13 @@
                            .then(
                               CommandManager.argument("scale", DoubleArgumentType.doubleArg())
                                  .redirect(
-                                    literalCommandNode,
-                                    context -> m_xxktruvq(
+                                    redirectTarget,
+                                    context -> executeStoreData(
                                           context.getSource(),
                                           lv.getObject(context),
                                           NbtPathArgumentType.getNbtPath(context, "path"),
-                                          i -> NbtFloat.of((float)((double)i * DoubleArgumentType.getDouble(context, "scale"))),
-                                          bl
+                                          value -> NbtFloat.of((float)((double)value * DoubleArgumentType.getDouble(context, "scale"))),
+                                          storeResult
                                        )
                                  )
                            )
@@ -418,13 +426,13 @@
                            .then(
                               CommandManager.argument("scale", DoubleArgumentType.doubleArg())
                                  .redirect(
-                                    literalCommandNode,
-                                    context -> m_xxktruvq(
+                                    redirectTarget,
+                                    context -> executeStoreData(
                                           context.getSource(),
                                           lv.getObject(context),
                                           NbtPathArgumentType.getNbtPath(context, "path"),
-                                          i -> NbtShort.of((short)((int)((double)i * DoubleArgumentType.getDouble(context, "scale")))),
-                                          bl
+                                          value -> NbtShort.of((short)((int)((double)value * DoubleArgumentType.getDouble(context, "scale")))),
+                                          storeResult
                                        )
                                  )
                            )
@@ -434,13 +442,13 @@
                            .then(
                               CommandManager.argument("scale", DoubleArgumentType.doubleArg())
                                  .redirect(
-                                    literalCommandNode,
-                                    context -> m_xxktruvq(
+                                    redirectTarget,
+                                    context -> executeStoreData(
                                           context.getSource(),
                                           lv.getObject(context),
                                           NbtPathArgumentType.getNbtPath(context, "path"),
-                                          i -> NbtLong.of((long)((double)i * DoubleArgumentType.getDouble(context, "scale"))),
-                                          bl
+                                          value -> NbtLong.of((long)((double)value * DoubleArgumentType.getDouble(context, "scale"))),
+                                          storeResult
                                        )
                                  )
                            )
@@ -450,13 +458,13 @@
                            .then(
                               CommandManager.argument("scale", DoubleArgumentType.doubleArg())
                                  .redirect(
-                                    literalCommandNode,
-                                    context -> m_xxktruvq(
+                                    redirectTarget,
+                                    context -> executeStoreData(
                                           context.getSource(),
                                           lv.getObject(context),
                                           NbtPathArgumentType.getNbtPath(context, "path"),
-                                          i -> NbtDouble.of((double)i * DoubleArgumentType.getDouble(context, "scale")),
-                                          bl
+                                          value -> NbtDouble.of((double)value * DoubleArgumentType.getDouble(context, "scale")),
+                                          storeResult
                                        )
                                  )
                            )
@@ -466,13 +474,13 @@
                            .then(
                               CommandManager.argument("scale", DoubleArgumentType.doubleArg())
                                  .redirect(
-                                    literalCommandNode,
-                                    context -> m_xxktruvq(
+                                    redirectTarget,
+                                    context -> executeStoreData(
                                           context.getSource(),
                                           lv.getObject(context),
                                           NbtPathArgumentType.getNbtPath(context, "path"),
-                                          i -> NbtByte.of((byte)((int)((double)i * DoubleArgumentType.getDouble(context, "scale")))),
-                                          bl
+                                          value -> NbtByte.of((byte)((int)((double)value * DoubleArgumentType.getDouble(context, "scale")))),
+                                          storeResult
                                        )
                                  )
                            )
@@ -481,19 +489,21 @@
          );
       }
 
-      return literalArgumentBuilder;
+      return builder;
    }
 
    /**
     * @mapping {@literal hashed m_mhorrevj Lnet/minecraft/unmapped/C_ytmhosha;m_mhorrevj(Lnet/minecraft/unmapped/C_pennblrk;Ljava/util/Collection;Lnet/minecraft/unmapped/C_tlhwodcf;Z)Lnet/minecraft/unmapped/C_pennblrk;}
-    * @mapping {@literal named m_mhorrevj Lnet/minecraft/server/command/ExecuteCommand;m_mhorrevj(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;Lnet/minecraft/scoreboard/ScoreboardObjective;Z)Lnet/minecraft/server/command/ServerCommandSource;}
+    * @mapping {@literal named executeStoreScore Lnet/minecraft/server/command/ExecuteCommand;executeStoreScore(Lnet/minecraft/server/command/ServerCommandSource;Ljava/util/Collection;Lnet/minecraft/scoreboard/ScoreboardObjective;Z)Lnet/minecraft/server/command/ServerCommandSource;}
     */
-   private static ServerCommandSource m_mhorrevj(ServerCommandSource source, Collection<ScoreHolder> collection, ScoreboardObjective arg2, boolean bl) {
+   private static ServerCommandSource executeStoreScore(
+      ServerCommandSource source, Collection<ScoreHolder> targets, ScoreboardObjective objective, boolean storeResult
+   ) {
       Scoreboard lv = source.getServer().getScoreboard();
       return source.withChainedResultCallback((success, result) -> {
-         for (ScoreHolder lvx : collection) {
-            ScoreAccess lv2 = lv.getOrCreateScore(lvx, arg2);
-            int j = bl ? result : (success ? 1 : 0);
+         for (ScoreHolder lvx : targets) {
+            ScoreAccess lv2 = lv.getOrCreateScore(lvx, objective);
+            int j = storeResult ? result : (success ? 1 : 0);
             lv2.setScore(j);
          }
       }, CommandResultCallback::chain);
@@ -501,32 +511,32 @@
 
    /**
     * @mapping {@literal hashed m_nmhnbskq Lnet/minecraft/unmapped/C_ytmhosha;m_nmhnbskq(Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_izahjvwf;ZZ)Lnet/minecraft/unmapped/C_pennblrk;}
-    * @mapping {@literal named m_nmhnbskq Lnet/minecraft/server/command/ExecuteCommand;m_nmhnbskq(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/entity/boss/CommandBossBar;ZZ)Lnet/minecraft/server/command/ServerCommandSource;}
+    * @mapping {@literal named executeStoreBossBar Lnet/minecraft/server/command/ExecuteCommand;executeStoreBossBar(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/entity/boss/CommandBossBar;ZZ)Lnet/minecraft/server/command/ServerCommandSource;}
     */
-   private static ServerCommandSource m_nmhnbskq(ServerCommandSource source, CommandBossBar arg2, boolean bl, boolean bl2) {
+   private static ServerCommandSource executeStoreBossBar(ServerCommandSource source, CommandBossBar bossBar, boolean storeValue, boolean storeResult) {
       return source.withChainedResultCallback((success, result) -> {
-         int j = bl2 ? result : (success ? 1 : 0);
-         if (bl) {
-            arg2.setValue(j);
+         int j = storeResult ? result : (success ? 1 : 0);
+         if (storeValue) {
+            bossBar.setValue(j);
          } else {
-            arg2.setMaxValue(j);
+            bossBar.setMaxValue(j);
          }
       }, CommandResultCallback::chain);
    }
 
    /**
     * @mapping {@literal hashed m_xxktruvq Lnet/minecraft/unmapped/C_ytmhosha;m_xxktruvq(Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_hhiwwgvm;Lnet/minecraft/unmapped/C_xondkbcs$C_rgpfrkey;Ljava/util/function/IntFunction;Z)Lnet/minecraft/unmapped/C_pennblrk;}
-    * @mapping {@literal named m_xxktruvq Lnet/minecraft/server/command/ExecuteCommand;m_xxktruvq(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/command/DataCommandObject;Lnet/minecraft/command/argument/NbtPathArgumentType$NbtPath;Ljava/util/function/IntFunction;Z)Lnet/minecraft/server/command/ServerCommandSource;}
+    * @mapping {@literal named executeStoreData Lnet/minecraft/server/command/ExecuteCommand;executeStoreData(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/command/DataCommandObject;Lnet/minecraft/command/argument/NbtPathArgumentType$NbtPath;Ljava/util/function/IntFunction;Z)Lnet/minecraft/server/command/ServerCommandSource;}
     */
-   private static ServerCommandSource m_xxktruvq(
-      ServerCommandSource source, DataCommandObject arg2, NbtPathArgumentType.NbtPath arg3, IntFunction<NbtElement> intFunction, boolean bl
+   private static ServerCommandSource executeStoreData(
+      ServerCommandSource source, DataCommandObject target, NbtPathArgumentType.NbtPath path, IntFunction<NbtElement> scalingFunction, boolean storeResult
    ) {
       return source.withChainedResultCallback((success, result) -> {
          try {
-            NbtCompound lv = arg2.getNbt();
-            int j = bl ? result : (success ? 1 : 0);
-            arg3.set(lv, (NbtElement)intFunction.apply(j));
-            arg2.setNbt(lv);
+            NbtCompound lv = target.getNbt();
+            int j = storeResult ? result : (success ? 1 : 0);
+            path.set(lv, (NbtElement)scalingFunction.apply(j));
+            target.setNbt(lv);
          } catch (CommandSyntaxException var8) {
          }
       }, CommandResultCallback::chain);
@@ -534,31 +544,36 @@
 
    /**
     * @mapping {@literal hashed m_xhscimox Lnet/minecraft/unmapped/C_ytmhosha;m_xhscimox(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;)Z}
-    * @mapping {@literal named m_xhscimox Lnet/minecraft/server/command/ExecuteCommand;m_xhscimox(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)Z}
+    * @mapping {@literal named isChunkLoaded Lnet/minecraft/server/command/ExecuteCommand;isChunkLoaded(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;)Z}
     */
-   private static boolean m_xhscimox(ServerWorld world, BlockPos pos) {
+   private static boolean isChunkLoaded(ServerWorld world, BlockPos pos) {
       ChunkPos lv = new ChunkPos(pos);
       WorldChunk lv2 = world.getChunkManager().getWorldChunk(lv.x, lv.z);
-      return lv2 == null ? false : lv2.getLevelType() == ChunkLoadStatus.ENTITY_TICKING && world.m_omaqqcew(lv.toLong());
+      return lv2 == null ? false : lv2.getLevelType() == ChunkLoadStatus.ENTITY_TICKING && world.areChunkEntitiesLoaded(lv.toLong());
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vygzakqf Lnet/minecraft/unmapped/C_ytmhosha;m_vygzakqf(Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;ZLnet/minecraft/unmapped/C_bprdujxm;)Lcom/mojang/brigadier/builder/ArgumentBuilder;}
+    * @mapping {@literal named addConditionArguments Lnet/minecraft/server/command/ExecuteCommand;addConditionArguments(Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;ZLnet/minecraft/command/CommandBuildContext;)Lcom/mojang/brigadier/builder/ArgumentBuilder;}
     */
-   private static ArgumentBuilder<ServerCommandSource, ?> m_vygzakqf(
-      CommandNode<ServerCommandSource> commandNode, LiteralArgumentBuilder<ServerCommandSource> literalArgumentBuilder, boolean bl, CommandBuildContext arg
+   private static ArgumentBuilder<ServerCommandSource, ?> addConditionArguments(
+      CommandNode<ServerCommandSource> redirectTarget, LiteralArgumentBuilder<ServerCommandSource> builder, boolean expectedResult, CommandBuildContext context
    ) {
-      literalArgumentBuilder.then(
+      builder.then(
             CommandManager.literal("block")
                .then(
                   CommandManager.argument("pos", BlockPosArgumentType.blockPos())
                      .then(
-                        m_cgnkivma(
-                           commandNode,
-                           CommandManager.argument("block", BlockPredicateArgumentType.blockPredicate(arg)),
-                           bl,
-                           context -> BlockPredicateArgumentType.getBlockPredicate(context, "block")
-                                 .test(new CachedBlockPosition(context.getSource().getWorld(), BlockPosArgumentType.getLoadedBlockPos(context, "pos"), true))
+                        addConditionLogic(
+                           redirectTarget,
+                           CommandManager.argument("block", BlockPredicateArgumentType.blockPredicate(context)),
+                           expectedResult,
+                           contextx -> BlockPredicateArgumentType.getBlockPredicate(contextx, "block")
+                                 .test(
+                                    new CachedBlockPosition(
+                                       ((ServerCommandSource)contextx.getSource()).getWorld(), BlockPosArgumentType.getLoadedBlockPos(contextx, "pos"), true
+                                    )
+                                 )
                         )
                      )
                )
@@ -568,12 +583,12 @@
                .then(
                   CommandManager.argument("pos", BlockPosArgumentType.blockPos())
                      .then(
-                        m_cgnkivma(
-                           commandNode,
-                           CommandManager.argument("biome", RegistryEntryOrTagArgument.create(arg, RegistryKeys.BIOME)),
-                           bl,
-                           context -> RegistryEntryOrTagArgument.getResult(context, "biome", RegistryKeys.BIOME)
-                                 .test(context.getSource().getWorld().getBiome(BlockPosArgumentType.getLoadedBlockPos(context, "pos")))
+                        addConditionLogic(
+                           redirectTarget,
+                           CommandManager.argument("biome", RegistryEntryOrTagArgument.create(context, RegistryKeys.BIOME)),
+                           expectedResult,
+                           contextx -> RegistryEntryOrTagArgument.getResult(contextx, "biome", RegistryKeys.BIOME)
+                                 .test(((ServerCommandSource)contextx.getSource()).getWorld().getBiome(BlockPosArgumentType.getLoadedBlockPos(contextx, "pos")))
                         )
                      )
                )
@@ -581,22 +596,24 @@
          .then(
             CommandManager.literal("loaded")
                .then(
-                  m_cgnkivma(
-                     commandNode,
+                  addConditionLogic(
+                     redirectTarget,
                      CommandManager.argument("pos", BlockPosArgumentType.blockPos()),
-                     bl,
-                     context -> m_xhscimox(context.getSource().getWorld(), BlockPosArgumentType.getUnvalidatedBlockPos(context, "pos"))
+                     expectedResult,
+                     contextx -> isChunkLoaded(
+                           ((ServerCommandSource)contextx.getSource()).getWorld(), BlockPosArgumentType.getUnvalidatedBlockPos(contextx, "pos")
+                        )
                   )
                )
          )
          .then(
             CommandManager.literal("dimension")
                .then(
-                  m_cgnkivma(
-                     commandNode,
+                  addConditionLogic(
+                     redirectTarget,
                      CommandManager.argument("dimension", DimensionArgumentType.dimension()),
-                     bl,
-                     context -> DimensionArgumentType.getDimensionArgument(context, "dimension") == context.getSource().getWorld()
+                     expectedResult,
+                     contextx -> DimensionArgumentType.getDimensionArgument(contextx, "dimension") == ((ServerCommandSource)contextx.getSource()).getWorld()
                   )
                )
          )
@@ -613,11 +630,11 @@
                                     CommandManager.argument("source", ScoreHolderArgumentType.scoreHolder())
                                        .suggests(ScoreHolderArgumentType.SUGGESTION_PROVIDER)
                                        .then(
-                                          m_cgnkivma(
-                                             commandNode,
+                                          addConditionLogic(
+                                             redirectTarget,
                                              CommandManager.argument("sourceObjective", ScoreboardObjectiveArgumentType.scoreboardObjective()),
-                                             bl,
-                                             context -> m_odyatsno(context, (i, j) -> i == j)
+                                             expectedResult,
+                                             contextx -> testScore(contextx, (a, b) -> a == b)
                                           )
                                        )
                                  )
@@ -628,11 +645,11 @@
                                     CommandManager.argument("source", ScoreHolderArgumentType.scoreHolder())
                                        .suggests(ScoreHolderArgumentType.SUGGESTION_PROVIDER)
                                        .then(
-                                          m_cgnkivma(
-                                             commandNode,
+                                          addConditionLogic(
+                                             redirectTarget,
                                              CommandManager.argument("sourceObjective", ScoreboardObjectiveArgumentType.scoreboardObjective()),
-                                             bl,
-                                             context -> m_odyatsno(context, (i, j) -> i < j)
+                                             expectedResult,
+                                             contextx -> testScore(contextx, (a, b) -> a < b)
                                           )
                                        )
                                  )
@@ -643,11 +660,11 @@
                                     CommandManager.argument("source", ScoreHolderArgumentType.scoreHolder())
                                        .suggests(ScoreHolderArgumentType.SUGGESTION_PROVIDER)
                                        .then(
-                                          m_cgnkivma(
-                                             commandNode,
+                                          addConditionLogic(
+                                             redirectTarget,
                                              CommandManager.argument("sourceObjective", ScoreboardObjectiveArgumentType.scoreboardObjective()),
-                                             bl,
-                                             context -> m_odyatsno(context, (i, j) -> i <= j)
+                                             expectedResult,
+                                             contextx -> testScore(contextx, (a, b) -> a <= b)
                                           )
                                        )
                                  )
@@ -658,11 +675,11 @@
                                     CommandManager.argument("source", ScoreHolderArgumentType.scoreHolder())
                                        .suggests(ScoreHolderArgumentType.SUGGESTION_PROVIDER)
                                        .then(
-                                          m_cgnkivma(
-                                             commandNode,
+                                          addConditionLogic(
+                                             redirectTarget,
                                              CommandManager.argument("sourceObjective", ScoreboardObjectiveArgumentType.scoreboardObjective()),
-                                             bl,
-                                             context -> m_odyatsno(context, (i, j) -> i > j)
+                                             expectedResult,
+                                             contextx -> testScore(contextx, (a, b) -> a > b)
                                           )
                                        )
                                  )
@@ -673,11 +690,11 @@
                                     CommandManager.argument("source", ScoreHolderArgumentType.scoreHolder())
                                        .suggests(ScoreHolderArgumentType.SUGGESTION_PROVIDER)
                                        .then(
-                                          m_cgnkivma(
-                                             commandNode,
+                                          addConditionLogic(
+                                             redirectTarget,
                                              CommandManager.argument("sourceObjective", ScoreboardObjectiveArgumentType.scoreboardObjective()),
-                                             bl,
-                                             context -> m_odyatsno(context, (i, j) -> i >= j)
+                                             expectedResult,
+                                             contextx -> testScore(contextx, (a, b) -> a >= b)
                                           )
                                        )
                                  )
@@ -685,11 +702,11 @@
                            .then(
                               CommandManager.literal("matches")
                                  .then(
-                                    m_cgnkivma(
-                                       commandNode,
+                                    addConditionLogic(
+                                       redirectTarget,
                                        CommandManager.argument("range", NumberRangeArgumentType.intRange()),
-                                       bl,
-                                       context -> m_rgbdxqtx(context, NumberRangeArgumentType.IntRangeArgumentType.getRangeArgument(context, "range"))
+                                       expectedResult,
+                                       contextx -> testScore(contextx, NumberRangeArgumentType.IntRangeArgumentType.getRangeArgument(contextx, "range"))
                                     )
                                  )
                            )
@@ -704,8 +721,8 @@
                         CommandManager.argument("end", BlockPosArgumentType.blockPos())
                            .then(
                               CommandManager.argument("destination", BlockPosArgumentType.blockPos())
-                                 .then(m_fpqvushn(commandNode, CommandManager.literal("all"), bl, false))
-                                 .then(m_fpqvushn(commandNode, CommandManager.literal("masked"), bl, true))
+                                 .then(addBlocksConditionLogic(redirectTarget, CommandManager.literal("all"), expectedResult, false))
+                                 .then(addBlocksConditionLogic(redirectTarget, CommandManager.literal("masked"), expectedResult, true))
                            )
                      )
                )
@@ -714,18 +731,22 @@
             CommandManager.literal("entity")
                .then(
                   CommandManager.argument("entities", EntityArgumentType.entities())
-                     .fork(commandNode, context -> m_aquegtqz(context, bl, !EntityArgumentType.getOptionalEntities(context, "entities").isEmpty()))
-                     .executes(m_vbsipqek(bl, context -> EntityArgumentType.getOptionalEntities(context, "entities").size()))
+                     .fork(
+                        redirectTarget, contextx -> expect(contextx, expectedResult, !EntityArgumentType.getOptionalEntities(contextx, "entities").isEmpty())
+                     )
+                     .executes(createNumericConditionalHandler(expectedResult, contextx -> EntityArgumentType.getOptionalEntities(contextx, "entities").size()))
                )
          )
          .then(
             CommandManager.literal("predicate")
                .then(
-                  m_cgnkivma(
-                     commandNode,
+                  addConditionLogic(
+                     redirectTarget,
                      CommandManager.argument("predicate", IdentifierArgumentType.identifier()).suggests(f_csolxsjm),
-                     bl,
-                     context -> m_kkttpcyp(context.getSource(), IdentifierArgumentType.getPredicateArgument(context, "predicate"))
+                     expectedResult,
+                     contextx -> testLootCondition(
+                           (ServerCommandSource)contextx.getSource(), IdentifierArgumentType.getPredicateArgument(contextx, "predicate")
+                        )
                   )
                )
          )
@@ -734,48 +755,55 @@
                .then(
                   CommandManager.argument("name", CommandFunctionArgumentType.commandFunction())
                      .suggests(FunctionCommand.SUGGESTION_PROVIDER)
-                     .fork(commandNode, new ExecuteCommand.C_nyvbumvd(bl))
+                     .fork(redirectTarget, new ExecuteCommand.C_nyvbumvd(expectedResult))
                )
          );
 
       for (DataCommand.ObjectType lv : DataCommand.SOURCE_OBJECT_TYPES) {
-         literalArgumentBuilder.then(
+         builder.then(
             lv.addArgumentsToBuilder(
                CommandManager.literal("data"),
                argumentBuilder -> argumentBuilder.then(
                      CommandManager.argument("path", NbtPathArgumentType.nbtPath())
                         .fork(
-                           commandNode,
-                           context -> m_aquegtqz(context, bl, m_yjrhfksg(lv.getObject(context), NbtPathArgumentType.getNbtPath(context, "path")) > 0)
+                           redirectTarget,
+                           contextx -> expect(
+                                 contextx, expectedResult, m_yjrhfksg(lv.getObject(contextx), NbtPathArgumentType.getNbtPath(contextx, "path")) > 0
+                              )
+                        )
+                        .executes(
+                           createNumericConditionalHandler(
+                              expectedResult, contextx -> m_yjrhfksg(lv.getObject(contextx), NbtPathArgumentType.getNbtPath(contextx, "path"))
+                           )
                         )
-                        .executes(m_vbsipqek(bl, context -> m_yjrhfksg(lv.getObject(context), NbtPathArgumentType.getNbtPath(context, "path"))))
                   )
             )
          );
       }
 
-      return literalArgumentBuilder;
+      return builder;
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vbsipqek Lnet/minecraft/unmapped/C_ytmhosha;m_vbsipqek(ZLnet/minecraft/unmapped/C_ytmhosha$C_teviyeeu;)Lcom/mojang/brigadier/Command;}
+    * @mapping {@literal named createNumericConditionalHandler Lnet/minecraft/server/command/ExecuteCommand;createNumericConditionalHandler(ZLnet/minecraft/server/command/ExecuteCommand$CommandNumericPredicate;)Lcom/mojang/brigadier/Command;}
     */
-   private static Command<ServerCommandSource> m_vbsipqek(boolean bl, ExecuteCommand.C_teviyeeu arg) {
-      return bl ? context -> {
-         int i = arg.test(context);
+   private static Command<ServerCommandSource> createNumericConditionalHandler(boolean expectMultiplePasses, ExecuteCommand.CommandNumericPredicate predicate) {
+      return expectMultiplePasses ? context -> {
+         int i = predicate.test(context);
          if (i > 0) {
             context.getSource().sendFeedback(() -> Text.translatable("commands.execute.conditional.pass_count", i), false);
             return i;
          } else {
-            throw f_rfjtwcvv.create();
+            throw TEST_FAILED_EXCEPTION.create();
          }
       } : context -> {
-         int i = arg.test(context);
+         int i = predicate.test(context);
          if (i == 0) {
             context.getSource().sendFeedback(() -> Text.translatable("commands.execute.conditional.pass"), false);
             return 1;
          } else {
-            throw f_czgympbj.create(i);
+            throw TEST_FAILED_COUNT_EXCEPTION.create(i);
          }
       };
    }
@@ -789,9 +817,9 @@
 
    /**
     * @mapping {@literal hashed m_odyatsno Lnet/minecraft/unmapped/C_ytmhosha;m_odyatsno(Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/unmapped/C_ytmhosha$C_bhejzcgo;)Z}
-    * @mapping {@literal named m_odyatsno Lnet/minecraft/server/command/ExecuteCommand;m_odyatsno(Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/server/command/ExecuteCommand$C_bhejzcgo;)Z}
+    * @mapping {@literal named testScore Lnet/minecraft/server/command/ExecuteCommand;testScore(Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/server/command/ExecuteCommand$IntBiPredicate;)Z}
     */
-   private static boolean m_odyatsno(CommandContext<ServerCommandSource> context, ExecuteCommand.C_bhejzcgo arg) throws CommandSyntaxException {
+   private static boolean testScore(CommandContext<ServerCommandSource> context, ExecuteCommand.IntBiPredicate predicate) throws CommandSyntaxException {
       ScoreHolder lv = ScoreHolderArgumentType.getScoreHolder(context, "target");
       ScoreboardObjective lv2 = ScoreboardObjectiveArgumentType.getObjective(context, "targetObjective");
       ScoreHolder lv3 = ScoreHolderArgumentType.getScoreHolder(context, "source");
@@ -799,26 +827,26 @@
       Scoreboard lv5 = context.getSource().getServer().getScoreboard();
       ReadableScoreboardScore lv6 = lv5.getScore(lv, lv2);
       ReadableScoreboardScore lv7 = lv5.getScore(lv3, lv4);
-      return lv6 != null && lv7 != null ? arg.test(lv6.getScore(), lv7.getScore()) : false;
+      return lv6 != null && lv7 != null ? predicate.test(lv6.getScore(), lv7.getScore()) : false;
    }
 
    /**
     * @mapping {@literal hashed m_rgbdxqtx Lnet/minecraft/unmapped/C_ytmhosha;m_rgbdxqtx(Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/unmapped/C_nihhkamy$C_mujuochb;)Z}
-    * @mapping {@literal named m_rgbdxqtx Lnet/minecraft/server/command/ExecuteCommand;m_rgbdxqtx(Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/predicate/NumberRange$IntRange;)Z}
+    * @mapping {@literal named testScore Lnet/minecraft/server/command/ExecuteCommand;testScore(Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/predicate/NumberRange$IntRange;)Z}
     */
-   private static boolean m_rgbdxqtx(CommandContext<ServerCommandSource> context, NumberRange.IntRange arg) throws CommandSyntaxException {
+   private static boolean testScore(CommandContext<ServerCommandSource> context, NumberRange.IntRange range) throws CommandSyntaxException {
       ScoreHolder lv = ScoreHolderArgumentType.getScoreHolder(context, "target");
       ScoreboardObjective lv2 = ScoreboardObjectiveArgumentType.getObjective(context, "targetObjective");
       Scoreboard lv3 = context.getSource().getServer().getScoreboard();
       ReadableScoreboardScore lv4 = lv3.getScore(lv, lv2);
-      return lv4 == null ? false : arg.test(lv4.getScore());
+      return lv4 == null ? false : range.test(lv4.getScore());
    }
 
    /**
     * @mapping {@literal hashed m_kkttpcyp Lnet/minecraft/unmapped/C_ytmhosha;m_kkttpcyp(Lnet/minecraft/unmapped/C_pennblrk;Lnet/minecraft/unmapped/C_vqkczpuv;)Z}
-    * @mapping {@literal named m_kkttpcyp Lnet/minecraft/server/command/ExecuteCommand;m_kkttpcyp(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/loot/condition/LootCondition;)Z}
+    * @mapping {@literal named testLootCondition Lnet/minecraft/server/command/ExecuteCommand;testLootCondition(Lnet/minecraft/server/command/ServerCommandSource;Lnet/minecraft/loot/condition/LootCondition;)Z}
     */
-   private static boolean m_kkttpcyp(ServerCommandSource source, LootCondition condition) {
+   private static boolean testLootCondition(ServerCommandSource source, LootCondition condition) {
       ServerWorld lv = source.getWorld();
       LootContextParameterSet lv2 = new LootContextParameterSet.Builder(lv)
          .add(LootContextParameters.ORIGIN, source.getPosition())
@@ -831,49 +859,54 @@
 
    /**
     * @mapping {@literal hashed m_aquegtqz Lnet/minecraft/unmapped/C_ytmhosha;m_aquegtqz(Lcom/mojang/brigadier/context/CommandContext;ZZ)Ljava/util/Collection;}
-    * @mapping {@literal named m_aquegtqz Lnet/minecraft/server/command/ExecuteCommand;m_aquegtqz(Lcom/mojang/brigadier/context/CommandContext;ZZ)Ljava/util/Collection;}
+    * @mapping {@literal named expect Lnet/minecraft/server/command/ExecuteCommand;expect(Lcom/mojang/brigadier/context/CommandContext;ZZ)Ljava/util/Collection;}
     */
-   private static Collection<ServerCommandSource> m_aquegtqz(CommandContext<ServerCommandSource> context, boolean bl, boolean bl2) {
-      return (Collection<ServerCommandSource>)(bl2 == bl ? Collections.singleton(context.getSource()) : Collections.emptyList());
+   private static Collection<ServerCommandSource> expect(CommandContext<ServerCommandSource> context, boolean expected, boolean actual) {
+      return (Collection<ServerCommandSource>)(actual == expected ? Collections.singleton(context.getSource()) : Collections.emptyList());
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_cgnkivma Lnet/minecraft/unmapped/C_ytmhosha;m_cgnkivma(Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/ArgumentBuilder;ZLnet/minecraft/unmapped/C_ytmhosha$C_mxgpijan;)Lcom/mojang/brigadier/builder/ArgumentBuilder;}
+    * @mapping {@literal named addConditionLogic Lnet/minecraft/server/command/ExecuteCommand;addConditionLogic(Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/ArgumentBuilder;ZLnet/minecraft/server/command/ExecuteCommand$CommandPredicate;)Lcom/mojang/brigadier/builder/ArgumentBuilder;}
     */
-   private static ArgumentBuilder<ServerCommandSource, ?> m_cgnkivma(
-      CommandNode<ServerCommandSource> commandNode, ArgumentBuilder<ServerCommandSource, ?> argumentBuilder, boolean bl, ExecuteCommand.C_mxgpijan arg
+   private static ArgumentBuilder<ServerCommandSource, ?> addConditionLogic(
+      CommandNode<ServerCommandSource> redirectTarget,
+      ArgumentBuilder<ServerCommandSource, ?> argumentBuilder,
+      boolean expectedResult,
+      ExecuteCommand.CommandPredicate predicate
    ) {
-      return argumentBuilder.fork(commandNode, context -> m_aquegtqz(context, bl, arg.test(context))).executes(context -> {
-         if (bl == arg.test(context)) {
+      return argumentBuilder.fork(redirectTarget, context -> expect(context, expectedResult, predicate.test(context))).executes(context -> {
+         if (expectedResult == predicate.test(context)) {
             context.getSource().sendFeedback(() -> Text.translatable("commands.execute.conditional.pass"), false);
             return 1;
          } else {
-            throw f_rfjtwcvv.create();
+            throw TEST_FAILED_EXCEPTION.create();
          }
       });
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_fpqvushn Lnet/minecraft/unmapped/C_ytmhosha;m_fpqvushn(Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/ArgumentBuilder;ZZ)Lcom/mojang/brigadier/builder/ArgumentBuilder;}
+    * @mapping {@literal named addBlocksConditionLogic Lnet/minecraft/server/command/ExecuteCommand;addBlocksConditionLogic(Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/ArgumentBuilder;ZZ)Lcom/mojang/brigadier/builder/ArgumentBuilder;}
     */
-   private static ArgumentBuilder<ServerCommandSource, ?> m_fpqvushn(
-      CommandNode<ServerCommandSource> commandNode, ArgumentBuilder<ServerCommandSource, ?> argumentBuilder, boolean bl, boolean bl2
+   private static ArgumentBuilder<ServerCommandSource, ?> addBlocksConditionLogic(
+      CommandNode<ServerCommandSource> redirectTarget, ArgumentBuilder<ServerCommandSource, ?> argumentBuilder, boolean expectedResult, boolean masked
    ) {
-      return argumentBuilder.fork(commandNode, context -> m_aquegtqz(context, bl, m_fgeukwpd(context, bl2).isPresent()))
-         .executes(bl ? context -> m_iivitxex(context, bl2) : context -> m_zsrwabmk(context, bl2));
+      return argumentBuilder.fork(redirectTarget, context -> expect(context, expectedResult, m_fgeukwpd(context, masked).isPresent()))
+         .executes(expectedResult ? context -> m_iivitxex(context, masked) : context -> m_zsrwabmk(context, masked));
    }
 
    /**
     * @mapping {@literal hashed m_iivitxex Lnet/minecraft/unmapped/C_ytmhosha;m_iivitxex(Lcom/mojang/brigadier/context/CommandContext;Z)I}
     * @mapping {@literal named m_iivitxex Lnet/minecraft/server/command/ExecuteCommand;m_iivitxex(Lcom/mojang/brigadier/context/CommandContext;Z)I}
     */
-   private static int m_iivitxex(CommandContext<ServerCommandSource> context, boolean bl) throws CommandSyntaxException {
-      OptionalInt optionalInt = m_fgeukwpd(context, bl);
+   private static int m_iivitxex(CommandContext<ServerCommandSource> context, boolean masked) throws CommandSyntaxException {
+      OptionalInt optionalInt = m_fgeukwpd(context, masked);
       if (optionalInt.isPresent()) {
          context.getSource().sendFeedback(() -> Text.translatable("commands.execute.conditional.pass_count", optionalInt.getAsInt()), false);
          return optionalInt.getAsInt();
       } else {
-         throw f_rfjtwcvv.create();
+         throw TEST_FAILED_EXCEPTION.create();
       }
    }
 
@@ -881,10 +914,10 @@
     * @mapping {@literal hashed m_zsrwabmk Lnet/minecraft/unmapped/C_ytmhosha;m_zsrwabmk(Lcom/mojang/brigadier/context/CommandContext;Z)I}
     * @mapping {@literal named m_zsrwabmk Lnet/minecraft/server/command/ExecuteCommand;m_zsrwabmk(Lcom/mojang/brigadier/context/CommandContext;Z)I}
     */
-   private static int m_zsrwabmk(CommandContext<ServerCommandSource> context, boolean bl) throws CommandSyntaxException {
-      OptionalInt optionalInt = m_fgeukwpd(context, bl);
+   private static int m_zsrwabmk(CommandContext<ServerCommandSource> context, boolean masked) throws CommandSyntaxException {
+      OptionalInt optionalInt = m_fgeukwpd(context, masked);
       if (optionalInt.isPresent()) {
-         throw f_czgympbj.create(optionalInt.getAsInt());
+         throw TEST_FAILED_COUNT_EXCEPTION.create(optionalInt.getAsInt());
       } else {
          context.getSource().sendFeedback(() -> Text.translatable("commands.execute.conditional.pass"), false);
          return 1;
@@ -895,13 +928,13 @@
     * @mapping {@literal hashed m_fgeukwpd Lnet/minecraft/unmapped/C_ytmhosha;m_fgeukwpd(Lcom/mojang/brigadier/context/CommandContext;Z)Ljava/util/OptionalInt;}
     * @mapping {@literal named m_fgeukwpd Lnet/minecraft/server/command/ExecuteCommand;m_fgeukwpd(Lcom/mojang/brigadier/context/CommandContext;Z)Ljava/util/OptionalInt;}
     */
-   private static OptionalInt m_fgeukwpd(CommandContext<ServerCommandSource> context, boolean bl) throws CommandSyntaxException {
+   private static OptionalInt m_fgeukwpd(CommandContext<ServerCommandSource> context, boolean masked) throws CommandSyntaxException {
       return m_uslineqh(
          context.getSource().getWorld(),
          BlockPosArgumentType.getLoadedBlockPos(context, "start"),
          BlockPosArgumentType.getLoadedBlockPos(context, "end"),
          BlockPosArgumentType.getLoadedBlockPos(context, "destination"),
-         bl
+         masked
       );
    }
 
@@ -909,13 +942,13 @@
     * @mapping {@literal hashed m_uslineqh Lnet/minecraft/unmapped/C_ytmhosha;m_uslineqh(Lnet/minecraft/unmapped/C_bdwnwhiu;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;Lnet/minecraft/unmapped/C_hynzadkk;Z)Ljava/util/OptionalInt;}
     * @mapping {@literal named m_uslineqh Lnet/minecraft/server/command/ExecuteCommand;m_uslineqh(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/BlockPos;Z)Ljava/util/OptionalInt;}
     */
-   private static OptionalInt m_uslineqh(ServerWorld world, BlockPos arg2, BlockPos second, BlockPos arg4, boolean bl) throws CommandSyntaxException {
-      BlockBox lv = BlockBox.create(arg2, second);
-      BlockBox lv2 = BlockBox.create(arg4, arg4.add(lv.getDimensions()));
+   private static OptionalInt m_uslineqh(ServerWorld world, BlockPos start, BlockPos end, BlockPos destination, boolean masked) throws CommandSyntaxException {
+      BlockBox lv = BlockBox.create(start, end);
+      BlockBox lv2 = BlockBox.create(destination, destination.add(lv.getDimensions()));
       BlockPos lv3 = new BlockPos(lv2.getMinX() - lv.getMinX(), lv2.getMinY() - lv.getMinY(), lv2.getMinZ() - lv.getMinZ());
       int i = lv.getBlockCountX() * lv.getBlockCountY() * lv.getBlockCountZ();
       if (i > 32768) {
-         throw f_vxgbdzir.create(32768, i);
+         throw AREA_TOO_BIG_EXCEPTION.create(32768, i);
       } else {
          DynamicRegistryManager lv4 = world.getRegistryManager();
          int j = 0;
@@ -926,7 +959,7 @@
                   BlockPos lv5 = new BlockPos(m, l, k);
                   BlockPos lv6 = lv5.add(lv3);
                   BlockState lv7 = world.getBlockState(lv5);
-                  if (!bl || !lv7.isOf(Blocks.AIR)) {
+                  if (!masked || !lv7.isOf(Blocks.AIR)) {
                      if (lv7 != world.getBlockState(lv6)) {
                         return OptionalInt.empty();
                      }
@@ -984,34 +1017,35 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_iwgbubaf Lnet/minecraft/unmapped/C_ytmhosha;m_iwgbubaf(Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;}
+    * @mapping {@literal named m_iwgbubaf Lnet/minecraft/server/command/ExecuteCommand;m_iwgbubaf(Lcom/mojang/brigadier/tree/CommandNode;Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;)Lcom/mojang/brigadier/builder/LiteralArgumentBuilder;}
     */
    private static LiteralArgumentBuilder<ServerCommandSource> m_iwgbubaf(
-      CommandNode<ServerCommandSource> commandNode, LiteralArgumentBuilder<ServerCommandSource> literalArgumentBuilder
+      CommandNode<ServerCommandSource> redirectTarget, LiteralArgumentBuilder<ServerCommandSource> argumentBuilder
    ) {
-      return literalArgumentBuilder.then(
+      return argumentBuilder.then(
             CommandManager.literal("owner")
-               .fork(commandNode, m_psknghej(arg -> arg instanceof Tameable lv ? Optional.ofNullable(lv.getOwner()) : Optional.empty()))
+               .fork(redirectTarget, m_psknghej(arg -> arg instanceof Tameable lv ? Optional.ofNullable(lv.getOwner()) : Optional.empty()))
          )
          .then(
             CommandManager.literal("leasher")
-               .fork(commandNode, m_psknghej(arg -> arg instanceof MobEntity lv ? Optional.ofNullable(lv.getHoldingEntity()) : Optional.empty()))
+               .fork(redirectTarget, m_psknghej(arg -> arg instanceof MobEntity lv ? Optional.ofNullable(lv.getHoldingEntity()) : Optional.empty()))
          )
          .then(
             CommandManager.literal("target")
-               .fork(commandNode, m_psknghej(arg -> arg instanceof Targeter lv ? Optional.ofNullable(lv.getTarget()) : Optional.empty()))
+               .fork(redirectTarget, m_psknghej(arg -> arg instanceof Targeter lv ? Optional.ofNullable(lv.getTarget()) : Optional.empty()))
          )
          .then(
             CommandManager.literal("attacker")
-               .fork(commandNode, m_psknghej(arg -> arg instanceof Attackable lv ? Optional.ofNullable(lv.getLastAttacker()) : Optional.empty()))
+               .fork(redirectTarget, m_psknghej(arg -> arg instanceof Attackable lv ? Optional.ofNullable(lv.getLastAttacker()) : Optional.empty()))
          )
-         .then(CommandManager.literal("vehicle").fork(commandNode, m_psknghej(arg -> Optional.ofNullable(arg.getVehicle()))))
-         .then(CommandManager.literal("controller").fork(commandNode, m_psknghej(arg -> Optional.ofNullable(arg.getPrimaryPassenger()))))
+         .then(CommandManager.literal("vehicle").fork(redirectTarget, m_psknghej(arg -> Optional.ofNullable(arg.getVehicle()))))
+         .then(CommandManager.literal("controller").fork(redirectTarget, m_psknghej(arg -> Optional.ofNullable(arg.getPrimaryPassenger()))))
          .then(
             CommandManager.literal("origin")
-               .fork(commandNode, m_psknghej(arg -> arg instanceof Ownable lv ? Optional.ofNullable(lv.getOwner()) : Optional.empty()))
+               .fork(redirectTarget, m_psknghej(arg -> arg instanceof Ownable lv ? Optional.ofNullable(lv.getOwner()) : Optional.empty()))
          )
-         .then(CommandManager.literal("passengers").fork(commandNode, m_wvnlazco(arg -> arg.getPassengerList().stream())));
+         .then(CommandManager.literal("passengers").fork(redirectTarget, m_wvnlazco(arg -> arg.getPassengerList().stream())));
    }
 
    /**
@@ -1056,7 +1090,7 @@
                try {
                   list3.add(lv.m_mydomkjw(arg2, arg.getDispatcher()));
                } catch (FormattedException var17) {
-                  throw f_japfbsrr.create(lv.id(), var17.getFormattedMessage());
+                  throw FUNCTION_INSTANTIATION_FAILURE_EXCEPTION.create(lv.id(), var17.getFormattedMessage());
                }
             }
          } catch (CommandSyntaxException var19) {
@@ -1086,18 +1120,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_ytmhosha$C_bhejzcgo}
-    * @mapping {@literal named net/minecraft/server/command/ExecuteCommand$C_bhejzcgo}
-    */
-   @FunctionalInterface
-   interface C_bhejzcgo {
-      /**
-       * Mapping not found
-       */
-      boolean test(int i, int j);
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_ytmhosha$C_golulajf}
     * @mapping {@literal named net/minecraft/server/command/ExecuteCommand$C_golulajf}
     */
@@ -1111,19 +1133,6 @@
    }
 
    /**
-    * @mapping {@literal hashed net/minecraft/unmapped/C_ytmhosha$C_mxgpijan}
-    * @mapping {@literal named net/minecraft/server/command/ExecuteCommand$C_mxgpijan}
-    */
-   @FunctionalInterface
-   interface C_mxgpijan {
-      /**
-       * @mapping {@literal hashed test Lnet/minecraft/unmapped/C_ytmhosha$C_mxgpijan;test(Lcom/mojang/brigadier/context/CommandContext;)Z}
-       * @mapping {@literal named test Lnet/minecraft/server/command/ExecuteCommand$C_mxgpijan;test(Lcom/mojang/brigadier/context/CommandContext;)Z}
-       */
-      boolean test(CommandContext<ServerCommandSource> context) throws CommandSyntaxException;
-   }
-
-   /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_ytmhosha$C_nyvbumvd}
     * @mapping {@literal named net/minecraft/server/command/ExecuteCommand$C_nyvbumvd}
     */
@@ -1167,14 +1176,40 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_ytmhosha$C_teviyeeu}
-    * @mapping {@literal named net/minecraft/server/command/ExecuteCommand$C_teviyeeu}
+    * @mapping {@literal named net/minecraft/server/command/ExecuteCommand$CommandNumericPredicate}
     */
    @FunctionalInterface
-   interface C_teviyeeu {
+   interface CommandNumericPredicate {
       /**
        * @mapping {@literal hashed test Lnet/minecraft/unmapped/C_ytmhosha$C_teviyeeu;test(Lcom/mojang/brigadier/context/CommandContext;)I}
-       * @mapping {@literal named test Lnet/minecraft/server/command/ExecuteCommand$C_teviyeeu;test(Lcom/mojang/brigadier/context/CommandContext;)I}
+       * @mapping {@literal named test Lnet/minecraft/server/command/ExecuteCommand$CommandNumericPredicate;test(Lcom/mojang/brigadier/context/CommandContext;)I}
        */
       int test(CommandContext<ServerCommandSource> context) throws CommandSyntaxException;
    }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_ytmhosha$C_mxgpijan}
+    * @mapping {@literal named net/minecraft/server/command/ExecuteCommand$CommandPredicate}
+    */
+   @FunctionalInterface
+   interface CommandPredicate {
+      /**
+       * @mapping {@literal hashed test Lnet/minecraft/unmapped/C_ytmhosha$C_mxgpijan;test(Lcom/mojang/brigadier/context/CommandContext;)Z}
+       * @mapping {@literal named test Lnet/minecraft/server/command/ExecuteCommand$CommandPredicate;test(Lcom/mojang/brigadier/context/CommandContext;)Z}
+       */
+      boolean test(CommandContext<ServerCommandSource> context) throws CommandSyntaxException;
+   }
+
+   /**
+    * @mapping {@literal hashed net/minecraft/unmapped/C_ytmhosha$C_bhejzcgo}
+    * @mapping {@literal named net/minecraft/server/command/ExecuteCommand$IntBiPredicate}
+    */
+   @FunctionalInterface
+   interface IntBiPredicate {
+      /**
+       * @mapping {@literal hashed test Lnet/minecraft/unmapped/C_ytmhosha$C_bhejzcgo;test(II)Z}
+       * @mapping {@literal named test Lnet/minecraft/server/command/ExecuteCommand$IntBiPredicate;test(II)Z}
+       */
+      boolean test(int a, int b);
+   }
 }


The remaining diff is too long!

Please sign in to comment.