Skip to content

Commit

Permalink
address comments 2!
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Nov 6, 2023
1 parent ce0bae1 commit ddda380
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion mappings/net/minecraft/data/server/tag/TagsProvider.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ CLASS net/minecraft/unmapped/C_hzdskvsx net/minecraft/data/server/tag/TagsProvid
METHOD <init> (Lnet/minecraft/unmapped/C_dgpijqhe;Ljava/util/function/Function;)V
ARG 1 builder
ARG 2 valueToKey
METHOD m_agatuolp add ([Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hzdskvsx$C_wosjfhof;
METHOD m_agatuolp addAll ([Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hzdskvsx$C_wosjfhof;
ARG 1 objects
METHOD m_bwfwpsfu add (Ljava/lang/Object;)Lnet/minecraft/unmapped/C_hzdskvsx$C_wosjfhof;
ARG 1 object
1 change: 0 additions & 1 deletion mappings/net/minecraft/recipe/RecipeCodecThingTODO.mapping
View file

This file was deleted.

3 comments on commit ddda380

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit ddda380, 194 file(s) were updated with 7409 line(s) added and 6291 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.java namedSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.java	2023-11-06 03:58:08.687842755 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.java	2023-11-06 03:56:39.856386457 +0000
@@ -96,7 +96,7 @@
          Block block, ItemPredicate.Builder itemPredicateBuilder, NumberRange.IntRange beeCountRange
       ) {
          return Criteria.BEE_NEST_DESTROYED
-            .m_eenzxdpn(new BeeNestDestroyedCriterion.Conditions(Optional.empty(), block, Optional.of(itemPredicateBuilder.build()), beeCountRange));
+            .create(new BeeNestDestroyedCriterion.Conditions(Optional.empty(), block, Optional.of(itemPredicateBuilder.build()), beeCountRange));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BredAnimalsCriterion.java namedSrc/net/minecraft/advancement/criterion/BredAnimalsCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BredAnimalsCriterion.java	2023-11-06 03:58:08.607843251 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BredAnimalsCriterion.java	2023-11-06 03:56:39.768386991 +0000
@@ -75,7 +75,7 @@
        * Mapping not found
        */
       public static AdvancementCriterion<BredAnimalsCriterion.Conditions> m_tslxiglw() {
-         return Criteria.BRED_ANIMALS.m_eenzxdpn(new BredAnimalsCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()));
+         return Criteria.BRED_ANIMALS.create(new BredAnimalsCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty(), Optional.empty()));
       }
 
       /**
@@ -83,7 +83,7 @@
        */
       public static AdvancementCriterion<BredAnimalsCriterion.Conditions> m_rwdliwdp(EntityPredicate.Builder arg) {
          return Criteria.BRED_ANIMALS
-            .m_eenzxdpn(new BredAnimalsCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg))));
+            .create(new BredAnimalsCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg))));
       }
 
       /**
@@ -93,7 +93,7 @@
          Optional<EntityPredicate> optional, Optional<EntityPredicate> optional2, Optional<EntityPredicate> optional3
       ) {
          return Criteria.BRED_ANIMALS
-            .m_eenzxdpn(
+            .create(
                new BredAnimalsCriterion.Conditions(
                   Optional.empty(), EntityPredicate.m_qjfpptij(optional), EntityPredicate.m_qjfpptij(optional2), EntityPredicate.m_qjfpptij(optional3)
                )
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/BrewedPotionCriterion.java namedSrc/net/minecraft/advancement/criterion/BrewedPotionCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/BrewedPotionCriterion.java	2023-11-06 03:58:08.631843102 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BrewedPotionCriterion.java	2023-11-06 03:56:39.792386845 +0000
@@ -66,7 +66,7 @@
        * @mapping {@literal named any Lnet/minecraft/advancement/criterion/BrewedPotionCriterion$Conditions;any()Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<BrewedPotionCriterion.Conditions> any() {
-         return Criteria.BREWED_POTION.m_eenzxdpn(new BrewedPotionCriterion.Conditions(Optional.empty(), null));
+         return Criteria.BREWED_POTION.create(new BrewedPotionCriterion.Conditions(Optional.empty(), null));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterion.java namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterion.java	2023-11-06 03:58:08.627843127 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterion.java	2023-11-06 03:56:39.788386869 +0000
@@ -68,14 +68,14 @@
        * Mapping not found
        */
       public static AdvancementCriterion<ChangedDimensionCriterion.Conditions> m_xxwoiigy() {
-         return Criteria.CHANGED_DIMENSION.m_eenzxdpn(new ChangedDimensionCriterion.Conditions(Optional.empty(), null, null));
+         return Criteria.CHANGED_DIMENSION.create(new ChangedDimensionCriterion.Conditions(Optional.empty(), null, null));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<ChangedDimensionCriterion.Conditions> m_adljdsut(RegistryKey<World> arg, RegistryKey<World> arg2) {
-         return Criteria.CHANGED_DIMENSION.m_eenzxdpn(new ChangedDimensionCriterion.Conditions(Optional.empty(), arg, arg2));
+         return Criteria.CHANGED_DIMENSION.create(new ChangedDimensionCriterion.Conditions(Optional.empty(), arg, arg2));
       }
 
       /**
@@ -83,7 +83,7 @@
        * @mapping {@literal named to Lnet/minecraft/advancement/criterion/ChangedDimensionCriterion$Conditions;to(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<ChangedDimensionCriterion.Conditions> to(RegistryKey<World> to) {
-         return Criteria.CHANGED_DIMENSION.m_eenzxdpn(new ChangedDimensionCriterion.Conditions(Optional.empty(), null, to));
+         return Criteria.CHANGED_DIMENSION.create(new ChangedDimensionCriterion.Conditions(Optional.empty(), null, to));
       }
 
       /**
@@ -91,7 +91,7 @@
        * @mapping {@literal named from Lnet/minecraft/advancement/criterion/ChangedDimensionCriterion$Conditions;from(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<ChangedDimensionCriterion.Conditions> from(RegistryKey<World> from) {
-         return Criteria.CHANGED_DIMENSION.m_eenzxdpn(new ChangedDimensionCriterion.Conditions(Optional.empty(), from, null));
+         return Criteria.CHANGED_DIMENSION.create(new ChangedDimensionCriterion.Conditions(Optional.empty(), from, null));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterion.java namedSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterion.java	2023-11-06 03:58:08.663842904 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterion.java	2023-11-06 03:56:39.832386602 +0000
@@ -63,7 +63,7 @@
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/ChanneledLightningCriterion$Conditions;create([Lnet/minecraft/predicate/entity/EntityPredicate$Builder;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<ChanneledLightningCriterion.Conditions> create(EntityPredicate.Builder... args) {
-         return Criteria.CHANNELED_LIGHTNING.m_eenzxdpn(new ChanneledLightningCriterion.Conditions(Optional.empty(), EntityPredicate.m_yxtvlcic(args)));
+         return Criteria.CHANNELED_LIGHTNING.create(new ChanneledLightningCriterion.Conditions(Optional.empty(), EntityPredicate.m_yxtvlcic(args)));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterion.java namedSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterion.java	2023-11-06 03:58:08.603843276 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterion.java	2023-11-06 03:56:39.764387015 +0000
@@ -54,14 +54,14 @@
        * Mapping not found
        */
       public static AdvancementCriterion<ConstructBeaconCriterion.Conditions> m_qhpglljw() {
-         return Criteria.CONSTRUCT_BEACON.m_eenzxdpn(new ConstructBeaconCriterion.Conditions(Optional.empty(), NumberRange.IntRange.ANY));
+         return Criteria.CONSTRUCT_BEACON.create(new ConstructBeaconCriterion.Conditions(Optional.empty(), NumberRange.IntRange.ANY));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<ConstructBeaconCriterion.Conditions> m_lqdrqdwc(NumberRange.IntRange arg) {
-         return Criteria.CONSTRUCT_BEACON.m_eenzxdpn(new ConstructBeaconCriterion.Conditions(Optional.empty(), arg));
+         return Criteria.CONSTRUCT_BEACON.create(new ConstructBeaconCriterion.Conditions(Optional.empty(), arg));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ConsumeItemCriterion.java namedSrc/net/minecraft/advancement/criterion/ConsumeItemCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ConsumeItemCriterion.java	2023-11-06 03:58:08.683842780 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ConsumeItemCriterion.java	2023-11-06 03:56:39.852386481 +0000
@@ -55,7 +55,7 @@
        * Mapping not found
        */
       public static AdvancementCriterion<ConsumeItemCriterion.Conditions> m_bnfgwlrc() {
-         return Criteria.CONSUME_ITEM.m_eenzxdpn(new ConsumeItemCriterion.Conditions(Optional.empty(), Optional.empty()));
+         return Criteria.CONSUME_ITEM.create(new ConsumeItemCriterion.Conditions(Optional.empty(), Optional.empty()));
       }
 
       /**
@@ -69,7 +69,7 @@
        * Mapping not found
        */
       public static AdvancementCriterion<ConsumeItemCriterion.Conditions> m_jaokbhfr(ItemPredicate.Builder arg) {
-         return Criteria.CONSUME_ITEM.m_eenzxdpn(new ConsumeItemCriterion.Conditions(Optional.empty(), Optional.of(arg.build())));
+         return Criteria.CONSUME_ITEM.create(new ConsumeItemCriterion.Conditions(Optional.empty(), Optional.of(arg.build())));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/Criterion.java namedSrc/net/minecraft/advancement/criterion/Criterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/Criterion.java	2023-11-06 03:58:08.663842904 +0000
+++ namedSrc/net/minecraft/advancement/criterion/Criterion.java	2023-11-06 03:56:39.832386602 +0000
@@ -36,10 +36,11 @@
    T conditionsFromJson(JsonObject obj, AdvancementEntityPredicateDeserializer predicateDeserializer);
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_eenzxdpn Lnet/minecraft/unmapped/C_mysyaxfs;m_eenzxdpn(Lnet/minecraft/unmapped/C_zkhebbek;)Lnet/minecraft/unmapped/C_rzypsigz;}
+    * @mapping {@literal named create Lnet/minecraft/advancement/criterion/Criterion;create(Lnet/minecraft/advancement/criterion/CriterionConditions;)Lnet/minecraft/advancement/AdvancementCriterion;}
     */
-   default AdvancementCriterion<T> m_eenzxdpn(T arg) {
-      return new AdvancementCriterion<>(this, arg);
+   default AdvancementCriterion<T> create(T conditions) {
+      return new AdvancementCriterion<>(this, conditions);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.java namedSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.java	2023-11-06 03:58:08.675842829 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.java	2023-11-06 03:56:39.844386529 +0000
@@ -67,7 +67,7 @@
        * @mapping {@literal named any Lnet/minecraft/advancement/criterion/CuredZombieVillagerCriterion$Conditions;any()Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<CuredZombieVillagerCriterion.Conditions> any() {
-         return Criteria.CURED_ZOMBIE_VILLAGER.m_eenzxdpn(new CuredZombieVillagerCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
+         return Criteria.CURED_ZOMBIE_VILLAGER.create(new CuredZombieVillagerCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EffectsChangedCriterion.java namedSrc/net/minecraft/advancement/criterion/EffectsChangedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EffectsChangedCriterion.java	2023-11-06 03:58:08.699842681 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EffectsChangedCriterion.java	2023-11-06 03:56:39.868386384 +0000
@@ -68,7 +68,7 @@
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/EffectsChangedCriterion$Conditions;create(Lnet/minecraft/predicate/entity/EntityEffectPredicate$C_tmpwnbuk;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<EffectsChangedCriterion.Conditions> create(EntityEffectPredicate.C_tmpwnbuk arg) {
-         return Criteria.EFFECTS_CHANGED.m_eenzxdpn(new EffectsChangedCriterion.Conditions(Optional.empty(), arg.m_iuvsanzp(), Optional.empty()));
+         return Criteria.EFFECTS_CHANGED.create(new EffectsChangedCriterion.Conditions(Optional.empty(), arg.m_iuvsanzp(), Optional.empty()));
       }
 
       /**
@@ -77,7 +77,7 @@
        */
       public static AdvancementCriterion<EffectsChangedCriterion.Conditions> create(EntityPredicate.Builder arg) {
          return Criteria.EFFECTS_CHANGED
-            .m_eenzxdpn(new EffectsChangedCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.of(EntityPredicate.m_wwfhkpji(arg.build()))));
+            .create(new EffectsChangedCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.of(EntityPredicate.m_wwfhkpji(arg.build()))));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EnchantedItemCriterion.java namedSrc/net/minecraft/advancement/criterion/EnchantedItemCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnchantedItemCriterion.java	2023-11-06 03:58:08.643843028 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnchantedItemCriterion.java	2023-11-06 03:56:39.804386772 +0000
@@ -64,7 +64,7 @@
        * @mapping {@literal named any Lnet/minecraft/advancement/criterion/EnchantedItemCriterion$Conditions;any()Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<EnchantedItemCriterion.Conditions> any() {
-         return Criteria.ENCHANTED_ITEM.m_eenzxdpn(new EnchantedItemCriterion.Conditions(Optional.empty(), Optional.empty(), NumberRange.IntRange.ANY));
+         return Criteria.ENCHANTED_ITEM.create(new EnchantedItemCriterion.Conditions(Optional.empty(), Optional.empty(), NumberRange.IntRange.ANY));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterion.java namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EnterBlockCriterion.java	2023-11-06 03:58:08.663842904 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterion.java	2023-11-06 03:56:39.832386602 +0000
@@ -90,7 +90,7 @@
        * @mapping {@literal named block Lnet/minecraft/advancement/criterion/EnterBlockCriterion$Conditions;block(Lnet/minecraft/block/Block;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<EnterBlockCriterion.Conditions> block(Block block) {
-         return Criteria.ENTER_BLOCK.m_eenzxdpn(new EnterBlockCriterion.Conditions(Optional.empty(), block, Optional.empty()));
+         return Criteria.ENTER_BLOCK.create(new EnterBlockCriterion.Conditions(Optional.empty(), block, Optional.empty()));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.java namedSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.java	2023-11-06 03:58:08.655842954 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.java	2023-11-06 03:56:39.816386699 +0000
@@ -55,21 +55,21 @@
        * Mapping not found
        */
       public static AdvancementCriterion<EntityHurtPlayerCriterion.Conditions> m_wrrkjjlx() {
-         return Criteria.ENTITY_HURT_PLAYER.m_eenzxdpn(new EntityHurtPlayerCriterion.Conditions(Optional.empty(), Optional.empty()));
+         return Criteria.ENTITY_HURT_PLAYER.create(new EntityHurtPlayerCriterion.Conditions(Optional.empty(), Optional.empty()));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<EntityHurtPlayerCriterion.Conditions> m_tunbavbi(DamagePredicate arg) {
-         return Criteria.ENTITY_HURT_PLAYER.m_eenzxdpn(new EntityHurtPlayerCriterion.Conditions(Optional.empty(), Optional.of(arg)));
+         return Criteria.ENTITY_HURT_PLAYER.create(new EntityHurtPlayerCriterion.Conditions(Optional.empty(), Optional.of(arg)));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<EntityHurtPlayerCriterion.Conditions> m_ckqvihhp(DamagePredicate.Builder arg) {
-         return Criteria.ENTITY_HURT_PLAYER.m_eenzxdpn(new EntityHurtPlayerCriterion.Conditions(Optional.empty(), Optional.of(arg.build())));
+         return Criteria.ENTITY_HURT_PLAYER.create(new EntityHurtPlayerCriterion.Conditions(Optional.empty(), Optional.of(arg.build())));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/FilledBucketCriterion.java namedSrc/net/minecraft/advancement/criterion/FilledBucketCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/FilledBucketCriterion.java	2023-11-06 03:58:08.683842780 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FilledBucketCriterion.java	2023-11-06 03:56:39.852386481 +0000
@@ -56,7 +56,7 @@
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/FilledBucketCriterion$Conditions;create(Lnet/minecraft/predicate/item/ItemPredicate$Builder;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<FilledBucketCriterion.Conditions> create(ItemPredicate.Builder arg) {
-         return Criteria.FILLED_BUCKET.m_eenzxdpn(new FilledBucketCriterion.Conditions(Optional.empty(), Optional.of(arg.build())));
+         return Criteria.FILLED_BUCKET.create(new FilledBucketCriterion.Conditions(Optional.empty(), Optional.of(arg.build())));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterion.java namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterion.java	2023-11-06 03:58:08.747842383 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterion.java	2023-11-06 03:56:39.924386044 +0000
@@ -83,7 +83,7 @@
          Optional<ItemPredicate> optional, Optional<EntityPredicate> optional2, Optional<ItemPredicate> optional3
       ) {
          return Criteria.FISHING_ROD_HOOKED
-            .m_eenzxdpn(new FishingRodHookedCriterion.Conditions(Optional.empty(), optional, EntityPredicate.m_qjfpptij(optional2), optional3));
+            .create(new FishingRodHookedCriterion.Conditions(Optional.empty(), optional, EntityPredicate.m_qjfpptij(optional2), optional3));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/InventoryChangedCriterion.java namedSrc/net/minecraft/advancement/criterion/InventoryChangedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/InventoryChangedCriterion.java	2023-11-06 03:58:08.659842929 +0000
+++ namedSrc/net/minecraft/advancement/criterion/InventoryChangedCriterion.java	2023-11-06 03:56:39.824386651 +0000
@@ -119,7 +119,7 @@
        */
       public static AdvancementCriterion<InventoryChangedCriterion.Conditions> m_vsjhnjag(ItemPredicate... args) {
          return Criteria.INVENTORY_CHANGED
-            .m_eenzxdpn(
+            .create(
                new InventoryChangedCriterion.Conditions(
                   Optional.empty(), NumberRange.IntRange.ANY, NumberRange.IntRange.ANY, NumberRange.IntRange.ANY, List.of(args)
                )
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.java namedSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.java	2023-11-06 03:58:08.751842358 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.java	2023-11-06 03:56:39.928386020 +0000
@@ -79,7 +79,7 @@
       public static AdvancementCriterion<ItemDurabilityChangedCriterion.Conditions> m_pxxqscii(
          Optional<C_ctsfmifk> optional, Optional<ItemPredicate> optional2, NumberRange.IntRange arg
       ) {
-         return Criteria.ITEM_DURABILITY_CHANGED.m_eenzxdpn(new ItemDurabilityChangedCriterion.Conditions(optional, optional2, arg, NumberRange.IntRange.ANY));
+         return Criteria.ITEM_DURABILITY_CHANGED.create(new ItemDurabilityChangedCriterion.Conditions(optional, optional2, arg, NumberRange.IntRange.ANY));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.java namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.java	2023-11-06 03:58:08.643843028 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.java	2023-11-06 03:56:39.804386772 +0000
@@ -83,7 +83,7 @@
        */
       public static AdvancementCriterion<ItemUsedOnLocationCriterion.Conditions> m_rvjgbvha(Block block) {
          C_ctsfmifk lv = C_ctsfmifk.m_bedcmskq(BlockStatePropertyLootCondition.builder(block).build());
-         return Criteria.PLACED_BLOCK.m_eenzxdpn(new ItemUsedOnLocationCriterion.Conditions(Optional.empty(), Optional.of(lv)));
+         return Criteria.PLACED_BLOCK.create(new ItemUsedOnLocationCriterion.Conditions(Optional.empty(), Optional.of(lv)));
       }
 
       /**
@@ -91,7 +91,7 @@
        */
       public static AdvancementCriterion<ItemUsedOnLocationCriterion.Conditions> m_nzqiyvyf(LootCondition.Builder... args) {
          C_ctsfmifk lv = C_ctsfmifk.m_bedcmskq((LootCondition[])Arrays.stream(args).map(LootCondition.Builder::build).toArray(i -> new LootCondition[i]));
-         return Criteria.PLACED_BLOCK.m_eenzxdpn(new ItemUsedOnLocationCriterion.Conditions(Optional.empty(), Optional.of(lv)));
+         return Criteria.PLACED_BLOCK.create(new ItemUsedOnLocationCriterion.Conditions(Optional.empty(), Optional.of(lv)));
       }
 
       /**
@@ -106,14 +106,14 @@
        * Mapping not found
        */
       public static AdvancementCriterion<ItemUsedOnLocationCriterion.Conditions> m_ttkuarch(LocationPredicate.Builder arg, ItemPredicate.Builder arg2) {
-         return Criteria.ITEM_USED_ON_BLOCK.m_eenzxdpn(m_skgrrvto(arg, arg2));
+         return Criteria.ITEM_USED_ON_BLOCK.create(m_skgrrvto(arg, arg2));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<ItemUsedOnLocationCriterion.Conditions> m_bnnjqxwe(LocationPredicate.Builder arg, ItemPredicate.Builder arg2) {
-         return Criteria.ALLAY_DROP_ITEM_ON_BLOCK.m_eenzxdpn(m_skgrrvto(arg, arg2));
+         return Criteria.ALLAY_DROP_ITEM_ON_BLOCK.create(m_skgrrvto(arg, arg2));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.java namedSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.java	2023-11-06 03:58:08.683842780 +0000
+++ namedSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.java	2023-11-06 03:56:39.852386481 +0000
@@ -80,14 +80,14 @@
        */
       public static AdvancementCriterion<KilledByCrossbowCriterion.Conditions> m_sqvintkl(EntityPredicate.Builder... args) {
          return Criteria.KILLED_BY_CROSSBOW
-            .m_eenzxdpn(new KilledByCrossbowCriterion.Conditions(Optional.empty(), EntityPredicate.m_yxtvlcic(args), NumberRange.IntRange.ANY));
+            .create(new KilledByCrossbowCriterion.Conditions(Optional.empty(), EntityPredicate.m_yxtvlcic(args), NumberRange.IntRange.ANY));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<KilledByCrossbowCriterion.Conditions> m_hgdnexqb(NumberRange.IntRange arg) {
-         return Criteria.KILLED_BY_CROSSBOW.m_eenzxdpn(new KilledByCrossbowCriterion.Conditions(Optional.empty(), List.of(), arg));
+         return Criteria.KILLED_BY_CROSSBOW.create(new KilledByCrossbowCriterion.Conditions(Optional.empty(), List.of(), arg));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LevitationCriterion.java namedSrc/net/minecraft/advancement/criterion/LevitationCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LevitationCriterion.java	2023-11-06 03:58:08.631843102 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LevitationCriterion.java	2023-11-06 03:56:39.792386845 +0000
@@ -64,7 +64,7 @@
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/LevitationCriterion$Conditions;create(Lnet/minecraft/predicate/entity/DistancePredicate;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<LevitationCriterion.Conditions> create(DistancePredicate distance) {
-         return Criteria.LEVITATION.m_eenzxdpn(new LevitationCriterion.Conditions(Optional.empty(), Optional.of(distance), NumberRange.IntRange.ANY));
+         return Criteria.LEVITATION.create(new LevitationCriterion.Conditions(Optional.empty(), Optional.of(distance), NumberRange.IntRange.ANY));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LightningStrikeCriterion.java namedSrc/net/minecraft/advancement/criterion/LightningStrikeCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LightningStrikeCriterion.java	2023-11-06 03:58:08.651842978 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LightningStrikeCriterion.java	2023-11-06 03:56:39.812386724 +0000
@@ -73,7 +73,7 @@
          Optional<EntityPredicate> optional, Optional<EntityPredicate> optional2
       ) {
          return Criteria.LIGHTNING_STRIKE
-            .m_eenzxdpn(new LightningStrikeCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), EntityPredicate.m_qjfpptij(optional2)));
+            .create(new LightningStrikeCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), EntityPredicate.m_qjfpptij(optional2)));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/LocationCriterion.java namedSrc/net/minecraft/advancement/criterion/LocationCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/LocationCriterion.java	2023-11-06 03:58:08.691842730 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LocationCriterion.java	2023-11-06 03:56:39.860386432 +0000
@@ -53,21 +53,21 @@
        */
       public static AdvancementCriterion<LocationCriterion.Conditions> m_rawiyhxg(LocationPredicate.Builder arg) {
          return Criteria.LOCATION
-            .m_eenzxdpn(new LocationCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(EntityPredicate.Builder.create().location(arg)))));
+            .create(new LocationCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(EntityPredicate.Builder.create().location(arg)))));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<LocationCriterion.Conditions> m_ntewpyiq(EntityPredicate.Builder arg) {
-         return Criteria.LOCATION.m_eenzxdpn(new LocationCriterion.Conditions(Optional.of(EntityPredicate.m_wwfhkpji(arg.build()))));
+         return Criteria.LOCATION.create(new LocationCriterion.Conditions(Optional.of(EntityPredicate.m_wwfhkpji(arg.build()))));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<LocationCriterion.Conditions> m_xcudirzs(Optional<EntityPredicate> optional) {
-         return Criteria.LOCATION.m_eenzxdpn(new LocationCriterion.Conditions(EntityPredicate.m_qjfpptij(optional)));
+         return Criteria.LOCATION.create(new LocationCriterion.Conditions(EntityPredicate.m_qjfpptij(optional)));
       }
 
       /**
@@ -75,7 +75,7 @@
        * @mapping {@literal named createInBed Lnet/minecraft/advancement/criterion/LocationCriterion$Conditions;createInBed()Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<LocationCriterion.Conditions> createInBed() {
-         return Criteria.SLEPT_IN_BED.m_eenzxdpn(new LocationCriterion.Conditions(Optional.empty()));
+         return Criteria.SLEPT_IN_BED.create(new LocationCriterion.Conditions(Optional.empty()));
       }
 
       /**
@@ -83,7 +83,7 @@
        * @mapping {@literal named createHeroOfTheVillage Lnet/minecraft/advancement/criterion/LocationCriterion$Conditions;createHeroOfTheVillage()Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<LocationCriterion.Conditions> createHeroOfTheVillage() {
-         return Criteria.HERO_OF_THE_VILLAGE.m_eenzxdpn(new LocationCriterion.Conditions(Optional.empty()));
+         return Criteria.HERO_OF_THE_VILLAGE.create(new LocationCriterion.Conditions(Optional.empty()));
       }
 
       /**
@@ -91,7 +91,7 @@
        * @mapping {@literal named createAvoidVibration Lnet/minecraft/advancement/criterion/LocationCriterion$Conditions;createAvoidVibration()Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<LocationCriterion.Conditions> createAvoidVibration() {
-         return Criteria.AVOID_VIBRATION.m_eenzxdpn(new LocationCriterion.Conditions(Optional.empty()));
+         return Criteria.AVOID_VIBRATION.create(new LocationCriterion.Conditions(Optional.empty()));
       }
 
       /**
@@ -99,7 +99,7 @@
        * @mapping {@literal named createTick Lnet/minecraft/advancement/criterion/LocationCriterion$Conditions;createTick()Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<LocationCriterion.Conditions> createTick() {
-         return Criteria.TICK.m_eenzxdpn(new LocationCriterion.Conditions(Optional.empty()));
+         return Criteria.TICK.create(new LocationCriterion.Conditions(Optional.empty()));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/OnKilledCriterion.java namedSrc/net/minecraft/advancement/criterion/OnKilledCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/OnKilledCriterion.java	2023-11-06 03:58:08.651842978 +0000
+++ namedSrc/net/minecraft/advancement/criterion/OnKilledCriterion.java	2023-11-06 03:56:39.816386699 +0000
@@ -67,7 +67,7 @@
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_wernpkjz(Optional<EntityPredicate> optional) {
          return Criteria.PLAYER_KILLED_ENTITY
-            .m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), Optional.empty()));
+            .create(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), Optional.empty()));
       }
 
       /**
@@ -75,21 +75,21 @@
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_kegmmdjd(EntityPredicate.Builder arg) {
          return Criteria.PLAYER_KILLED_ENTITY
-            .m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), Optional.empty()));
+            .create(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), Optional.empty()));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_wtnmmkkr() {
-         return Criteria.PLAYER_KILLED_ENTITY.m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
+         return Criteria.PLAYER_KILLED_ENTITY.create(new OnKilledCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_cybheuky(Optional<EntityPredicate> optional, Optional<DamageSourcePredicate> optional2) {
-         return Criteria.PLAYER_KILLED_ENTITY.m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), optional2));
+         return Criteria.PLAYER_KILLED_ENTITY.create(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), optional2));
       }
 
       /**
@@ -97,7 +97,7 @@
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_oeeafnap(EntityPredicate.Builder arg, Optional<DamageSourcePredicate> optional) {
          return Criteria.PLAYER_KILLED_ENTITY
-            .m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), optional));
+            .create(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), optional));
       }
 
       /**
@@ -105,7 +105,7 @@
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_qdmqvcwc(Optional<EntityPredicate> optional, DamageSourcePredicate.Builder arg) {
          return Criteria.PLAYER_KILLED_ENTITY
-            .m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), Optional.of(arg.build())));
+            .create(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), Optional.of(arg.build())));
       }
 
       /**
@@ -113,7 +113,7 @@
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_wheidqqn(EntityPredicate.Builder arg, DamageSourcePredicate.Builder arg2) {
          return Criteria.PLAYER_KILLED_ENTITY
-            .m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), Optional.of(arg2.build())));
+            .create(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), Optional.of(arg2.build())));
       }
 
       /**
@@ -121,7 +121,7 @@
        * @mapping {@literal named createPlayerKilledEntityNearSculkCatalyst Lnet/minecraft/advancement/criterion/OnKilledCriterion$Conditions;createPlayerKilledEntityNearSculkCatalyst()Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> createPlayerKilledEntityNearSculkCatalyst() {
-         return Criteria.KILL_MOB_NEAR_SCULK_CATALYST.m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
+         return Criteria.KILL_MOB_NEAR_SCULK_CATALYST.create(new OnKilledCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
       }
 
       /**
@@ -129,7 +129,7 @@
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_mvkabtat(Optional<EntityPredicate> optional) {
          return Criteria.ENTITY_KILLED_PLAYER
-            .m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), Optional.empty()));
+            .create(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), Optional.empty()));
       }
 
       /**
@@ -137,21 +137,21 @@
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_bkjcuoir(EntityPredicate.Builder arg) {
          return Criteria.ENTITY_KILLED_PLAYER
-            .m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), Optional.empty()));
+            .create(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), Optional.empty()));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_clrnoerc() {
-         return Criteria.ENTITY_KILLED_PLAYER.m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
+         return Criteria.ENTITY_KILLED_PLAYER.create(new OnKilledCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_solqanzo(Optional<EntityPredicate> optional, Optional<DamageSourcePredicate> optional2) {
-         return Criteria.ENTITY_KILLED_PLAYER.m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), optional2));
+         return Criteria.ENTITY_KILLED_PLAYER.create(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), optional2));
       }
 
       /**
@@ -159,7 +159,7 @@
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_rlihhijt(EntityPredicate.Builder arg, Optional<DamageSourcePredicate> optional) {
          return Criteria.ENTITY_KILLED_PLAYER
-            .m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), optional));
+            .create(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), optional));
       }
 
       /**
@@ -167,7 +167,7 @@
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_kmtjpvgs(Optional<EntityPredicate> optional, DamageSourcePredicate.Builder arg) {
          return Criteria.ENTITY_KILLED_PLAYER
-            .m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), Optional.of(arg.build())));
+            .create(new OnKilledCriterion.Conditions(Optional.empty(), EntityPredicate.m_qjfpptij(optional), Optional.of(arg.build())));
       }
 
       /**
@@ -175,7 +175,7 @@
        */
       public static AdvancementCriterion<OnKilledCriterion.Conditions> m_wsuqvfnh(EntityPredicate.Builder arg, DamageSourcePredicate.Builder arg2) {
          return Criteria.ENTITY_KILLED_PLAYER
-            .m_eenzxdpn(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), Optional.of(arg2.build())));
+            .create(new OnKilledCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg)), Optional.of(arg2.build())));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.java namedSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.java	2023-11-06 03:58:08.695842705 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.java	2023-11-06 03:56:39.864386408 +0000
@@ -70,7 +70,7 @@
       public static AdvancementCriterion<PickedUpThrownItemCriterion.Conditions> createPickedUpByEntity(
          C_ctsfmifk arg, Optional<ItemPredicate> optional, Optional<C_ctsfmifk> optional2
       ) {
-         return Criteria.THROWN_ITEM_PICKED_UP_BY_ENTITY.m_eenzxdpn(new PickedUpThrownItemCriterion.Conditions(Optional.of(arg), optional, optional2));
+         return Criteria.THROWN_ITEM_PICKED_UP_BY_ENTITY.create(new PickedUpThrownItemCriterion.Conditions(Optional.of(arg), optional, optional2));
       }
 
       /**
@@ -80,7 +80,7 @@
       public static AdvancementCriterion<PickedUpThrownItemCriterion.Conditions> createPickedUpByPlayer(
          Optional<C_ctsfmifk> optional, Optional<ItemPredicate> optional2, Optional<C_ctsfmifk> optional3
       ) {
-         return Criteria.THROWN_ITEM_PICKED_UP_BY_PLAYER.m_eenzxdpn(new PickedUpThrownItemCriterion.Conditions(optional, optional2, optional3));
+         return Criteria.THROWN_ITEM_PICKED_UP_BY_PLAYER.create(new PickedUpThrownItemCriterion.Conditions(optional, optional2, optional3));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.java namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.java	2023-11-06 03:58:08.663842904 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.java	2023-11-06 03:56:39.828386627 +0000
@@ -58,7 +58,7 @@
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion$Conditions;create(Lnet/minecraft/util/Identifier;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<PlayerGeneratesContainerLootCriterion.Conditions> create(Identifier lootTable) {
-         return Criteria.PLAYER_GENERATES_CONTAINER_LOOT.m_eenzxdpn(new PlayerGeneratesContainerLootCriterion.Conditions(Optional.empty(), lootTable));
+         return Criteria.PLAYER_GENERATES_CONTAINER_LOOT.create(new PlayerGeneratesContainerLootCriterion.Conditions(Optional.empty(), lootTable));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.java namedSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.java	2023-11-06 03:58:08.611843227 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.java	2023-11-06 03:56:39.776386942 +0000
@@ -66,21 +66,21 @@
        * Mapping not found
        */
       public static AdvancementCriterion<PlayerHurtEntityCriterion.Conditions> m_rfnemosy() {
-         return Criteria.PLAYER_HURT_ENTITY.m_eenzxdpn(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
+         return Criteria.PLAYER_HURT_ENTITY.create(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<PlayerHurtEntityCriterion.Conditions> m_flcbgodf(Optional<DamagePredicate> optional) {
-         return Criteria.PLAYER_HURT_ENTITY.m_eenzxdpn(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), optional, Optional.empty()));
+         return Criteria.PLAYER_HURT_ENTITY.create(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), optional, Optional.empty()));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<PlayerHurtEntityCriterion.Conditions> m_yfqhvjuf(DamagePredicate.Builder arg) {
-         return Criteria.PLAYER_HURT_ENTITY.m_eenzxdpn(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), Optional.of(arg.build()), Optional.empty()));
+         return Criteria.PLAYER_HURT_ENTITY.create(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), Optional.of(arg.build()), Optional.empty()));
       }
 
       /**
@@ -88,7 +88,7 @@
        */
       public static AdvancementCriterion<PlayerHurtEntityCriterion.Conditions> m_ivjcvnjx(Optional<EntityPredicate> optional) {
          return Criteria.PLAYER_HURT_ENTITY
-            .m_eenzxdpn(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), Optional.empty(), EntityPredicate.m_qjfpptij(optional)));
+            .create(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), Optional.empty(), EntityPredicate.m_qjfpptij(optional)));
       }
 
       /**
@@ -97,8 +97,7 @@
       public static AdvancementCriterion<PlayerHurtEntityCriterion.Conditions> m_qjgbziuh(
          Optional<DamagePredicate> optional, Optional<EntityPredicate> optional2
       ) {
-         return Criteria.PLAYER_HURT_ENTITY
-            .m_eenzxdpn(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), optional, EntityPredicate.m_qjfpptij(optional2)));
+         return Criteria.PLAYER_HURT_ENTITY.create(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), optional, EntityPredicate.m_qjfpptij(optional2)));
       }
 
       /**
@@ -106,7 +105,7 @@
        */
       public static AdvancementCriterion<PlayerHurtEntityCriterion.Conditions> m_vqupybid(DamagePredicate.Builder arg, Optional<EntityPredicate> optional) {
          return Criteria.PLAYER_HURT_ENTITY
-            .m_eenzxdpn(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), Optional.of(arg.build()), EntityPredicate.m_qjfpptij(optional)));
+            .create(new PlayerHurtEntityCriterion.Conditions(Optional.empty(), Optional.of(arg.build()), EntityPredicate.m_qjfpptij(optional)));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.java namedSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.java	2023-11-06 03:58:08.643843028 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.java	2023-11-06 03:56:39.808386748 +0000
@@ -71,7 +71,7 @@
          Optional<C_ctsfmifk> optional, ItemPredicate.Builder arg, Optional<C_ctsfmifk> optional2
       ) {
          return Criteria.PLAYER_INTERACTED_WITH_ENTITY
-            .m_eenzxdpn(new PlayerInteractedWithEntityCriterion.Conditions(optional, Optional.of(arg.build()), optional2));
+            .create(new PlayerInteractedWithEntityCriterion.Conditions(optional, Optional.of(arg.build()), optional2));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterion.java namedSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterion.java	2023-11-06 03:58:08.707842631 +0000
+++ namedSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterion.java	2023-11-06 03:56:39.876386335 +0000
@@ -68,14 +68,14 @@
        */
       public static AdvancementCriterion<RecipeCraftedCriterion.Conditions> m_lioifgzt(Identifier arg, List<ItemPredicate.Builder> list) {
          return Criteria.RECIPE_CRAFTED
-            .m_eenzxdpn(new RecipeCraftedCriterion.Conditions(Optional.empty(), arg, list.stream().map(ItemPredicate.Builder::build).toList()));
+            .create(new RecipeCraftedCriterion.Conditions(Optional.empty(), arg, list.stream().map(ItemPredicate.Builder::build).toList()));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<RecipeCraftedCriterion.Conditions> m_daeektkr(Identifier arg) {
-         return Criteria.RECIPE_CRAFTED.m_eenzxdpn(new RecipeCraftedCriterion.Conditions(Optional.empty(), arg, List.of()));
+         return Criteria.RECIPE_CRAFTED.create(new RecipeCraftedCriterion.Conditions(Optional.empty(), arg, List.of()));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.java namedSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.java	2023-11-06 03:58:08.751842358 +0000
+++ namedSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.java	2023-11-06 03:56:39.928386020 +0000
@@ -37,7 +37,7 @@
     * @mapping {@literal named create Lnet/minecraft/advancement/criterion/RecipeUnlockedCriterion;create(Lnet/minecraft/util/Identifier;)Lnet/minecraft/advancement/AdvancementCriterion;}
     */
    public static AdvancementCriterion<RecipeUnlockedCriterion.Conditions> create(Identifier id) {
-      return Criteria.RECIPE_UNLOCKED.m_eenzxdpn(new RecipeUnlockedCriterion.Conditions(Optional.empty(), id));
+      return Criteria.RECIPE_UNLOCKED.create(new RecipeUnlockedCriterion.Conditions(Optional.empty(), id));
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterion.java namedSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterion.java	2023-11-06 03:58:08.643843028 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterion.java	2023-11-06 03:56:39.804386772 +0000
@@ -56,7 +56,7 @@
        * Mapping not found
        */
       public static AdvancementCriterion<ShotCrossbowCriterion.Conditions> m_gqroykrq(Optional<ItemPredicate> optional) {
-         return Criteria.SHOT_CROSSBOW.m_eenzxdpn(new ShotCrossbowCriterion.Conditions(Optional.empty(), optional));
+         return Criteria.SHOT_CROSSBOW.create(new ShotCrossbowCriterion.Conditions(Optional.empty(), optional));
       }
 
       /**
@@ -64,7 +64,7 @@
        */
       public static AdvancementCriterion<ShotCrossbowCriterion.Conditions> m_xgakdxtg(ItemConvertible arg) {
          return Criteria.SHOT_CROSSBOW
-            .m_eenzxdpn(new ShotCrossbowCriterion.Conditions(Optional.empty(), Optional.of(ItemPredicate.Builder.create().items(arg).build())));
+            .create(new ShotCrossbowCriterion.Conditions(Optional.empty(), Optional.of(ItemPredicate.Builder.create().items(arg).build())));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterion.java namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterion.java	2023-11-06 03:58:08.727842507 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterion.java	2023-11-06 03:56:39.900386189 +0000
@@ -90,7 +90,7 @@
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/SlideDownBlockCriterion$Conditions;create(Lnet/minecraft/block/Block;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<SlideDownBlockCriterion.Conditions> create(Block block) {
-         return Criteria.SLIDE_DOWN_BLOCK.m_eenzxdpn(new SlideDownBlockCriterion.Conditions(Optional.empty(), block, Optional.empty()));
+         return Criteria.SLIDE_DOWN_BLOCK.create(new SlideDownBlockCriterion.Conditions(Optional.empty(), block, Optional.empty()));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/StartedRidingCriterion.java namedSrc/net/minecraft/advancement/criterion/StartedRidingCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/StartedRidingCriterion.java	2023-11-06 03:58:08.623843152 +0000
+++ namedSrc/net/minecraft/advancement/criterion/StartedRidingCriterion.java	2023-11-06 03:56:39.784386894 +0000
@@ -47,7 +47,7 @@
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/StartedRidingCriterion$Conditions;create(Lnet/minecraft/predicate/entity/EntityPredicate$Builder;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<StartedRidingCriterion.Conditions> create(EntityPredicate.Builder player) {
-         return Criteria.STARTED_RIDING.m_eenzxdpn(new StartedRidingCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(player))));
+         return Criteria.STARTED_RIDING.create(new StartedRidingCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(player))));
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/SummonedEntityCriterion.java namedSrc/net/minecraft/advancement/criterion/SummonedEntityCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/SummonedEntityCriterion.java	2023-11-06 03:58:08.663842904 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SummonedEntityCriterion.java	2023-11-06 03:56:39.828386627 +0000
@@ -59,7 +59,7 @@
        */
       public static AdvancementCriterion<SummonedEntityCriterion.Conditions> create(EntityPredicate.Builder summonedEntityPredicateBuilder) {
          return Criteria.SUMMONED_ENTITY
-            .m_eenzxdpn(new SummonedEntityCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(summonedEntityPredicateBuilder))));
+            .create(new SummonedEntityCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(summonedEntityPredicateBuilder))));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TameAnimalCriterion.java namedSrc/net/minecraft/advancement/criterion/TameAnimalCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TameAnimalCriterion.java	2023-11-06 03:58:08.695842705 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TameAnimalCriterion.java	2023-11-06 03:56:39.864386408 +0000
@@ -57,14 +57,14 @@
        * Mapping not found
        */
       public static AdvancementCriterion<TameAnimalCriterion.Conditions> m_zedqjjws() {
-         return Criteria.TAME_ANIMAL.m_eenzxdpn(new TameAnimalCriterion.Conditions(Optional.empty(), Optional.empty()));
+         return Criteria.TAME_ANIMAL.create(new TameAnimalCriterion.Conditions(Optional.empty(), Optional.empty()));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<TameAnimalCriterion.Conditions> m_hlnnlujk(EntityPredicate.Builder arg) {
-         return Criteria.TAME_ANIMAL.m_eenzxdpn(new TameAnimalCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg))));
+         return Criteria.TAME_ANIMAL.create(new TameAnimalCriterion.Conditions(Optional.empty(), Optional.of(EntityPredicate.m_lenpszae(arg))));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TargetHitCriterion.java namedSrc/net/minecraft/advancement/criterion/TargetHitCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TargetHitCriterion.java	2023-11-06 03:58:08.715842581 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TargetHitCriterion.java	2023-11-06 03:56:39.884386287 +0000
@@ -67,7 +67,7 @@
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/TargetHitCriterion$Conditions;create(Lnet/minecraft/predicate/NumberRange$IntRange;Ljava/util/Optional;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<TargetHitCriterion.Conditions> create(NumberRange.IntRange signalStrength, Optional<C_ctsfmifk> optional) {
-         return Criteria.TARGET_HIT.m_eenzxdpn(new TargetHitCriterion.Conditions(Optional.empty(), signalStrength, optional));
+         return Criteria.TARGET_HIT.create(new TargetHitCriterion.Conditions(Optional.empty(), signalStrength, optional));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/TravelCriterion.java namedSrc/net/minecraft/advancement/criterion/TravelCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/TravelCriterion.java	2023-11-06 03:58:08.731842482 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TravelCriterion.java	2023-11-06 03:56:39.904386165 +0000
@@ -70,7 +70,7 @@
          EntityPredicate.Builder entity, DistancePredicate distance, LocationPredicate.Builder arg3
       ) {
          return Criteria.FALL_FROM_HEIGHT
-            .m_eenzxdpn(new TravelCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(entity)), Optional.of(arg3.build()), Optional.of(distance)));
+            .create(new TravelCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(entity)), Optional.of(arg3.build()), Optional.of(distance)));
       }
 
       /**
@@ -79,7 +79,7 @@
        */
       public static AdvancementCriterion<TravelCriterion.Conditions> rideEntityInLava(EntityPredicate.Builder entity, DistancePredicate distance) {
          return Criteria.RIDE_ENTITY_IN_LAVA
-            .m_eenzxdpn(new TravelCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(entity)), Optional.empty(), Optional.of(distance)));
+            .create(new TravelCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(entity)), Optional.empty(), Optional.of(distance)));
       }
 
       /**
@@ -87,7 +87,7 @@
        * @mapping {@literal named netherTravel Lnet/minecraft/advancement/criterion/TravelCriterion$Conditions;netherTravel(Lnet/minecraft/predicate/entity/DistancePredicate;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<TravelCriterion.Conditions> netherTravel(DistancePredicate distance) {
-         return Criteria.NETHER_TRAVEL.m_eenzxdpn(new TravelCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.of(distance)));
+         return Criteria.NETHER_TRAVEL.create(new TravelCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.of(distance)));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/UsedTotemCriterion.java namedSrc/net/minecraft/advancement/criterion/UsedTotemCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/UsedTotemCriterion.java	2023-11-06 03:58:08.735842457 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsedTotemCriterion.java	2023-11-06 03:56:39.908386141 +0000
@@ -56,15 +56,14 @@
        * Mapping not found
        */
       public static AdvancementCriterion<UsedTotemCriterion.Conditions> m_eotjhohv(ItemPredicate arg) {
-         return Criteria.USED_TOTEM.m_eenzxdpn(new UsedTotemCriterion.Conditions(Optional.empty(), Optional.of(arg)));
+         return Criteria.USED_TOTEM.create(new UsedTotemCriterion.Conditions(Optional.empty(), Optional.of(arg)));
       }
 
       /**
        * Mapping not found
        */
       public static AdvancementCriterion<UsedTotemCriterion.Conditions> m_gqfgfzsm(ItemConvertible arg) {
-         return Criteria.USED_TOTEM
-            .m_eenzxdpn(new UsedTotemCriterion.Conditions(Optional.empty(), Optional.of(ItemPredicate.Builder.create().items(arg).build())));
+         return Criteria.USED_TOTEM.create(new UsedTotemCriterion.Conditions(Optional.empty(), Optional.of(ItemPredicate.Builder.create().items(arg).build())));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/UsingItemCriterion.java namedSrc/net/minecraft/advancement/criterion/UsingItemCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/UsingItemCriterion.java	2023-11-06 03:58:08.711842606 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsingItemCriterion.java	2023-11-06 03:56:39.884386287 +0000
@@ -57,7 +57,7 @@
        * @mapping {@literal named create Lnet/minecraft/advancement/criterion/UsingItemCriterion$Conditions;create(Lnet/minecraft/predicate/entity/EntityPredicate$Builder;Lnet/minecraft/predicate/item/ItemPredicate$Builder;)Lnet/minecraft/advancement/AdvancementCriterion;}
        */
       public static AdvancementCriterion<UsingItemCriterion.Conditions> create(EntityPredicate.Builder player, ItemPredicate.Builder item) {
-         return Criteria.USING_ITEM.m_eenzxdpn(new UsingItemCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(player)), Optional.of(item.build())));
+         return Criteria.USING_ITEM.create(new UsingItemCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(player)), Optional.of(item.build())));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/advancement/criterion/VillagerTradeCriterion.java namedSrc/net/minecraft/advancement/criterion/VillagerTradeCriterion.java
--- namedTargetSrc/net/minecraft/advancement/criterion/VillagerTradeCriterion.java	2023-11-06 03:58:08.651842978 +0000
+++ namedSrc/net/minecraft/advancement/criterion/VillagerTradeCriterion.java	2023-11-06 03:56:39.816386699 +0000
@@ -66,7 +66,7 @@
        * Mapping not found
        */
       public static AdvancementCriterion<VillagerTradeCriterion.Conditions> m_omysqoyn() {
-         return Criteria.VILLAGER_TRADE.m_eenzxdpn(new VillagerTradeCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
+         return Criteria.VILLAGER_TRADE.create(new VillagerTradeCriterion.Conditions(Optional.empty(), Optional.empty(), Optional.empty()));
       }
 
       /**
@@ -74,7 +74,7 @@
        */
       public static AdvancementCriterion<VillagerTradeCriterion.Conditions> m_zwpwphkq(EntityPredicate.Builder arg) {
          return Criteria.VILLAGER_TRADE
-            .m_eenzxdpn(new VillagerTradeCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(arg)), Optional.empty(), Optional.empty()));
+            .create(new VillagerTradeCriterion.Conditions(Optional.of(EntityPredicate.m_lenpszae(arg)), Optional.empty(), Optional.empty()));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/block/BambooSaplingBlock.java namedSrc/net/minecraft/block/BambooSaplingBlock.java
--- namedTargetSrc/net/minecraft/block/BambooSaplingBlock.java	2023-11-06 03:58:08.695842705 +0000
+++ namedSrc/net/minecraft/block/BambooSaplingBlock.java	2023-11-06 03:56:39.864386408 +0000
@@ -103,7 +103,7 @@
     */
    @Override
    public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state) {
-      return new ItemStack(Items.f_htfzipcj);
+      return new ItemStack(Items.BAMBOO);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/Block.java namedSrc/net/minecraft/block/Block.java
--- namedTargetSrc/net/minecraft/block/Block.java	2023-11-06 03:58:08.751842358 +0000
+++ namedSrc/net/minecraft/block/Block.java	2023-11-06 03:56:39.928386020 +0000
@@ -406,8 +406,8 @@
          || state.isOf(Blocks.BARRIER)
          || state.isOf(Blocks.CARVED_PUMPKIN)
          || state.isOf(Blocks.JACK_O_LANTERN)
-         || state.isOf(Blocks.f_fqkzrnro)
-         || state.isOf(Blocks.f_cyinnipu)
+         || state.isOf(Blocks.MELON)
+         || state.isOf(Blocks.PUMPKIN)
          || state.isIn(BlockTags.SHULKER_BOXES);
    }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2023-11-06 03:58:08.643843028 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2023-11-06 03:56:39.808386748 +0000
@@ -41,7 +41,6 @@
 import net.minecraft.unmapped.C_bnsqivrz;
 import net.minecraft.unmapped.C_cibvoqed;
 import net.minecraft.unmapped.C_dfahqqqb;
-import net.minecraft.unmapped.C_dmnruvyr;
 import net.minecraft.unmapped.C_evvhndgg;
 import net.minecraft.unmapped.C_hupbiznx;
 import net.minecraft.unmapped.C_itgkwhcl;
@@ -1099,14 +1098,14 @@
     * @mapping {@literal named SPONGE Lnet/minecraft/block/Blocks;SPONGE:Lnet/minecraft/block/Block;}
     */
    public static final Block SPONGE = m_mjiljkwg(
-      "sponge", new SpongeBlock(AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).strength(0.6F).sounds(BlockSoundGroup.f_omznxtjt))
+      "sponge", new SpongeBlock(AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).strength(0.6F).sounds(BlockSoundGroup.BLOCK_SPONGE_BREAK))
    );
    /**
     * @mapping {@literal hashed f_jfwcczyc Lnet/minecraft/unmapped/C_jricjyva;f_jfwcczyc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named WET_SPONGE Lnet/minecraft/block/Blocks;WET_SPONGE:Lnet/minecraft/block/Block;}
     */
    public static final Block WET_SPONGE = m_mjiljkwg(
-      "wet_sponge", new WetSpongeBlock(AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).strength(0.6F).sounds(BlockSoundGroup.f_jexiqfrl))
+      "wet_sponge", new WetSpongeBlock(AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).strength(0.6F).sounds(BlockSoundGroup.BLOCK_WET_SPONGE_BREAK))
    );
    /**
     * @mapping {@literal hashed f_chdxuwwk Lnet/minecraft/unmapped/C_jricjyva;f_chdxuwwk:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -3890,9 +3889,10 @@
       "glass_pane", new PaneBlock(AbstractBlock.Settings.create().instrument(NoteBlockInstrument.HAT).strength(0.3F).sounds(BlockSoundGroup.GLASS).nonOpaque())
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_cyinnipu Lnet/minecraft/unmapped/C_jricjyva;f_cyinnipu:Lnet/minecraft/unmapped/C_mmxmpdoq;}
+    * @mapping {@literal named PUMPKIN Lnet/minecraft/block/Blocks;PUMPKIN:Lnet/minecraft/block/Block;}
     */
-   public static final Block f_cyinnipu = m_ghajpyfj(
+   public static final Block PUMPKIN = m_ghajpyfj(
       C_pyxrohya.PUMPKIN,
       new PumpkinBlock(
          AbstractBlock.Settings.create()
@@ -3904,16 +3904,18 @@
       )
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_fqkzrnro Lnet/minecraft/unmapped/C_jricjyva;f_fqkzrnro:Lnet/minecraft/unmapped/C_mmxmpdoq;}
+    * @mapping {@literal named MELON Lnet/minecraft/block/Blocks;MELON:Lnet/minecraft/block/Block;}
     */
-   public static final Block f_fqkzrnro = m_ghajpyfj(
+   public static final Block MELON = m_ghajpyfj(
       C_pyxrohya.MELON,
       new Block(AbstractBlock.Settings.create().mapColor(MapColor.LIME).strength(1.0F).sounds(BlockSoundGroup.WOOD).pistonBehavior(PistonBehavior.DESTROY))
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ryluqxrm Lnet/minecraft/unmapped/C_jricjyva;f_ryluqxrm:Lnet/minecraft/unmapped/C_mmxmpdoq;}
+    * @mapping {@literal named ATTACHED_PUMPKIN_STEM Lnet/minecraft/block/Blocks;ATTACHED_PUMPKIN_STEM:Lnet/minecraft/block/Block;}
     */
-   public static final Block f_ryluqxrm = m_ghajpyfj(
+   public static final Block ATTACHED_PUMPKIN_STEM = m_ghajpyfj(
       C_pyxrohya.ATTACHED_PUMPKIN_STEM,
       new AttachedStemBlock(
          C_pyxrohya.PUMPKIN_STEM,
@@ -3928,9 +3930,10 @@
       )
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ykctbjyx Lnet/minecraft/unmapped/C_jricjyva;f_ykctbjyx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
+    * @mapping {@literal named ATTACHED_MELON_STEM Lnet/minecraft/block/Blocks;ATTACHED_MELON_STEM:Lnet/minecraft/block/Block;}
     */
-   public static final Block f_ykctbjyx = m_ghajpyfj(
+   public static final Block ATTACHED_MELON_STEM = m_ghajpyfj(
       C_pyxrohya.ATTACHED_MELON_STEM,
       new AttachedStemBlock(
          C_pyxrohya.MELON_STEM,
@@ -3945,9 +3948,10 @@
       )
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_domkrbru Lnet/minecraft/unmapped/C_jricjyva;f_domkrbru:Lnet/minecraft/unmapped/C_mmxmpdoq;}
+    * @mapping {@literal named PUMPKIN_STEM Lnet/minecraft/block/Blocks;PUMPKIN_STEM:Lnet/minecraft/block/Block;}
     */
-   public static final Block f_domkrbru = m_ghajpyfj(
+   public static final Block PUMPKIN_STEM = m_ghajpyfj(
       C_pyxrohya.PUMPKIN_STEM,
       new StemBlock(
          C_pyxrohya.PUMPKIN,
@@ -3963,9 +3967,10 @@
       )
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_bgazwcmd Lnet/minecraft/unmapped/C_jricjyva;f_bgazwcmd:Lnet/minecraft/unmapped/C_mmxmpdoq;}
+    * @mapping {@literal named MELON_STEM Lnet/minecraft/block/Blocks;MELON_STEM:Lnet/minecraft/block/Block;}
     */
-   public static final Block f_bgazwcmd = m_ghajpyfj(
+   public static final Block MELON_STEM = m_ghajpyfj(
       C_pyxrohya.MELON_STEM,
       new StemBlock(
          C_pyxrohya.MELON,
@@ -10205,27 +10210,27 @@
     * @mapping {@literal hashed f_inipdlnx Lnet/minecraft/unmapped/C_jricjyva;f_inipdlnx:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named TUFF_SLAB Lnet/minecraft/block/Blocks;TUFF_SLAB:Lnet/minecraft/block/Block;}
     */
-   public static final Block TUFF_SLAB = m_mjiljkwg("tuff_slab", new SlabBlock(AbstractBlock.Settings.copy(TUFF).requiredFlags(FeatureFlags.f_dmxgtmcy)));
+   public static final Block TUFF_SLAB = m_mjiljkwg("tuff_slab", new SlabBlock(AbstractBlock.Settings.copy(TUFF).requiredFlags(FeatureFlags.UPDATE_1_21)));
    /**
     * @mapping {@literal hashed f_wnbuuszc Lnet/minecraft/unmapped/C_jricjyva;f_wnbuuszc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named TUFF_STAIRS Lnet/minecraft/block/Blocks;TUFF_STAIRS:Lnet/minecraft/block/Block;}
     */
    public static final Block TUFF_STAIRS = m_mjiljkwg(
-      "tuff_stairs", new StairsBlock(TUFF.getDefaultState(), AbstractBlock.Settings.copy(TUFF).requiredFlags(FeatureFlags.f_dmxgtmcy))
+      "tuff_stairs", new StairsBlock(TUFF.getDefaultState(), AbstractBlock.Settings.copy(TUFF).requiredFlags(FeatureFlags.UPDATE_1_21))
    );
    /**
     * @mapping {@literal hashed f_ejochodo Lnet/minecraft/unmapped/C_jricjyva;f_ejochodo:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named TUFF_WALL Lnet/minecraft/block/Blocks;TUFF_WALL:Lnet/minecraft/block/Block;}
     */
    public static final Block TUFF_WALL = m_mjiljkwg(
-      "tuff_wall", new WallBlock(AbstractBlock.Settings.copy(TUFF).solid().requiredFlags(FeatureFlags.f_dmxgtmcy))
+      "tuff_wall", new WallBlock(AbstractBlock.Settings.copy(TUFF).solid().requiredFlags(FeatureFlags.UPDATE_1_21))
    );
    /**
     * @mapping {@literal hashed f_wgwmqzjn Lnet/minecraft/unmapped/C_jricjyva;f_wgwmqzjn:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named POLISHED_TUFF Lnet/minecraft/block/Blocks;POLISHED_TUFF:Lnet/minecraft/block/Block;}
     */
    public static final Block POLISHED_TUFF = m_mjiljkwg(
-      "polished_tuff", new Block(AbstractBlock.Settings.copy(TUFF).sounds(BlockSoundGroup.f_sbhpigwi).requiredFlags(FeatureFlags.f_dmxgtmcy))
+      "polished_tuff", new Block(AbstractBlock.Settings.copy(TUFF).sounds(BlockSoundGroup.BLOCK_POLISHED_TUFF_BREAK).requiredFlags(FeatureFlags.UPDATE_1_21))
    );
    /**
     * @mapping {@literal hashed f_veejltzk Lnet/minecraft/unmapped/C_jricjyva;f_veejltzk:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -10248,13 +10253,13 @@
     * @mapping {@literal hashed f_qgmbinqz Lnet/minecraft/unmapped/C_jricjyva;f_qgmbinqz:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named CHISELED_TUFF Lnet/minecraft/block/Blocks;CHISELED_TUFF:Lnet/minecraft/block/Block;}
     */
-   public static final Block CHISELED_TUFF = m_mjiljkwg("chiseled_tuff", new Block(AbstractBlock.Settings.copy(TUFF).requiredFlags(FeatureFlags.f_dmxgtmcy)));
+   public static final Block CHISELED_TUFF = m_mjiljkwg("chiseled_tuff", new Block(AbstractBlock.Settings.copy(TUFF).requiredFlags(FeatureFlags.UPDATE_1_21)));
    /**
     * @mapping {@literal hashed f_sikgobnc Lnet/minecraft/unmapped/C_jricjyva;f_sikgobnc:Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named TUFF_BRICKS Lnet/minecraft/block/Blocks;TUFF_BRICKS:Lnet/minecraft/block/Block;}
     */
    public static final Block TUFF_BRICKS = m_mjiljkwg(
-      "tuff_bricks", new Block(AbstractBlock.Settings.copy(TUFF).sounds(BlockSoundGroup.f_zihywwst).requiredFlags(FeatureFlags.f_dmxgtmcy))
+      "tuff_bricks", new Block(AbstractBlock.Settings.copy(TUFF).sounds(BlockSoundGroup.BLOCK_TUFF_BRICKS_BREAK).requiredFlags(FeatureFlags.UPDATE_1_21))
    );
    /**
     * @mapping {@literal hashed f_alkwcavh Lnet/minecraft/unmapped/C_jricjyva;f_alkwcavh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -10483,7 +10488,7 @@
     */
    public static final Block OXIDIZED_CHISELED_COPPER = m_mjiljkwg(
       "oxidized_chiseled_copper",
-      new OxidizableBlock(Oxidizable.OxidizationLevel.OXIDIZED, AbstractBlock.Settings.copy(OXIDIZED_COPPER).requiredFlags(FeatureFlags.f_dmxgtmcy))
+      new OxidizableBlock(Oxidizable.OxidizationLevel.OXIDIZED, AbstractBlock.Settings.copy(OXIDIZED_COPPER).requiredFlags(FeatureFlags.UPDATE_1_21))
    );
    /**
     * @mapping {@literal hashed f_xmxejghf Lnet/minecraft/unmapped/C_jricjyva;f_xmxejghf:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -10491,7 +10496,7 @@
     */
    public static final Block WEATHERED_CHISELED_COPPER = m_mjiljkwg(
       "weathered_chiseled_copper",
-      new OxidizableBlock(Oxidizable.OxidizationLevel.WEATHERED, AbstractBlock.Settings.copy(WEATHERED_COPPER).requiredFlags(FeatureFlags.f_dmxgtmcy))
+      new OxidizableBlock(Oxidizable.OxidizationLevel.WEATHERED, AbstractBlock.Settings.copy(WEATHERED_COPPER).requiredFlags(FeatureFlags.UPDATE_1_21))
    );
    /**
     * @mapping {@literal hashed f_ypcnytou Lnet/minecraft/unmapped/C_jricjyva;f_ypcnytou:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -10499,7 +10504,7 @@
     */
    public static final Block EXPOSED_CHISELED_COPPER = m_mjiljkwg(
       "exposed_chiseled_copper",
-      new OxidizableBlock(Oxidizable.OxidizationLevel.EXPOSED, AbstractBlock.Settings.copy(EXPOSED_COPPER).requiredFlags(FeatureFlags.f_dmxgtmcy))
+      new OxidizableBlock(Oxidizable.OxidizationLevel.EXPOSED, AbstractBlock.Settings.copy(EXPOSED_COPPER).requiredFlags(FeatureFlags.UPDATE_1_21))
    );
    /**
     * @mapping {@literal hashed f_wjerzgdh Lnet/minecraft/unmapped/C_jricjyva;f_wjerzgdh:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -10507,7 +10512,7 @@
     */
    public static final Block CHISELED_COPPER = m_mjiljkwg(
       "chiseled_copper",
-      new OxidizableBlock(Oxidizable.OxidizationLevel.UNAFFECTED, AbstractBlock.Settings.copy(COPPER_BLOCK).requiredFlags(FeatureFlags.f_dmxgtmcy))
+      new OxidizableBlock(Oxidizable.OxidizationLevel.UNAFFECTED, AbstractBlock.Settings.copy(COPPER_BLOCK).requiredFlags(FeatureFlags.UPDATE_1_21))
    );
    /**
     * @mapping {@literal hashed f_ojrympko Lnet/minecraft/unmapped/C_jricjyva;f_ojrympko:Lnet/minecraft/unmapped/C_mmxmpdoq;}
@@ -10700,7 +10705,7 @@
             .nonOpaque()
             .requiresTool()
             .pistonBehavior(PistonBehavior.DESTROY)
-            .requiredFlags(FeatureFlags.f_dmxgtmcy)
+            .requiredFlags(FeatureFlags.UPDATE_1_21)
       )
    );
    /**
@@ -10778,7 +10783,7 @@
             .requiresTool()
             .nonOpaque()
             .allowsSpawning(Blocks::m_qpxyruwi)
-            .requiredFlags(FeatureFlags.f_dmxgtmcy)
+            .requiredFlags(FeatureFlags.UPDATE_1_21)
       )
    );
    /**
@@ -10858,7 +10863,7 @@
          Oxidizable.OxidizationLevel.UNAFFECTED,
          AbstractBlock.Settings.create()
             .strength(3.0F, 6.0F)
-            .sounds(BlockSoundGroup.f_mnnopadg)
+            .sounds(BlockSoundGroup.BLOCK_COPPER_GRATE_BREAK)
             .mapColor(MapColor.ORANGE)
             .nonOpaque()
             .requiresTool()
@@ -10866,7 +10871,7 @@
             .solidBlock(Blocks::m_wjfyifdb)
             .suffocates(Blocks::m_wjfyifdb)
             .blockVision(Blocks::m_wjfyifdb)
-            .requiredFlags(FeatureFlags.f_dmxgtmcy)
+            .requiredFlags(FeatureFlags.UPDATE_1_21)
       )
    );
    /**
@@ -10938,12 +10943,12 @@
          AbstractBlock.Settings.create()
             .mapColor(COPPER_BLOCK.getDefaultMapColor())
             .strength(3.0F, 6.0F)
-            .sounds(BlockSoundGroup.f_aqzwdchr)
+            .sounds(BlockSoundGroup.BLOCK_COPPER_BULB_BREAK)
             .nonOpaque()
             .requiresTool()
             .solidBlock(Blocks::m_wjfyifdb)
             .luminance(m_pelkwenc(15))
-            .requiredFlags(FeatureFlags.f_dmxgtmcy)
+            .requiredFlags(FeatureFlags.UPDATE_1_21)
       )
    );
    /**
@@ -11487,7 +11492,7 @@
     * @mapping {@literal named CRAFTER Lnet/minecraft/block/Blocks;CRAFTER:Lnet/minecraft/block/Block;}
     */
    public static final Block CRAFTER = m_mjiljkwg(
-      "crafter", new C_dmnruvyr(AbstractBlock.Settings.create().mapColor(MapColor.STONE).strength(1.5F, 3.5F).requiredFlags(FeatureFlags.f_dmxgtmcy))
+      "crafter", new Crafter(AbstractBlock.Settings.create().mapColor(MapColor.STONE).strength(1.5F, 3.5F).requiredFlags(FeatureFlags.UPDATE_1_21))
    );
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java
--- namedTargetSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2023-11-06 03:58:08.611843227 +0000
+++ namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2023-11-06 03:56:39.772386966 +0000
@@ -278,22 +278,22 @@
       map2.put(Items.PURPLE_BANNER, CLEAN_BANNER);
       map2.put(Items.RED_BANNER, CLEAN_BANNER);
       map2.put(Items.YELLOW_BANNER, CLEAN_BANNER);
-      map2.put(Items.f_uqnidzql, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_dcsunsua, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_tvuvleen, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_kbmwlruh, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_sdhrkufb, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_yfmsceou, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_olnfyjts, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_nvxubjhy, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_ndxblnxa, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_qkwblzvn, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_hsbtdnbt, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_ryhazqra, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_lkakxgau, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_uhrrfolu, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_mqmrifro, CLEAN_SHULKER_BOX);
-      map2.put(Items.f_owpfvbbo, CLEAN_SHULKER_BOX);
+      map2.put(Items.WHITE_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.GRAY_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.BLACK_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.BLUE_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.BROWN_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.CYAN_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.GREEN_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.LIGHT_BLUE_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.LIGHT_GRAY_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.LIME_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.MAGENTA_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.ORANGE_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.PINK_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.PURPLE_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.RED_SHULKER_BOX, CLEAN_SHULKER_BOX);
+      map2.put(Items.YELLOW_SHULKER_BOX, CLEAN_SHULKER_BOX);
       Map<Item, CauldronBehavior> map3 = LAVA_CAULDRON_BEHAVIOR.map();
       map3.put(
          Items.BUCKET,
diff -bur namedTargetSrc/net/minecraft/block/ComposterBlock.java namedSrc/net/minecraft/block/ComposterBlock.java
--- namedTargetSrc/net/minecraft/block/ComposterBlock.java	2023-11-06 03:58:08.683842780 +0000
+++ namedSrc/net/minecraft/block/ComposterBlock.java	2023-11-06 03:56:39.852386481 +0000
@@ -118,106 +118,106 @@
       float h = 0.65F;
       float i = 0.85F;
       float j = 1.0F;
-      registerCompostableItem(0.3F, Items.f_snrvyqni);
-      registerCompostableItem(0.3F, Items.f_bfdvqfoz);
-      registerCompostableItem(0.3F, Items.f_pnwcdxnx);
-      registerCompostableItem(0.3F, Items.f_ymmfuwiz);
-      registerCompostableItem(0.3F, Items.f_zmzrchft);
-      registerCompostableItem(0.3F, Items.f_scsjcbib);
-      registerCompostableItem(0.3F, Items.f_pxegyvzn);
-      registerCompostableItem(0.3F, Items.f_bszdyodi);
-      registerCompostableItem(0.3F, Items.f_egubuorr);
-      registerCompostableItem(0.3F, Items.f_dyxbqued);
-      registerCompostableItem(0.3F, Items.f_zxemqfqw);
-      registerCompostableItem(0.3F, Items.f_matgpmbe);
-      registerCompostableItem(0.3F, Items.f_rhxzrfsb);
-      registerCompostableItem(0.3F, Items.f_woqldhqb);
-      registerCompostableItem(0.3F, Items.f_vwlskifn);
-      registerCompostableItem(0.3F, Items.f_kcrxmvtz);
-      registerCompostableItem(0.3F, Items.f_mqfklpco);
+      registerCompostableItem(0.3F, Items.JUNGLE_LEAVES);
+      registerCompostableItem(0.3F, Items.OAK_LEAVES);
+      registerCompostableItem(0.3F, Items.SPRUCE_LEAVES);
+      registerCompostableItem(0.3F, Items.DARK_OAK_LEAVES);
+      registerCompostableItem(0.3F, Items.ACACIA_LEAVES);
+      registerCompostableItem(0.3F, Items.CHERRY_LEAVES);
+      registerCompostableItem(0.3F, Items.BIRCH_LEAVES);
+      registerCompostableItem(0.3F, Items.AZALEA_LEAVES);
+      registerCompostableItem(0.3F, Items.MANGROVE_LEAVES);
+      registerCompostableItem(0.3F, Items.OAK_SAPLING);
+      registerCompostableItem(0.3F, Items.SPRUCE_SAPLING);
+      registerCompostableItem(0.3F, Items.BIRCH_SAPLING);
+      registerCompostableItem(0.3F, Items.JUNGLE_SAPLING);
+      registerCompostableItem(0.3F, Items.ACACIA_SAPLING);
+      registerCompostableItem(0.3F, Items.CHERRY_SAPLING);
+      registerCompostableItem(0.3F, Items.DARK_OAK_SAPLING);
+      registerCompostableItem(0.3F, Items.MANGROVE_PROPAGULE);
       registerCompostableItem(0.3F, Items.BEETROOT_SEEDS);
       registerCompostableItem(0.3F, Items.DRIED_KELP);
-      registerCompostableItem(0.3F, Items.f_hdyoiutq);
-      registerCompostableItem(0.3F, Items.f_hnpfifap);
-      registerCompostableItem(0.3F, Items.f_lzekbdze);
-      registerCompostableItem(0.3F, Items.f_urfjmcvh);
-      registerCompostableItem(0.3F, Items.f_boyhkvac);
+      registerCompostableItem(0.3F, Items.GRASS);
+      registerCompostableItem(0.3F, Items.KELP);
+      registerCompostableItem(0.3F, Items.MELON_SEEDS);
+      registerCompostableItem(0.3F, Items.PUMPKIN_SEEDS);
+      registerCompostableItem(0.3F, Items.SEAGRASS);
       registerCompostableItem(0.3F, Items.SWEET_BERRIES);
       registerCompostableItem(0.3F, Items.GLOW_BERRIES);
       registerCompostableItem(0.3F, Items.WHEAT_SEEDS);
-      registerCompostableItem(0.3F, Items.f_wzlpbcgh);
-      registerCompostableItem(0.3F, Items.f_xxjqtmvz);
-      registerCompostableItem(0.3F, Items.f_wsvnrszl);
-      registerCompostableItem(0.3F, Items.f_tqutkcdq);
-      registerCompostableItem(0.3F, Items.f_ylqfwfiv);
+      registerCompostableItem(0.3F, Items.MOSS_CARPET);
+      registerCompostableItem(0.3F, Items.PINK_PETALS);
+      registerCompostableItem(0.3F, Items.SMALL_DRIPLEAF);
+      registerCompostableItem(0.3F, Items.HANGING_ROOTS);
+      registerCompostableItem(0.3F, Items.MANGROVE_ROOTS);
       registerCompostableItem(0.3F, Items.TORCHFLOWER_SEEDS);
       registerCompostableItem(0.3F, Items.PITCHER_POD);
-      registerCompostableItem(0.5F, Items.f_dvdrjxjw);
-      registerCompostableItem(0.5F, Items.f_jhcrihes);
-      registerCompostableItem(0.5F, Items.f_jshjeopp);
-      registerCompostableItem(0.5F, Items.f_abtusmgg);
-      registerCompostableItem(0.5F, Items.f_mlenzjmc);
-      registerCompostableItem(0.5F, Items.f_ttxzrwee);
-      registerCompostableItem(0.5F, Items.f_reybjwsg);
-      registerCompostableItem(0.5F, Items.f_cutipwei);
-      registerCompostableItem(0.5F, Items.f_qewofvly);
+      registerCompostableItem(0.5F, Items.DRIED_KELP_BLOCK);
+      registerCompostableItem(0.5F, Items.TALL_GRASS);
+      registerCompostableItem(0.5F, Items.FLOWERING_AZALEA_LEAVES);
+      registerCompostableItem(0.5F, Items.CACTUS);
+      registerCompostableItem(0.5F, Items.SUGAR_CANE);
+      registerCompostableItem(0.5F, Items.VINE);
+      registerCompostableItem(0.5F, Items.NETHER_SPROUTS);
+      registerCompostableItem(0.5F, Items.WEEPING_VINES);
+      registerCompostableItem(0.5F, Items.TWISTING_VINES);
       registerCompostableItem(0.5F, Items.MELON_SLICE);
-      registerCompostableItem(0.5F, Items.f_reilfatv);
-      registerCompostableItem(0.65F, Items.f_guehddqg);
-      registerCompostableItem(0.65F, Items.f_mkwtqcvb);
-      registerCompostableItem(0.65F, Items.f_ionzkphv);
-      registerCompostableItem(0.65F, Items.f_msaezkjg);
-      registerCompostableItem(0.65F, Items.f_hbesvxkl);
+      registerCompostableItem(0.5F, Items.GLOW_LICHEN);
+      registerCompostableItem(0.65F, Items.SEA_PICKLE);
+      registerCompostableItem(0.65F, Items.LILY_PAD);
+      registerCompostableItem(0.65F, Items.PUMPKIN);
+      registerCompostableItem(0.65F, Items.CARVED_PUMPKIN);
+      registerCompostableItem(0.65F, Items.MELON);
       registerCompostableItem(0.65F, Items.APPLE);
       registerCompostableItem(0.65F, Items.BEETROOT);
       registerCompostableItem(0.65F, Items.CARROT);
       registerCompostableItem(0.65F, Items.COCOA_BEANS);
       registerCompostableItem(0.65F, Items.POTATO);
       registerCompostableItem(0.65F, Items.WHEAT);
-      registerCompostableItem(0.65F, Items.f_lvefbfpo);
-      registerCompostableItem(0.65F, Items.f_pynukmgl);
-      registerCompostableItem(0.65F, Items.f_calfokib);
-      registerCompostableItem(0.65F, Items.f_ejxyevaz);
-      registerCompostableItem(0.65F, Items.f_qtpegojx);
+      registerCompostableItem(0.65F, Items.BROWN_MUSHROOM);
+      registerCompostableItem(0.65F, Items.RED_MUSHROOM);
+      registerCompostableItem(0.65F, Items.MUSHROOM_STEM);
+      registerCompostableItem(0.65F, Items.CRIMSON_FUNGUS);
+      registerCompostableItem(0.65F, Items.WARPED_FUNGUS);
       registerCompostableItem(0.65F, Items.NETHER_WART);
-      registerCompostableItem(0.65F, Items.f_fokcvobv);
-      registerCompostableItem(0.65F, Items.f_etxtelch);
-      registerCompostableItem(0.65F, Items.f_ghxkhefe);
-      registerCompostableItem(0.65F, Items.f_vwibytpy);
-      registerCompostableItem(0.65F, Items.f_rlewbkqv);
-      registerCompostableItem(0.65F, Items.f_jnlyterf);
-      registerCompostableItem(0.65F, Items.f_chgbxzlv);
-      registerCompostableItem(0.65F, Items.f_socmbpzv);
-      registerCompostableItem(0.65F, Items.f_hcyzuryd);
-      registerCompostableItem(0.65F, Items.f_yowwtlmx);
-      registerCompostableItem(0.65F, Items.f_aiajafch);
-      registerCompostableItem(0.65F, Items.f_zadjubwt);
-      registerCompostableItem(0.65F, Items.f_ezpzvtaw);
-      registerCompostableItem(0.65F, Items.f_zjobfqim);
-      registerCompostableItem(0.65F, Items.f_ipkrklyx);
-      registerCompostableItem(0.65F, Items.f_zcrzfecu);
-      registerCompostableItem(0.65F, Items.f_dmitagob);
-      registerCompostableItem(0.65F, Items.f_glpityrp);
-      registerCompostableItem(0.65F, Items.f_tjwbecmp);
-      registerCompostableItem(0.65F, Items.f_hgftltzy);
-      registerCompostableItem(0.65F, Items.f_wcgncjzf);
-      registerCompostableItem(0.65F, Items.f_jtpsszce);
-      registerCompostableItem(0.65F, Items.f_zkdxwaal);
-      registerCompostableItem(0.65F, Items.f_lzibikaa);
-      registerCompostableItem(0.65F, Items.f_vqbiheqw);
-      registerCompostableItem(0.65F, Items.f_kgwzlyxl);
-      registerCompostableItem(0.85F, Items.f_rhzqmkmc);
-      registerCompostableItem(0.85F, Items.f_tntvkoup);
-      registerCompostableItem(0.85F, Items.f_bysajikz);
-      registerCompostableItem(0.85F, Items.f_imrswfcj);
-      registerCompostableItem(0.85F, Items.f_ewvmsvlk);
-      registerCompostableItem(0.85F, Items.f_wugjggoa);
+      registerCompostableItem(0.65F, Items.CRIMSON_ROOTS);
+      registerCompostableItem(0.65F, Items.WARPED_ROOTS);
+      registerCompostableItem(0.65F, Items.SHROOMLIGHT);
+      registerCompostableItem(0.65F, Items.DANDELION);
+      registerCompostableItem(0.65F, Items.POPPY);
+      registerCompostableItem(0.65F, Items.BLUE_ORCHID);
+      registerCompostableItem(0.65F, Items.ALLIUM);
+      registerCompostableItem(0.65F, Items.AZURE_BLUET);
+      registerCompostableItem(0.65F, Items.RED_TULIP);
+      registerCompostableItem(0.65F, Items.ORANGE_TULIP);
+      registerCompostableItem(0.65F, Items.WHITE_TULIP);
+      registerCompostableItem(0.65F, Items.PINK_TULIP);
+      registerCompostableItem(0.65F, Items.OXEYE_DAISY);
+      registerCompostableItem(0.65F, Items.CORNFLOWER);
+      registerCompostableItem(0.65F, Items.LILY_OF_THE_VALLEY);
+      registerCompostableItem(0.65F, Items.WITHER_ROSE);
+      registerCompostableItem(0.65F, Items.FERN);
+      registerCompostableItem(0.65F, Items.SUNFLOWER);
+      registerCompostableItem(0.65F, Items.LILAC);
+      registerCompostableItem(0.65F, Items.ROSE_BUSH);
+      registerCompostableItem(0.65F, Items.PEONY);
+      registerCompostableItem(0.65F, Items.LARGE_FERN);
+      registerCompostableItem(0.65F, Items.SPORE_BLOSSOM);
+      registerCompostableItem(0.65F, Items.AZALEA);
+      registerCompostableItem(0.65F, Items.MOSS_BLOCK);
+      registerCompostableItem(0.65F, Items.BIG_DRIPLEAF);
+      registerCompostableItem(0.85F, Items.HAY_BLOCK);
+      registerCompostableItem(0.85F, Items.BROWN_MUSHROOM_BLOCK);
+      registerCompostableItem(0.85F, Items.RED_MUSHROOM_BLOCK);
+      registerCompostableItem(0.85F, Items.NETHER_WART_BLOCK);
+      registerCompostableItem(0.85F, Items.WARPED_WART_BLOCK);
+      registerCompostableItem(0.85F, Items.FLOWERING_AZALEA);
       registerCompostableItem(0.85F, Items.BREAD);
       registerCompostableItem(0.85F, Items.BAKED_POTATO);
       registerCompostableItem(0.85F, Items.COOKIE);
-      registerCompostableItem(0.85F, Items.f_vouququv);
-      registerCompostableItem(0.85F, Items.f_slrtzbho);
-      registerCompostableItem(1.0F, Items.f_xigegqnt);
+      registerCompostableItem(0.85F, Items.TORCHFLOWER);
+      registerCompostableItem(0.85F, Items.PITCHER_PLANT);
+      registerCompostableItem(1.0F, Items.CAKE);
       registerCompostableItem(1.0F, Items.PUMPKIN_PIE);
    }
 
Only in namedSrc/net/minecraft/block: Crafter.java
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2023-11-06 03:58:08.675842829 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2023-11-06 03:56:39.844386529 +0000
@@ -336,24 +336,24 @@
       DispenserBlock.registerBehavior(Items.IRON_HORSE_ARMOR, lv3);
       DispenserBlock.registerBehavior(Items.GOLDEN_HORSE_ARMOR, lv3);
       DispenserBlock.registerBehavior(Items.DIAMOND_HORSE_ARMOR, lv3);
-      DispenserBlock.registerBehavior(Items.f_rvgerxxk, lv3);
-      DispenserBlock.registerBehavior(Items.f_pvjjchwg, lv3);
-      DispenserBlock.registerBehavior(Items.f_zgrdvzhk, lv3);
-      DispenserBlock.registerBehavior(Items.f_rbciwcbe, lv3);
-      DispenserBlock.registerBehavior(Items.f_hhhtyruh, lv3);
-      DispenserBlock.registerBehavior(Items.f_fdareeqj, lv3);
-      DispenserBlock.registerBehavior(Items.f_pdwtajgn, lv3);
-      DispenserBlock.registerBehavior(Items.f_vgkqkvvm, lv3);
-      DispenserBlock.registerBehavior(Items.f_iiiazcgu, lv3);
-      DispenserBlock.registerBehavior(Items.f_aexotsrx, lv3);
-      DispenserBlock.registerBehavior(Items.f_oaghwaym, lv3);
-      DispenserBlock.registerBehavior(Items.f_qrzedsbu, lv3);
-      DispenserBlock.registerBehavior(Items.f_iwihkcfe, lv3);
-      DispenserBlock.registerBehavior(Items.f_qfmenpoq, lv3);
-      DispenserBlock.registerBehavior(Items.f_dlvdvjtg, lv3);
-      DispenserBlock.registerBehavior(Items.f_ytyjznju, lv3);
+      DispenserBlock.registerBehavior(Items.WHITE_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.ORANGE_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.CYAN_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.BLUE_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.BROWN_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.BLACK_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.GRAY_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.GREEN_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.LIGHT_BLUE_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.LIGHT_GRAY_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.LIME_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.MAGENTA_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.PINK_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.PURPLE_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.RED_CARPET, lv3);
+      DispenserBlock.registerBehavior(Items.YELLOW_CARPET, lv3);
       DispenserBlock.registerBehavior(
-         Items.f_krnaqbeo,
+         Items.CHEST,
          new FallibleItemDispenserBehavior() {
             /**
              * Mapping not found
@@ -595,14 +595,14 @@
             return stack;
          }
       };
-      DispenserBlock.registerBehavior(Items.f_uvfmlwqp, lv5);
-      DispenserBlock.registerBehavior(Items.f_lacpiodl, lv5);
-      DispenserBlock.registerBehavior(Items.f_tdcclbyl, lv5);
-      DispenserBlock.registerBehavior(Items.f_nkstvlvc, lv5);
-      DispenserBlock.registerBehavior(Items.f_mevudanu, lv5);
-      DispenserBlock.registerBehavior(Items.f_teqkkgfc, lv5);
+      DispenserBlock.registerBehavior(Items.CREEPER_HEAD, lv5);
+      DispenserBlock.registerBehavior(Items.ZOMBIE_HEAD, lv5);
+      DispenserBlock.registerBehavior(Items.DRAGON_HEAD, lv5);
+      DispenserBlock.registerBehavior(Items.SKELETON_SKULL, lv5);
+      DispenserBlock.registerBehavior(Items.PIGLIN_HEAD, lv5);
+      DispenserBlock.registerBehavior(Items.PLAYER_HEAD, lv5);
       DispenserBlock.registerBehavior(
-         Items.f_wmomxybl,
+         Items.WITHER_SKELETON_SKULL,
          new FallibleItemDispenserBehavior() {
             /**
              * Mapping not found
@@ -714,7 +714,7 @@
             }
          }
       );
-      DispenserBlock.registerBehavior(Items.f_eabvoicj, new FallibleItemDispenserBehavior() {
+      DispenserBlock.registerBehavior(Items.GLOWSTONE, new FallibleItemDispenserBehavior() {
          /**
           * Mapping not found
           */
diff -bur namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java
--- namedTargetSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2023-11-06 03:58:08.703842656 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2023-11-06 03:56:39.872386359 +0000
@@ -143,7 +143,7 @@
     * Mapping not found
     */
    public static ItemStack m_qjeeptjd(DecoratedPotBlockEntity.Sherds arg) {
-      ItemStack lv = Items.f_rlwepfnn.getDefaultStack();
+      ItemStack lv = Items.DECORATED_POT.getDefaultStack();
       NbtCompound lv2 = arg.writeNbt(new NbtCompound());
       BlockItem.writeBlockEntityNbtToStack(lv, BlockEntityType.DECORATED_POT, lv2);
       return lv;
diff -bur namedTargetSrc/net/minecraft/block/GlowLichenBlock.java namedSrc/net/minecraft/block/GlowLichenBlock.java
--- namedTargetSrc/net/minecraft/block/GlowLichenBlock.java	2023-11-06 03:58:08.671842854 +0000
+++ namedSrc/net/minecraft/block/GlowLichenBlock.java	2023-11-06 03:56:39.840386554 +0000
@@ -98,7 +98,7 @@
     */
    @Override
    public boolean canReplace(BlockState state, ItemPlacementContext context) {
-      return !context.getStack().isOf(Items.f_reilfatv) || super.canReplace(state, context);
+      return !context.getStack().isOf(Items.GLOW_LICHEN) || super.canReplace(state, context);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/LightBlock.java namedSrc/net/minecraft/block/LightBlock.java
--- namedTargetSrc/net/minecraft/block/LightBlock.java	2023-11-06 03:58:08.671842854 +0000
+++ namedSrc/net/minecraft/block/LightBlock.java	2023-11-06 03:56:39.840386554 +0000
@@ -96,7 +96,7 @@
     */
    @Override
    public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
-      return context.isHolding(Items.f_ksobjnbt) ? VoxelShapes.fullCube() : VoxelShapes.empty();
+      return context.isHolding(Items.LIGHT) ? VoxelShapes.fullCube() : VoxelShapes.empty();
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/PumpkinBlock.java namedSrc/net/minecraft/block/PumpkinBlock.java
--- namedTargetSrc/net/minecraft/block/PumpkinBlock.java	2023-11-06 03:58:08.635843078 +0000
+++ namedSrc/net/minecraft/block/PumpkinBlock.java	2023-11-06 03:56:39.800386797 +0000
@@ -60,7 +60,7 @@
                (double)pos.getX() + 0.5 + (double)lv3.getOffsetX() * 0.65,
                (double)pos.getY() + 0.1,
                (double)pos.getZ() + 0.5 + (double)lv3.getOffsetZ() * 0.65,
-               new ItemStack(Items.f_urfjmcvh, 4)
+               new ItemStack(Items.PUMPKIN_SEEDS, 4)
             );
             lv4.setVelocity(
                0.05 * (double)lv3.getOffsetX() + world.random.nextDouble() * 0.02, 0.05, 0.05 * (double)lv3.getOffsetZ() + world.random.nextDouble() * 0.02
diff -bur namedTargetSrc/net/minecraft/block/RespawnAnchorBlock.java namedSrc/net/minecraft/block/RespawnAnchorBlock.java
--- namedTargetSrc/net/minecraft/block/RespawnAnchorBlock.java	2023-11-06 03:58:08.715842581 +0000
+++ namedSrc/net/minecraft/block/RespawnAnchorBlock.java	2023-11-06 03:56:39.888386262 +0000
@@ -153,7 +153,7 @@
     * @mapping {@literal named isChargeItem Lnet/minecraft/block/RespawnAnchorBlock;isChargeItem(Lnet/minecraft/item/ItemStack;)Z}
     */
    private static boolean isChargeItem(ItemStack stack) {
-      return stack.isOf(Items.f_eabvoicj);
+      return stack.isOf(Items.GLOWSTONE);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/sculk/SculkVeinBlock.java namedSrc/net/minecraft/block/sculk/SculkVeinBlock.java
--- namedTargetSrc/net/minecraft/block/sculk/SculkVeinBlock.java	2023-11-06 03:58:08.679842805 +0000
+++ namedSrc/net/minecraft/block/sculk/SculkVeinBlock.java	2023-11-06 03:56:39.848386505 +0000
@@ -237,7 +237,7 @@
     */
    @Override
    public boolean canReplace(BlockState state, ItemPlacementContext context) {
-      return !context.getStack().isOf(Items.f_epsfoucb) || super.canReplace(state, context);
+      return !context.getStack().isOf(Items.SCULK_VEIN) || super.canReplace(state, context);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/block/WitherSkullBlock.java namedSrc/net/minecraft/block/WitherSkullBlock.java
--- namedTargetSrc/net/minecraft/block/WitherSkullBlock.java	2023-11-06 03:58:08.735842457 +0000
+++ namedSrc/net/minecraft/block/WitherSkullBlock.java	2023-11-06 03:56:39.908386141 +0000
@@ -112,7 +112,7 @@
     * @mapping {@literal named canDispense Lnet/minecraft/block/WitherSkullBlock;canDispense(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/item/ItemStack;)Z}
     */
    public static boolean canDispense(World world, BlockPos pos, ItemStack stack) {
-      if (stack.isOf(Items.f_wmomxybl) && pos.getY() >= world.getBottomY() + 2 && world.getDifficulty() != Difficulty.PEACEFUL && !world.isClient) {
+      if (stack.isOf(Items.WITHER_SKELETON_SKULL) && pos.getY() >= world.getBottomY() + 2 && world.getDifficulty() != Difficulty.PEACEFUL && !world.isClient) {
          return getWitherDispenserPattern().searchAround(world, pos) != null;
       } else {
          return false;
diff -bur namedTargetSrc/net/minecraft/client/color/block/BlockColors.java namedSrc/net/minecraft/client/color/block/BlockColors.java
--- namedTargetSrc/net/minecraft/client/color/block/BlockColors.java	2023-11-06 03:58:08.707842631 +0000
+++ namedSrc/net/minecraft/client/color/block/BlockColors.java	2023-11-06 03:56:39.880386311 +0000
@@ -95,15 +95,15 @@
       lv.registerColorProvider((state, world, pos, tintIndex) -> RedstoneWireBlock.getWireColor(state.get(RedstoneWireBlock.POWER)), Blocks.REDSTONE_WIRE);
       lv.registerColorProperty(RedstoneWireBlock.POWER, Blocks.REDSTONE_WIRE);
       lv.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : -1, Blocks.SUGAR_CANE);
-      lv.registerColorProvider((state, world, pos, tintIndex) -> 14731036, Blocks.f_ykctbjyx, Blocks.f_ryluqxrm);
+      lv.registerColorProvider((state, world, pos, tintIndex) -> 14731036, Blocks.ATTACHED_MELON_STEM, Blocks.ATTACHED_PUMPKIN_STEM);
       lv.registerColorProvider((state, world, pos, tintIndex) -> {
          int j = state.get(StemBlock.AGE);
          int k = j * 32;
          int l = 255 - j * 8;
          int m = j * 4;
          return k << 16 | l << 8 | m;
-      }, Blocks.f_bgazwcmd, Blocks.f_domkrbru);
-      lv.registerColorProperty(StemBlock.AGE, Blocks.f_bgazwcmd, Blocks.f_domkrbru);
+      }, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
+      lv.registerColorProperty(StemBlock.AGE, Blocks.MELON_STEM, Blocks.PUMPKIN_STEM);
       lv.registerColorProvider((state, world, pos, tintIndex) -> world != null && pos != null ? 2129968 : 7455580, Blocks.LILY_PAD);
       return lv;
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/CustomizeFlatWorldScreen.java namedSrc/net/minecraft/client/gui/screen/CustomizeFlatWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/CustomizeFlatWorldScreen.java	2023-11-06 03:58:08.651842978 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CustomizeFlatWorldScreen.java	2023-11-06 03:56:39.816386699 +0000
@@ -318,7 +318,7 @@
           */
          private ItemStack createItemStackFor(BlockState state) {
             Item lv = state.getBlock().asItem();
-            if (lv == Items.f_wnlqvdbz) {
+            if (lv == Items.AIR) {
                if (state.isOf(Blocks.WATER)) {
                   lv = Items.WATER_BUCKET;
                } else if (state.isOf(Blocks.LAVA)) {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2023-11-06 03:58:08.607843251 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2023-11-06 03:56:39.768386991 +0000
@@ -74,7 +74,7 @@
       ItemStack lv = this.handler.getSlot(1).getStack();
       boolean bl = lv.isOf(Items.MAP);
       boolean bl2 = lv.isOf(Items.PAPER);
-      boolean bl3 = lv.isOf(Items.f_vdsqpgml);
+      boolean bl3 = lv.isOf(Items.GLASS_PANE);
       ItemStack lv2 = this.handler.getSlot(0).getStack();
       boolean bl4 = false;
       Integer integer;
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java
--- namedTargetSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java	2023-11-06 03:58:08.735842457 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java	2023-11-06 03:56:39.912386117 +0000
@@ -104,7 +104,7 @@
     */
    public void initialize(RecipeBook recipeBook) {
       for (RecipeHolder<?> lv : this.recipes) {
-         if (recipeBook.m_dcnyuasn(lv)) {
+         if (recipeBook.contains(lv)) {
             this.unlockedRecipes.add(lv);
          }
       }
@@ -116,7 +116,7 @@
     */
    public void computeCraftables(RecipeMatcher recipeFinder, int gridWidth, int gridHeight, RecipeBook recipeBook) {
       for (RecipeHolder<?> lv : this.recipes) {
-         boolean bl = lv.value().fits(gridWidth, gridHeight) && recipeBook.m_dcnyuasn(lv);
+         boolean bl = lv.value().fits(gridWidth, gridHeight) && recipeBook.contains(lv);
          if (bl) {
             this.fittingRecipes.add(lv);
          } else {
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/Screen.java namedSrc/net/minecraft/client/gui/screen/Screen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/Screen.java	2023-11-06 03:58:08.623843152 +0000
+++ namedSrc/net/minecraft/client/gui/screen/Screen.java	2023-11-06 03:56:39.784386894 +0000
@@ -740,7 +740,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return true;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/StatsScreen.java namedSrc/net/minecraft/client/gui/screen/StatsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/StatsScreen.java	2023-11-06 03:58:08.751842358 +0000
+++ namedSrc/net/minecraft/client/gui/screen/StatsScreen.java	2023-11-06 03:56:39.924386044 +0000
@@ -597,7 +597,7 @@
             }
          }
 
-         set.remove(Items.f_wnlqvdbz);
+         set.remove(Items.AIR);
 
          for (Item lv5 : set) {
             this.addEntry(new StatsScreen.ItemStatEntryListWidget.Entry(lv5));
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-11-06 03:58:08.727842507 +0000
+++ namedSrc/net/minecraft/client/gui/widget/ClickableWidget.java	2023-11-06 03:56:39.896386214 +0000
@@ -336,13 +336,13 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.active
          && this.visible
-         && mouseX >= (double)this.getX()
-         && mouseY >= (double)this.getY()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && e >= (double)this.getY()
+         && d < (double)(this.getX() + this.width)
+         && e < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2023-11-06 03:58:08.611843227 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2023-11-06 03:56:39.772386966 +0000
@@ -662,8 +662,8 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
-      return mouseY >= (double)this.top && mouseY <= (double)this.bottom && mouseX >= (double)this.left && mouseX <= (double)this.right;
+   public boolean isMouseOver(double d, double e) {
+      return e >= (double)this.top && e <= (double)this.bottom && d >= (double)this.left && d <= (double)this.right;
    }
 
    /**
@@ -936,8 +936,8 @@
        * @mapping {@literal named isMouseOver Lnet/minecraft/client/gui/widget/list/EntryListWidget$Entry;isMouseOver(DD)Z}
        */
       @Override
-      public boolean isMouseOver(double mouseX, double mouseY) {
-         return Objects.equals(this.parentList.getEntryAtPosition(mouseX, mouseY), this);
+      public boolean isMouseOver(double d, double e) {
+         return Objects.equals(this.parentList.getEntryAtPosition(d, e), this);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2023-11-06 03:58:08.655842954 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeAlternativesWidget.java	2023-11-06 03:56:39.824386651 +0000
@@ -242,7 +242,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2023-11-06 03:58:08.731842482 +0000
+++ namedSrc/net/minecraft/client/gui/widget/recipe_book/RecipeBookWidget.java	2023-11-06 03:56:39.904386165 +0000
@@ -637,7 +637,7 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return false;
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-11-06 03:58:08.623843152 +0000
+++ namedSrc/net/minecraft/client/gui/widget/TextFieldWidget.java	2023-11-06 03:56:39.784386894 +0000
@@ -729,12 +729,12 @@
     * Mapping not found
     */
    @Override
-   public boolean isMouseOver(double mouseX, double mouseY) {
+   public boolean isMouseOver(double d, double e) {
       return this.visible
-         && mouseX >= (double)this.getX()
-         && mouseX < (double)(this.getX() + this.width)
-         && mouseY >= (double)this.getY()
-         && mouseY < (double)(this.getY() + this.height);
+         && d >= (double)this.getX()
+         && d < (double)(this.getX() + this.width)
+         && e >= (double)this.getY()
+         && e < (double)(this.getY() + this.height);
    }
 
    /**
diff -bur namedTargetSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java
--- namedTargetSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2023-11-06 03:58:08.679842805 +0000
+++ namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2023-11-06 03:56:39.848386505 +0000
@@ -291,7 +291,7 @@
          new Identifier("throwing"),
          (stack, world, entity, seed) -> entity != null && entity.isUsingItem() && entity.getActiveItem() == stack ? 1.0F : 0.0F
       );
-      register(Items.f_ksobjnbt, new Identifier("level"), (stack, world, entity, seed) -> {
+      register(Items.LIGHT, new Identifier("level"), (stack, world, entity, seed) -> {
          NbtCompound lvx = stack.getSubNbt("BlockStateTag");
 
          try {
diff -bur namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java
--- namedTargetSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-11-06 03:58:08.739842432 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-11-06 03:56:39.912386117 +0000
@@ -1805,23 +1805,23 @@
       switch (lv2) {
          case REMOVE:
             for (Identifier lv3 : packet.getRecipeIdsToChange()) {
-               this.recipeManager.get(lv3).ifPresent(lv::m_dllnexer);
+               this.recipeManager.get(lv3).ifPresent(lv::remove);
             }
             break;
          case INIT:
             for (Identifier lv4 : packet.getRecipeIdsToChange()) {
-               this.recipeManager.get(lv4).ifPresent(lv::m_ijxqozuf);
+               this.recipeManager.get(lv4).ifPresent(lv::add);
             }
 
             for (Identifier lv5 : packet.getRecipeIdsToInit()) {
-               this.recipeManager.get(lv5).ifPresent(lv::m_drzdihac);
+               this.recipeManager.get(lv5).ifPresent(lv::queueForHighlight);
             }
             break;
          case ADD:
             for (Identifier lv6 : packet.getRecipeIdsToChange()) {
                this.recipeManager.get(lv6).ifPresent(arg2 -> {
-                  lv.m_ijxqozuf(arg2);
-                  lv.m_drzdihac(arg2);
+                  lv.add(arg2);
+                  lv.queueForHighlight(arg2);
                   if (arg2.value().showNotification()) {
                      RecipeToast.show(this.client.getToastManager(), arg2);
                   }
diff -bur namedTargetSrc/net/minecraft/client/recipe_book/RecipeBookGroup.java namedSrc/net/minecraft/client/recipe_book/RecipeBookGroup.java
--- namedTargetSrc/net/minecraft/client/recipe_book/RecipeBookGroup.java	2023-11-06 03:58:08.603843276 +0000
+++ namedSrc/net/minecraft/client/recipe_book/RecipeBookGroup.java	2023-11-06 03:56:39.764387015 +0000
@@ -91,7 +91,7 @@
     * @mapping {@literal hashed f_gelflsmj Lnet/minecraft/unmapped/C_rlyqwzkz;f_gelflsmj:Lnet/minecraft/unmapped/C_rlyqwzkz;}
     * @mapping {@literal named STONECUTTER Lnet/minecraft/client/recipe_book/RecipeBookGroup;STONECUTTER:Lnet/minecraft/client/recipe_book/RecipeBookGroup;}
     */
-   STONECUTTER(new ItemStack(Items.f_kqknshlv)),
+   STONECUTTER(new ItemStack(Items.CHISELED_STONE_BRICKS)),
    /**
     * @mapping {@literal hashed f_wknaumvd Lnet/minecraft/unmapped/C_rlyqwzkz;f_wknaumvd:Lnet/minecraft/unmapped/C_rlyqwzkz;}
     * @mapping {@literal named SMITHING Lnet/minecraft/client/recipe_book/RecipeBookGroup;SMITHING:Lnet/minecraft/client/recipe_book/RecipeBookGroup;}
@@ -106,7 +106,7 @@
     * @mapping {@literal hashed f_pualhxev Lnet/minecraft/unmapped/C_rlyqwzkz;f_pualhxev:Lnet/minecraft/unmapped/C_rlyqwzkz;}
     * @mapping {@literal named UNKNOWN Lnet/minecraft/client/recipe_book/RecipeBookGroup;UNKNOWN:Lnet/minecraft/client/recipe_book/RecipeBookGroup;}
     */
-   UNKNOWN(new ItemStack(Items.f_jedosiym));
+   UNKNOWN(new ItemStack(Items.BARRIER));
 
    /**
     * @mapping {@literal hashed f_jhosjxsz Lnet/minecraft/unmapped/C_rlyqwzkz;f_jhosjxsz:Ljava/util/List;}
diff -bur namedTargetSrc/net/minecraft/client/render/item/ItemRenderer.java namedSrc/net/minecraft/client/render/item/ItemRenderer.java
--- namedTargetSrc/net/minecraft/client/render/item/ItemRenderer.java	2023-11-06 03:58:08.619843177 +0000
+++ namedSrc/net/minecraft/client/render/item/ItemRenderer.java	2023-11-06 03:56:39.784386894 +0000
@@ -61,7 +61,7 @@
     * @mapping {@literal hashed f_bhcoehwk Lnet/minecraft/unmapped/C_xjqetogb;f_bhcoehwk:Ljava/util/Set;}
     * @mapping {@literal named WITHOUT_MODELS Lnet/minecraft/client/render/item/ItemRenderer;WITHOUT_MODELS:Ljava/util/Set;}
     */
-   private static final Set<Item> WITHOUT_MODELS = Sets.<Item>newHashSet(Items.f_wnlqvdbz);
+   private static final Set<Item> WITHOUT_MODELS = Sets.<Item>newHashSet(Items.AIR);
    /**
     * @mapping {@literal hashed f_uimgkpsz Lnet/minecraft/unmapped/C_xjqetogb;f_uimgkpsz:I}
     * @mapping {@literal named GUI_SLOT_CENTER_X Lnet/minecraft/client/render/item/ItemRenderer;GUI_SLOT_CENTER_X:I}
diff -bur namedTargetSrc/net/minecraft/client/render/RenderLayers.java namedSrc/net/minecraft/client/render/RenderLayers.java
--- namedTargetSrc/net/minecraft/client/render/RenderLayers.java	2023-11-06 03:58:08.607843251 +0000
+++ namedSrc/net/minecraft/client/render/RenderLayers.java	2023-11-06 03:56:39.768386991 +0000
@@ -133,10 +133,10 @@
       map.put(Blocks.WAXED_EXPOSED_COPPER_TRAPDOOR, lv3);
       map.put(Blocks.WAXED_WEATHERED_COPPER_TRAPDOOR, lv3);
       map.put(Blocks.WAXED_OXIDIZED_COPPER_TRAPDOOR, lv3);
-      map.put(Blocks.f_ryluqxrm, lv3);
-      map.put(Blocks.f_ykctbjyx, lv3);
-      map.put(Blocks.f_domkrbru, lv3);
-      map.put(Blocks.f_bgazwcmd, lv3);
+      map.put(Blocks.ATTACHED_PUMPKIN_STEM, lv3);
+      map.put(Blocks.ATTACHED_MELON_STEM, lv3);
+      map.put(Blocks.PUMPKIN_STEM, lv3);
+      map.put(Blocks.MELON_STEM, lv3);
       map.put(Blocks.VINE, lv3);
       map.put(Blocks.GLOW_LICHEN, lv3);
       map.put(Blocks.LILY_PAD, lv3);
diff -bur namedTargetSrc/net/minecraft/client/world/ClientWorld.java namedSrc/net/minecraft/client/world/ClientWorld.java
--- namedTargetSrc/net/minecraft/client/world/ClientWorld.java	2023-11-06 03:58:08.699842681 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2023-11-06 03:56:39.872386359 +0000
@@ -213,7 +213,7 @@
     * @mapping {@literal hashed f_fcmyqkjf Lnet/minecraft/unmapped/C_ghdnlrrw;f_fcmyqkjf:Ljava/util/Set;}
     * @mapping {@literal named MARKER_PARTICLE_ITEMS Lnet/minecraft/client/world/ClientWorld;MARKER_PARTICLE_ITEMS:Ljava/util/Set;}
     */
-   private static final Set<Item> MARKER_PARTICLE_ITEMS = Set.of(Items.f_jedosiym, Items.f_ksobjnbt);
+   private static final Set<Item> MARKER_PARTICLE_ITEMS = Set.of(Items.BARRIER, Items.LIGHT);
 
    /**
     * @mapping {@literal hashed m_nsvkfxjo Lnet/minecraft/unmapped/C_ghdnlrrw;m_nsvkfxjo(I)V}
diff -bur namedTargetSrc/net/minecraft/data/client/BlockStateDefinitionProvider.java namedSrc/net/minecraft/data/client/BlockStateDefinitionProvider.java
--- namedTargetSrc/net/minecraft/data/client/BlockStateDefinitionProvider.java	2023-11-06 03:58:08.691842730 +0000
+++ namedSrc/net/minecraft/data/client/BlockStateDefinitionProvider.java	2023-11-06 03:56:39.860386432 +0000
@@ -106,7 +106,7 @@
       return CompletableFuture.allOf((CompletableFuture[])jsons.entrySet().stream().map(entry -> {
          Path path = (Path)pathGetter.apply(entry.getKey());
          JsonElement jsonElement = (JsonElement)((Supplier)entry.getValue()).get();
-         return DataProvider.m_erzxphou(writer, jsonElement, path);
+         return DataProvider.writeToPath(writer, jsonElement, path);
       }).toArray(i -> new CompletableFuture[i]));
    }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java namedSrc/net/minecraft/data/client/ItemModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/ItemModelGenerator.java	2023-11-06 03:58:08.743842408 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2023-11-06 03:56:39.916386092 +0000
@@ -32,19 +32,20 @@
     */
    public static final Identifier TRIM_TYPE = new Identifier("trim_type");
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_ccmpywsi Lnet/minecraft/unmapped/C_cfvrpkog;f_ccmpywsi:Ljava/util/List;}
+    * @mapping {@literal named TRIM_MATERIALS Lnet/minecraft/data/client/ItemModelGenerator;TRIM_MATERIALS:Ljava/util/List;}
     */
-   private static final List<ItemModelGenerator.C_cutcputf> f_ccmpywsi = List.of(
-      new ItemModelGenerator.C_cutcputf("quartz", 0.1F, Map.of()),
-      new ItemModelGenerator.C_cutcputf("iron", 0.2F, Map.of(ArmorMaterials.IRON, "iron_darker")),
-      new ItemModelGenerator.C_cutcputf("netherite", 0.3F, Map.of(ArmorMaterials.NETHERITE, "netherite_darker")),
-      new ItemModelGenerator.C_cutcputf("redstone", 0.4F, Map.of()),
-      new ItemModelGenerator.C_cutcputf("copper", 0.5F, Map.of()),
-      new ItemModelGenerator.C_cutcputf("gold", 0.6F, Map.of(ArmorMaterials.GOLD, "gold_darker")),
-      new ItemModelGenerator.C_cutcputf("emerald", 0.7F, Map.of()),
-      new ItemModelGenerator.C_cutcputf("diamond", 0.8F, Map.of(ArmorMaterials.DIAMOND, "diamond_darker")),
-      new ItemModelGenerator.C_cutcputf("lapis", 0.9F, Map.of()),
-      new ItemModelGenerator.C_cutcputf("amethyst", 1.0F, Map.of())
+   private static final List<ItemModelGenerator.TrimModelData> TRIM_MATERIALS = List.of(
+      new ItemModelGenerator.TrimModelData("quartz", 0.1F, Map.of()),
+      new ItemModelGenerator.TrimModelData("iron", 0.2F, Map.of(ArmorMaterials.IRON, "iron_darker")),
+      new ItemModelGenerator.TrimModelData("netherite", 0.3F, Map.of(ArmorMaterials.NETHERITE, "netherite_darker")),
+      new ItemModelGenerator.TrimModelData("redstone", 0.4F, Map.of()),
+      new ItemModelGenerator.TrimModelData("copper", 0.5F, Map.of()),
+      new ItemModelGenerator.TrimModelData("gold", 0.6F, Map.of(ArmorMaterials.GOLD, "gold_darker")),
+      new ItemModelGenerator.TrimModelData("emerald", 0.7F, Map.of()),
+      new ItemModelGenerator.TrimModelData("diamond", 0.8F, Map.of(ArmorMaterials.DIAMOND, "diamond_darker")),
+      new ItemModelGenerator.TrimModelData("lapis", 0.9F, Map.of()),
+      new ItemModelGenerator.TrimModelData("amethyst", 1.0F, Map.of())
    );
    /**
     * @mapping {@literal hashed f_siogckud Lnet/minecraft/unmapped/C_cfvrpkog;f_siogckud:Ljava/util/function/BiConsumer;}
@@ -85,59 +86,65 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_chmkiimy Lnet/minecraft/unmapped/C_cfvrpkog;m_chmkiimy(Lnet/minecraft/unmapped/C_vorddnax;)V}
+    * @mapping {@literal named registerCompass Lnet/minecraft/data/client/ItemModelGenerator;registerCompass(Lnet/minecraft/item/Item;)V}
     */
-   private void m_chmkiimy(Item arg) {
+   private void registerCompass(Item compass) {
       for (int i = 0; i < 32; ++i) {
          if (i != 16) {
-            this.register(arg, String.format(Locale.ROOT, "_%02d", i), Models.SINGLE_LAYER_ITEM);
+            this.register(compass, String.format(Locale.ROOT, "_%02d", i), Models.SINGLE_LAYER_ITEM);
          }
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pmffjxfg Lnet/minecraft/unmapped/C_cfvrpkog;m_pmffjxfg(Lnet/minecraft/unmapped/C_vorddnax;)V}
+    * @mapping {@literal named registerClock Lnet/minecraft/data/client/ItemModelGenerator;registerClock(Lnet/minecraft/item/Item;)V}
     */
-   private void m_pmffjxfg(Item arg) {
+   private void registerClock(Item clock) {
       for (int i = 1; i < 64; ++i) {
-         this.register(arg, String.format(Locale.ROOT, "_%02d", i), Models.SINGLE_LAYER_ITEM);
+         this.register(clock, String.format(Locale.ROOT, "_%02d", i), Models.SINGLE_LAYER_ITEM);
       }
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_uirjkeyq Lnet/minecraft/unmapped/C_cfvrpkog;m_uirjkeyq(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)V}
+    * @mapping {@literal named uploadLayeredItem Lnet/minecraft/data/client/ItemModelGenerator;uploadLayeredItem(Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)V}
     */
-   private void m_uirjkeyq(Identifier arg, Identifier arg2, Identifier arg3) {
-      Models.DOUBLE_LAYER_ITEM.upload(arg, Texture.doubleLayer(arg2, arg3), this.writer);
+   private void uploadLayeredItem(Identifier id, Identifier layer0, Identifier layer1) {
+      Models.DOUBLE_LAYER_ITEM.upload(id, Texture.doubleLayer(layer0, layer1), this.writer);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_bnmdefop Lnet/minecraft/unmapped/C_cfvrpkog;m_bnmdefop(Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)V}
+    * @mapping {@literal named uploadLayeredItem Lnet/minecraft/data/client/ItemModelGenerator;uploadLayeredItem(Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)V}
     */
-   private void m_bnmdefop(Identifier arg, Identifier arg2, Identifier arg3, Identifier arg4) {
-      Models.TRIPLE_LAYER_ITEM.upload(arg, Texture.tripleLayer(arg2, arg3, arg4), this.writer);
+   private void uploadLayeredItem(Identifier id, Identifier layer0, Identifier layer1, Identifier layer2) {
+      Models.TRIPLE_LAYER_ITEM.upload(id, Texture.tripleLayer(layer0, layer1, layer2), this.writer);
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vlmfwosx Lnet/minecraft/unmapped/C_cfvrpkog;m_vlmfwosx(Lnet/minecraft/unmapped/C_ncpywfca;Ljava/lang/String;)Lnet/minecraft/unmapped/C_ncpywfca;}
+    * @mapping {@literal named suffixTrim Lnet/minecraft/data/client/ItemModelGenerator;suffixTrim(Lnet/minecraft/util/Identifier;Ljava/lang/String;)Lnet/minecraft/util/Identifier;}
     */
-   private Identifier m_vlmfwosx(Identifier arg, String string) {
-      return arg.extendPath("_" + string + "_trim");
+   private Identifier suffixTrim(Identifier id, String materialName) {
+      return id.extendPath("_" + materialName + "_trim");
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_llpeiyoc Lnet/minecraft/unmapped/C_cfvrpkog;m_llpeiyoc(Lnet/minecraft/unmapped/C_ncpywfca;Ljava/util/Map;Lnet/minecraft/unmapped/C_fwzogbap;)Lcom/google/gson/JsonObject;}
+    * @mapping {@literal named createArmorJson Lnet/minecraft/data/client/ItemModelGenerator;createArmorJson(Lnet/minecraft/util/Identifier;Ljava/util/Map;Lnet/minecraft/item/ArmorMaterial;)Lcom/google/gson/JsonObject;}
     */
-   private JsonObject m_llpeiyoc(Identifier arg, Map<TextureKey, Identifier> map, ArmorMaterial arg2) {
-      JsonObject jsonObject = Models.DOUBLE_LAYER_ITEM.m_mjmunmmv(arg, map);
+   private JsonObject createArmorJson(Identifier id, Map<TextureKey, Identifier> textures, ArmorMaterial material) {
+      JsonObject jsonObject = Models.DOUBLE_LAYER_ITEM.createJson(id, textures);
       JsonArray jsonArray = new JsonArray();
 
-      for (ItemModelGenerator.C_cutcputf lv : f_ccmpywsi) {
+      for (ItemModelGenerator.TrimModelData lv : TRIM_MATERIALS) {
          JsonObject jsonObject2 = new JsonObject();
          JsonObject jsonObject3 = new JsonObject();
          jsonObject3.addProperty(TRIM_TYPE.getPath(), lv.itemModelIndex());
          jsonObject2.add("predicate", jsonObject3);
-         jsonObject2.addProperty("model", this.m_vlmfwosx(arg, lv.m_wmqpuvqn(arg2)).toString());
+         jsonObject2.addProperty("model", this.suffixTrim(id, lv.getAppliedName(material)).toString());
          jsonArray.add(jsonObject2);
       }
 
@@ -146,27 +153,28 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mppeudhx Lnet/minecraft/unmapped/C_cfvrpkog;m_mppeudhx(Lnet/minecraft/unmapped/C_fxxorins;)V}
+    * @mapping {@literal named registerArmor Lnet/minecraft/data/client/ItemModelGenerator;registerArmor(Lnet/minecraft/item/ArmorItem;)V}
     */
-   private void m_mppeudhx(ArmorItem arg) {
-      Identifier lv = ModelIds.getItemModelId(arg);
-      Identifier lv2 = Texture.getId(arg);
-      Identifier lv3 = Texture.getSubId(arg, "_overlay");
-      if (arg.getMaterial() == ArmorMaterials.LEATHER) {
-         Models.DOUBLE_LAYER_ITEM.m_oyjlnybm(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2, map) -> this.m_llpeiyoc(arg2, map, arg.getMaterial()));
+   private void registerArmor(ArmorItem armor) {
+      Identifier lv = ModelIds.getItemModelId(armor);
+      Identifier lv2 = Texture.getId(armor);
+      Identifier lv3 = Texture.getSubId(armor, "_overlay");
+      if (armor.getMaterial() == ArmorMaterials.LEATHER) {
+         Models.DOUBLE_LAYER_ITEM.upload(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2, map) -> this.createArmorJson(arg2, map, armor.getMaterial()));
       } else {
-         Models.SINGLE_LAYER_ITEM.m_oyjlnybm(lv, Texture.layer0(lv2), this.writer, (arg2, map) -> this.m_llpeiyoc(arg2, map, arg.getMaterial()));
+         Models.SINGLE_LAYER_ITEM.upload(lv, Texture.layer0(lv2), this.writer, (arg2, map) -> this.createArmorJson(arg2, map, armor.getMaterial()));
       }
 
-      for (ItemModelGenerator.C_cutcputf lv4 : f_ccmpywsi) {
-         String string = lv4.m_wmqpuvqn(arg.getMaterial());
-         Identifier lv5 = this.m_vlmfwosx(lv, string);
-         String string2 = arg.getArmorSlot().getTranslationKey() + "_trim_" + string;
+      for (ItemModelGenerator.TrimModelData lv4 : TRIM_MATERIALS) {
+         String string = lv4.getAppliedName(armor.getMaterial());
+         Identifier lv5 = this.suffixTrim(lv, string);
+         String string2 = armor.getArmorSlot().getTranslationKey() + "_trim_" + string;
          Identifier lv6 = new Identifier(string2).withPrefix("trims/items/");
-         if (arg.getMaterial() == ArmorMaterials.LEATHER) {
-            this.m_bnmdefop(lv5, lv2, lv3, lv6);
+         if (armor.getMaterial() == ArmorMaterials.LEATHER) {
+            this.uploadLayeredItem(lv5, lv2, lv3, lv6);
          } else {
-            this.m_uirjkeyq(lv5, lv2, lv6);
+            this.uploadLayeredItem(lv5, lv2, lv6);
          }
       }
    }
@@ -185,7 +193,7 @@
       this.register(Items.ARMOR_STAND, Models.SINGLE_LAYER_ITEM);
       this.register(Items.ARROW, Models.SINGLE_LAYER_ITEM);
       this.register(Items.BAKED_POTATO, Models.SINGLE_LAYER_ITEM);
-      this.register(Items.f_htfzipcj, Models.HANDHELD);
+      this.register(Items.BAMBOO, Models.HANDHELD);
       this.register(Items.BEEF, Models.SINGLE_LAYER_ITEM);
       this.register(Items.BEETROOT, Models.SINGLE_LAYER_ITEM);
       this.register(Items.BEETROOT_SOUP, Models.SINGLE_LAYER_ITEM);
@@ -209,12 +217,12 @@
       this.register(Items.CHICKEN, Models.SINGLE_LAYER_ITEM);
       this.register(Items.CHORUS_FRUIT, Models.SINGLE_LAYER_ITEM);
       this.register(Items.CLAY_BALL, Models.SINGLE_LAYER_ITEM);
-      this.m_pmffjxfg(Items.CLOCK);
+      this.registerClock(Items.CLOCK);
       this.register(Items.COAL, Models.SINGLE_LAYER_ITEM);
       this.register(Items.COD_BUCKET, Models.SINGLE_LAYER_ITEM);
       this.register(Items.COMMAND_BLOCK_MINECART, Models.SINGLE_LAYER_ITEM);
-      this.m_chmkiimy(Items.COMPASS);
-      this.m_chmkiimy(Items.RECOVERY_COMPASS);
+      this.registerCompass(Items.COMPASS);
+      this.registerCompass(Items.RECOVERY_COMPASS);
       this.register(Items.COOKED_BEEF, Models.SINGLE_LAYER_ITEM);
       this.register(Items.COOKED_CHICKEN, Models.SINGLE_LAYER_ITEM);
       this.register(Items.COOKED_COD, Models.SINGLE_LAYER_ITEM);
@@ -428,7 +436,7 @@
 
       for (Item lv : Registries.ITEM) {
          if (lv instanceof ArmorItem lv2) {
-            this.m_mppeudhx(lv2);
+            this.registerArmor(lv2);
          }
       }
 
@@ -456,14 +464,15 @@
 
    /**
     * @mapping {@literal hashed net/minecraft/unmapped/C_cfvrpkog$C_cutcputf}
-    * @mapping {@literal named net/minecraft/data/client/ItemModelGenerator$C_cutcputf}
+    * @mapping {@literal named net/minecraft/data/client/ItemModelGenerator$TrimModelData}
     */
-   static record C_cutcputf(String name, float itemModelIndex, Map<ArmorMaterial, String> overrideArmorMaterials) {
+   static record TrimModelData(String name, float itemModelIndex, Map<ArmorMaterial, String> overrideArmorMaterials) {
       /**
-       * Mapping not found
+       * @mapping {@literal hashed m_wmqpuvqn Lnet/minecraft/unmapped/C_cfvrpkog$C_cutcputf;m_wmqpuvqn(Lnet/minecraft/unmapped/C_fwzogbap;)Ljava/lang/String;}
+       * @mapping {@literal named getAppliedName Lnet/minecraft/data/client/ItemModelGenerator$TrimModelData;getAppliedName(Lnet/minecraft/item/ArmorMaterial;)Ljava/lang/String;}
        */
-      public String m_wmqpuvqn(ArmorMaterial arg) {
-         return (String)this.overrideArmorMaterials.getOrDefault(arg, this.name);
+      public String getAppliedName(ArmorMaterial material) {
+         return (String)this.overrideArmorMaterials.getOrDefault(material, this.name);
       }
    }
 }


The remaining diff is too long!

Please sign in to comment.