progress · ix0rai/quilt-mappings@1f8674b

github-actions · 2023-11-04T05:10:35Z

With commit 1f8674b, 180 file(s) were updated with 6714 line(s) added and 5692 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-04 05:10:33.049708764 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.java	2023-11-04 05:09:32.450090211 +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-04 05:10:32.889709776 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BredAnimalsCriterion.java	2023-11-04 05:09:32.330090963 +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-04 05:10:32.937709472 +0000
+++ namedSrc/net/minecraft/advancement/criterion/BrewedPotionCriterion.java	2023-11-04 05:09:32.362090762 +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-04 05:10:32.925709548 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChangedDimensionCriterion.java	2023-11-04 05:09:32.354090812 +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-04 05:10:33.001709068 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ChanneledLightningCriterion.java	2023-11-04 05:09:32.414090437 +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-04 05:10:32.881709826 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ConstructBeaconCriterion.java	2023-11-04 05:09:32.322091013 +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-04 05:10:33.041708815 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ConsumeItemCriterion.java	2023-11-04 05:09:32.442090261 +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-04 05:10:33.005709043 +0000
+++ namedSrc/net/minecraft/advancement/criterion/Criterion.java	2023-11-04 05:09:32.414090437 +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-04 05:10:33.025708916 +0000
+++ namedSrc/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.java	2023-11-04 05:09:32.434090311 +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-04 05:10:33.073708613 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EffectsChangedCriterion.java	2023-11-04 05:09:32.470090085 +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-04 05:10:32.961709321 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnchantedItemCriterion.java	2023-11-04 05:09:32.382090637 +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-04 05:10:33.005709043 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EnterBlockCriterion.java	2023-11-04 05:09:32.414090437 +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-04 05:10:32.981709195 +0000
+++ namedSrc/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.java	2023-11-04 05:09:32.398090537 +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-04 05:10:33.041708815 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FilledBucketCriterion.java	2023-11-04 05:09:32.446090236 +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-04 05:10:33.153708107 +0000
+++ namedSrc/net/minecraft/advancement/criterion/FishingRodHookedCriterion.java	2023-11-04 05:09:32.538089659 +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-04 05:10:32.993709119 +0000
+++ namedSrc/net/minecraft/advancement/criterion/InventoryChangedCriterion.java	2023-11-04 05:09:32.406090487 +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-04 05:10:33.161708056 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.java	2023-11-04 05:09:32.546089609 +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-04 05:10:32.957709346 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ItemUsedOnLocationCriterion.java	2023-11-04 05:09:32.378090662 +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-04 05:10:33.041708815 +0000
+++ namedSrc/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.java	2023-11-04 05:09:32.442090261 +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-04 05:10:32.937709472 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LevitationCriterion.java	2023-11-04 05:09:32.362090762 +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-04 05:10:32.973709245 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LightningStrikeCriterion.java	2023-11-04 05:09:32.390090587 +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-04 05:10:33.057708714 +0000
+++ namedSrc/net/minecraft/advancement/criterion/LocationCriterion.java	2023-11-04 05:09:32.454090186 +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-04 05:10:32.973709245 +0000
+++ namedSrc/net/minecraft/advancement/criterion/OnKilledCriterion.java	2023-11-04 05:09:32.390090587 +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-04 05:10:33.061708689 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PickedUpThrownItemCriterion.java	2023-11-04 05:09:32.462090135 +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-04 05:10:33.001709068 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.java	2023-11-04 05:09:32.414090437 +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-04 05:10:32.901709700 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.java	2023-11-04 05:09:32.334090938 +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-04 05:10:32.961709321 +0000
+++ namedSrc/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.java	2023-11-04 05:09:32.382090637 +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-04 05:10:33.081708563 +0000
+++ namedSrc/net/minecraft/advancement/criterion/RecipeCraftedCriterion.java	2023-11-04 05:09:32.478090036 +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-04 05:10:33.161708056 +0000
+++ namedSrc/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.java	2023-11-04 05:09:32.546089609 +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-04 05:10:32.957709346 +0000
+++ namedSrc/net/minecraft/advancement/criterion/ShotCrossbowCriterion.java	2023-11-04 05:09:32.378090662 +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-04 05:10:33.117708335 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SlideDownBlockCriterion.java	2023-11-04 05:09:32.510089835 +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-04 05:10:32.917709599 +0000
+++ namedSrc/net/minecraft/advancement/criterion/StartedRidingCriterion.java	2023-11-04 05:09:32.350090837 +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-04 05:10:33.001709068 +0000
+++ namedSrc/net/minecraft/advancement/criterion/SummonedEntityCriterion.java	2023-11-04 05:09:32.414090437 +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-04 05:10:33.065708663 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TameAnimalCriterion.java	2023-11-04 05:09:32.462090135 +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-04 05:10:33.097708461 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TargetHitCriterion.java	2023-11-04 05:09:32.490089960 +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-04 05:10:33.121708310 +0000
+++ namedSrc/net/minecraft/advancement/criterion/TravelCriterion.java	2023-11-04 05:09:32.514089810 +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-04 05:10:33.129708259 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsedTotemCriterion.java	2023-11-04 05:09:32.518089785 +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-04 05:10:33.097708461 +0000
+++ namedSrc/net/minecraft/advancement/criterion/UsingItemCriterion.java	2023-11-04 05:09:32.486089985 +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-04 05:10:32.977709220 +0000
+++ namedSrc/net/minecraft/advancement/criterion/VillagerTradeCriterion.java	2023-11-04 05:09:32.394090562 +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-04 05:10:33.065708663 +0000
+++ namedSrc/net/minecraft/block/BambooSaplingBlock.java	2023-11-04 05:09:32.462090135 +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-04 05:10:33.161708056 +0000
+++ namedSrc/net/minecraft/block/Block.java	2023-11-04 05:09:32.546089609 +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 · 2023-11-04T05:10:36Z

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-04 05:10:32.965709296 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2023-11-04 05:09:32.382090637 +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-04 05:10:32.893709750 +0000
+++ namedSrc/net/minecraft/block/cauldron/CauldronBehavior.java	2023-11-04 05:09:32.334090938 +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-04 05:10:33.041708815 +0000
+++ namedSrc/net/minecraft/block/ComposterBlock.java	2023-11-04 05:09:32.446090236 +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-04 05:10:33.025708916 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2023-11-04 05:09:32.434090311 +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-04 05:10:33.081708563 +0000
+++ namedSrc/net/minecraft/block/entity/DecoratedPotBlockEntity.java	2023-11-04 05:09:32.474090061 +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-04 05:10:33.013708992 +0000
+++ namedSrc/net/minecraft/block/GlowLichenBlock.java	2023-11-04 05:09:32.426090361 +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-04 05:10:33.021708941 +0000
+++ namedSrc/net/minecraft/block/LightBlock.java	2023-11-04 05:09:32.430090336 +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-04 05:10:32.949709396 +0000
+++ namedSrc/net/minecraft/block/PumpkinBlock.java	2023-11-04 05:09:32.370090712 +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-04 05:10:33.101708436 +0000
+++ namedSrc/net/minecraft/block/RespawnAnchorBlock.java	2023-11-04 05:09:32.490089960 +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-04 05:10:33.033708866 +0000
+++ namedSrc/net/minecraft/block/sculk/SculkVeinBlock.java	2023-11-04 05:09:32.442090261 +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-04 05:10:33.129708259 +0000
+++ namedSrc/net/minecraft/block/WitherSkullBlock.java	2023-11-04 05:09:32.518089785 +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-04 05:10:33.089708512 +0000
+++ namedSrc/net/minecraft/client/color/block/BlockColors.java	2023-11-04 05:09:32.482090010 +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-04 05:10:32.981709195 +0000
+++ namedSrc/net/minecraft/client/gui/screen/CustomizeFlatWorldScreen.java	2023-11-04 05:09:32.394090562 +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-04 05:10:32.889709776 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/CartographyTableScreen.java	2023-11-04 05:09:32.330090963 +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-04 05:10:33.137708208 +0000
+++ namedSrc/net/minecraft/client/gui/screen/recipe_book/RecipeResultCollection.java	2023-11-04 05:09:32.522089760 +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/StatsScreen.java namedSrc/net/minecraft/client/gui/screen/StatsScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/StatsScreen.java	2023-11-04 05:10:33.157708082 +0000
+++ namedSrc/net/minecraft/client/gui/screen/StatsScreen.java	2023-11-04 05:09:32.542089634 +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/item/ModelPredicateProviderRegistry.java namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java
--- namedTargetSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2023-11-04 05:10:33.033708866 +0000
+++ namedSrc/net/minecraft/client/item/ModelPredicateProviderRegistry.java	2023-11-04 05:09:32.438090286 +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/ClientCommandSource.java namedSrc/net/minecraft/client/network/ClientCommandSource.java
--- namedTargetSrc/net/minecraft/client/network/ClientCommandSource.java	2023-11-04 05:10:33.105708411 +0000
+++ namedSrc/net/minecraft/client/network/ClientCommandSource.java	2023-11-04 05:09:32.494089935 +0000
@@ -139,9 +139,9 @@
     * Mapping not found
     */
    @Override
-   public boolean hasPermission(int level) {
+   public boolean hasPermission(int i) {
       ClientPlayerEntity lv = this.client.player;
-      return lv != null ? lv.hasPermissionLevel(level) : level == 0;
+      return lv != null ? lv.hasPermissionLevel(i) : i == 0;
    }
 
    /**
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-04 05:10:33.141708183 +0000
+++ namedSrc/net/minecraft/client/network/ClientPlayNetworkHandler.java	2023-11-04 05:09:32.526089734 +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-04 05:10:32.881709826 +0000
+++ namedSrc/net/minecraft/client/recipe_book/RecipeBookGroup.java	2023-11-04 05:09:32.322091013 +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-04 05:10:32.913709624 +0000
+++ namedSrc/net/minecraft/client/render/item/ItemRenderer.java	2023-11-04 05:09:32.346090863 +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-04 05:10:32.893709750 +0000
+++ namedSrc/net/minecraft/client/render/RenderLayers.java	2023-11-04 05:09:32.330090963 +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-04 05:10:33.073708613 +0000
+++ namedSrc/net/minecraft/client/world/ClientWorld.java	2023-11-04 05:09:32.470090085 +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-04 05:10:33.053708739 +0000
+++ namedSrc/net/minecraft/data/client/BlockStateDefinitionProvider.java	2023-11-04 05:09:32.454090186 +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]));
    }
 
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-04 05:10:33.145708158 +0000
+++ namedSrc/net/minecraft/data/client/ItemModelGenerator.java	2023-11-04 05:09:32.534089684 +0000
@@ -129,7 +129,7 @@
     * Mapping not found
     */
    private JsonObject m_llpeiyoc(Identifier arg, Map<TextureKey, Identifier> map, ArmorMaterial arg2) {
-      JsonObject jsonObject = Models.DOUBLE_LAYER_ITEM.m_mjmunmmv(arg, map);
+      JsonObject jsonObject = Models.DOUBLE_LAYER_ITEM.createJson(arg, map);
       JsonArray jsonArray = new JsonArray();
 
       for (ItemModelGenerator.C_cutcputf lv : f_ccmpywsi) {
@@ -153,9 +153,9 @@
       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()));
+         Models.DOUBLE_LAYER_ITEM.upload(lv, Texture.doubleLayer(lv2, lv3), this.writer, (arg2, map) -> this.m_llpeiyoc(arg2, map, arg.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.m_llpeiyoc(arg2, map, arg.getMaterial()));
       }
 
       for (ItemModelGenerator.C_cutcputf lv4 : f_ccmpywsi) {
@@ -185,7 +185,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);

github-actions · 2023-11-04T05:10:37Z

View the diff here (3/3):

diff -bur namedTargetSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java namedSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java
--- namedTargetSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java	2023-11-04 05:10:33.029708891 +0000
+++ namedSrc/net/minecraft/data/client/model/BlockStateModelGenerator.java	2023-11-04 05:09:32.434090311 +0000
@@ -25,6 +25,7 @@
 import java.util.stream.IntStream;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
+import net.minecraft.block.Crafter;
 import net.minecraft.block.MangrovePropaguleBlock;
 import net.minecraft.block.PitcherCropBlock;
 import net.minecraft.block.SnifferEggBlock;
@@ -54,7 +55,6 @@
 import net.minecraft.state.property.BooleanProperty;
 import net.minecraft.state.property.Properties;
 import net.minecraft.state.property.Property;
-import net.minecraft.unmapped.C_dmnruvyr;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.math.Direction;
@@ -103,10 +103,13 @@
       .put(Blocks.RED_SANDSTONE, TexturedModel.SIDE_TOP_BOTTOM_WALL.get(Blocks.RED_SANDSTONE))
       .put(Blocks.SMOOTH_SANDSTONE, TexturedModel.getCubeAll(Texture.getSubId(Blocks.SANDSTONE, "_top")))
       .put(Blocks.SMOOTH_RED_SANDSTONE, TexturedModel.getCubeAll(Texture.getSubId(Blocks.RED_SANDSTONE, "_top")))
-      .put(Blocks.CUT_SANDSTONE, TexturedModel.CUBE_COLUMN.get(Blocks.SANDSTONE).texture(arg -> arg.put(TextureKey.SIDE, Texture.getId(Blocks.CUT_SANDSTONE))))
+      .put(
+         Blocks.CUT_SANDSTONE,
+         TexturedModel.CUBE_COLUMN.get(Blocks.SANDSTONE).texture(texture -> texture.put(TextureKey.SIDE, Texture.getId(Blocks.CUT_SANDSTONE)))
+      )
       .put(
          Blocks.CUT_RED_SANDSTONE,
-         TexturedModel.CUBE_COLUMN.get(Blocks.RED_SANDSTONE).texture(arg -> arg.put(TextureKey.SIDE, Texture.getId(Blocks.CUT_RED_SANDSTONE)))
+         TexturedModel.CUBE_COLUMN.get(Blocks.RED_SANDSTONE).texture(texture -> texture.put(TextureKey.SIDE, Texture.getId(Blocks.CUT_RED_SANDSTONE)))
       )
       .put(Blocks.QUARTZ_BLOCK, TexturedModel.CUBE_COLUMN.get(Blocks.QUARTZ_BLOCK))
       .put(Blocks.SMOOTH_QUARTZ, TexturedModel.getCubeAll(Texture.getSubId(Blocks.QUARTZ_BLOCK, "_bottom")))
@@ -114,7 +117,9 @@
       .put(Blocks.DEEPSLATE, TexturedModel.SIDE_END_WALL.get(Blocks.DEEPSLATE))
       .put(
          Blocks.CHISELED_QUARTZ_BLOCK,
-         TexturedModel.CUBE_COLUMN.get(Blocks.CHISELED_QUARTZ_BLOCK).texture(arg -> arg.put(TextureKey.SIDE, Texture.getId(Blocks.CHISELED_QUARTZ_BLOCK)))
+         TexturedModel.CUBE_COLUMN
+            .get(Blocks.CHISELED_QUARTZ_BLOCK)
+            .texture(texture -> texture.put(TextureKey.SIDE, Texture.getId(Blocks.CHISELED_QUARTZ_BLOCK)))
       )
       .put(Blocks.CHISELED_SANDSTONE, TexturedModel.CUBE_COLUMN.get(Blocks.CHISELED_SANDSTONE).texture(texture -> {
          texture.put(TextureKey.END, Texture.getSubId(Blocks.SANDSTONE, "_top"));
@@ -140,7 +145,7 @@
       .put(BlockFamily.Variant.CRACKED, BlockStateModelGenerator.BlockTexturePool::sandstone)
       .put(BlockFamily.Variant.CUSTOM_FENCE, BlockStateModelGenerator.BlockTexturePool::customFence)
       .put(BlockFamily.Variant.FENCE, BlockStateModelGenerator.BlockTexturePool::fence)
-      .put(BlockFamily.Variant.CUSTOM_FENCE_GATE, BlockStateModelGenerator.BlockTexturePool::m_bcruuyxo)
+      .put(BlockFamily.Variant.CUSTOM_FENCE_GATE, BlockStateModelGenerator.BlockTexturePool::customFenceGate)
       .put(BlockFamily.Variant.FENCE_GATE, BlockStateModelGenerator.BlockTexturePool::fenceGate)
       .put(BlockFamily.Variant.SIGN, BlockStateModelGenerator.BlockTexturePool::sign)
       .put(BlockFamily.Variant.SLAB, BlockStateModelGenerator.BlockTexturePool::slab)
@@ -196,9 +201,10 @@
       )
    );
    /**
-    * Mapping not found
+    * @mapping {@literal hashed f_brxmxele Lnet/minecraft/unmapped/C_ysvjbfkt;f_brxmxele:Ljava/util/Map;}
+    * @mapping {@literal named CHISELED_BOOKSHELF_SLOT_MODEL_CACHE Lnet/minecraft/data/client/model/BlockStateModelGenerator;CHISELED_BOOKSHELF_SLOT_MODEL_CACHE:Ljava/util/Map;}
     */
-   private static final Map<BlockStateModelGenerator.C_jhuevbcm, Identifier> f_brxmxele = new HashMap();
+   private static final Map<BlockStateModelGenerator.BookSlotModelCacheKey, Identifier> CHISELED_BOOKSHELF_SLOT_MODEL_CACHE = new HashMap();
 
    /**
     * @mapping {@literal hashed m_mqvibvqy Lnet/minecraft/unmapped/C_ysvjbfkt;m_mqvibvqy(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/util/function/BiConsumer;)Lnet/minecraft/unmapped/C_wqokohwr;}
@@ -285,7 +291,7 @@
     */
    private void registerItemModel(Block block) {
       Item lv = block.asItem();
-      if (lv != Items.f_wnlqvdbz) {
+      if (lv != Items.AIR) {
          Models.SINGLE_LAYER_ITEM.upload(ModelIds.getItemModelId(lv), Texture.layer0(block), this.modelCollector);
       }
    }
@@ -415,17 +421,17 @@
 
    /**
     * @mapping {@literal hashed m_lhwwsxgs Lnet/minecraft/unmapped/C_ysvjbfkt;m_lhwwsxgs(Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
-    * @mapping {@literal named m_lhwwsxgs Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_lhwwsxgs(Lnet/minecraft/block/Block;)V}
+    * @mapping {@literal named registerDustable Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerDustable(Lnet/minecraft/block/Block;)V}
     */
-   private void m_lhwwsxgs(Block block) {
+   private void registerDustable(Block block) {
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(block)
                .coordinate(
                   BlockStateVariantMap.create(Properties.DUSTED)
                      .register(
-                        integer -> {
-                           String string = "_" + integer;
+                        dusted -> {
+                           String string = "_" + dusted;
                            Identifier lv = Texture.getSubId(block, string);
                            return BlockStateVariant.create()
                               .put(VariantSettings.MODEL, Models.CUBE_ALL.upload(block, string, new Texture().put(TextureKey.ALL, lv), this.modelCollector));
@@ -508,139 +514,153 @@
    private static BlockStateVariantMap.QuadrupleProperty<Direction, DoubleBlockHalf, DoorHinge, Boolean> fillDoorVariantMap(
       BlockStateVariantMap.QuadrupleProperty<Direction, DoubleBlockHalf, DoorHinge, Boolean> variantMap,
       DoubleBlockHalf targetHalf,
-      Identifier regularModel,
-      Identifier hingeModel,
-      Identifier arg5,
-      Identifier arg6
+      Identifier leftHingeClosedModel,
+      Identifier leftHingeOpenModel,
+      Identifier rightHingeClosedModel,
+      Identifier rightHingeOpenModel
    ) {
-      return variantMap.register(Direction.EAST, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create().put(VariantSettings.MODEL, regularModel))
+      return variantMap.register(Direction.EAST, targetHalf, DoorHinge.LEFT, false, BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeClosedModel))
          .register(
             Direction.SOUTH,
             targetHalf,
             DoorHinge.LEFT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, regularModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
          )
          .register(
             Direction.WEST,
             targetHalf,
             DoorHinge.LEFT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, regularModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
          )
          .register(
             Direction.NORTH,
             targetHalf,
             DoorHinge.LEFT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, regularModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
          )
-         .register(Direction.EAST, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create().put(VariantSettings.MODEL, arg5))
+         .register(Direction.EAST, targetHalf, DoorHinge.RIGHT, false, BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeClosedModel))
          .register(
             Direction.SOUTH,
             targetHalf,
             DoorHinge.RIGHT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg5).put(VariantSettings.Y, VariantSettings.Rotation.R90)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
          )
          .register(
             Direction.WEST,
             targetHalf,
             DoorHinge.RIGHT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg5).put(VariantSettings.Y, VariantSettings.Rotation.R180)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
          )
          .register(
             Direction.NORTH,
             targetHalf,
             DoorHinge.RIGHT,
             false,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg5).put(VariantSettings.Y, VariantSettings.Rotation.R270)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeClosedModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
          )
          .register(
             Direction.EAST,
             targetHalf,
             DoorHinge.LEFT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, hingeModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
          )
          .register(
             Direction.SOUTH,
             targetHalf,
             DoorHinge.LEFT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, hingeModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
          )
          .register(
             Direction.WEST,
             targetHalf,
             DoorHinge.LEFT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, hingeModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
+            BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
          )
-         .register(Direction.NORTH, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create().put(VariantSettings.MODEL, hingeModel))
+         .register(Direction.NORTH, targetHalf, DoorHinge.LEFT, true, BlockStateVariant.create().put(VariantSettings.MODEL, leftHingeOpenModel))
          .register(
             Direction.EAST,
             targetHalf,
             DoorHinge.RIGHT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg6).put(VariantSettings.Y, VariantSettings.Rotation.R270)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R270)
          )
-         .register(Direction.SOUTH, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create().put(VariantSettings.MODEL, arg6))
+         .register(Direction.SOUTH, targetHalf, DoorHinge.RIGHT, true, BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeOpenModel))
          .register(
             Direction.WEST,
             targetHalf,
             DoorHinge.RIGHT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg6).put(VariantSettings.Y, VariantSettings.Rotation.R90)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R90)
          )
          .register(
             Direction.NORTH,
             targetHalf,
             DoorHinge.RIGHT,
             true,
-            BlockStateVariant.create().put(VariantSettings.MODEL, arg6).put(VariantSettings.Y, VariantSettings.Rotation.R180)
+            BlockStateVariant.create().put(VariantSettings.MODEL, rightHingeOpenModel).put(VariantSettings.Y, VariantSettings.Rotation.R180)
          );
    }
 
    /**
     * @mapping {@literal hashed m_cbfhoczw Lnet/minecraft/unmapped/C_ysvjbfkt;m_cbfhoczw(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr;}
-    * @mapping {@literal named m_cbfhoczw Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_cbfhoczw(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
+    * @mapping {@literal named createDoorBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;createDoorBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
     */
-   private static BlockStateSupplier m_cbfhoczw(
-      Block block, Identifier arg2, Identifier arg3, Identifier arg4, Identifier arg5, Identifier arg6, Identifier arg7, Identifier arg8, Identifier arg9
+   private static BlockStateSupplier createDoorBlockState(
+      Block doorBlock,
+      Identifier bottomLeftHingeClosedModelId,
+      Identifier bottomLeftHingeOpenModelId,
+      Identifier bottomRightHingeClosedModelId,
+      Identifier bottomRightHingeOpenModelId,
+      Identifier topLeftHingeClosedModelId,
+      Identifier topLeftHingeOpenModelId,
+      Identifier topRightHingeClosedModelId,
+      Identifier topRightHingeOpenModelId
    ) {
-      return VariantsBlockStateSupplier.create(block)
+      return VariantsBlockStateSupplier.create(doorBlock)
          .coordinate(
             fillDoorVariantMap(
                fillDoorVariantMap(
                   BlockStateVariantMap.create(Properties.HORIZONTAL_FACING, Properties.DOUBLE_BLOCK_HALF, Properties.DOOR_HINGE, Properties.OPEN),
                   DoubleBlockHalf.LOWER,
-                  arg2,
-                  arg3,
-                  arg4,
-                  arg5
+                  bottomLeftHingeClosedModelId,
+                  bottomLeftHingeOpenModelId,
+                  bottomRightHingeClosedModelId,
+                  bottomRightHingeOpenModelId
                ),
                DoubleBlockHalf.UPPER,
-               arg6,
-               arg7,
-               arg8,
-               arg9
+               topLeftHingeClosedModelId,
+               topLeftHingeOpenModelId,
+               topRightHingeClosedModelId,
+               topRightHingeOpenModelId
             )
          );
    }
 
    /**
     * @mapping {@literal hashed m_anzxptee Lnet/minecraft/unmapped/C_ysvjbfkt;m_anzxptee(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr;}
-    * @mapping {@literal named m_anzxptee Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_anzxptee(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
+    * @mapping {@literal named createCustomFenceBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;createCustomFenceBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
     */
-   static BlockStateSupplier m_anzxptee(Block block, Identifier arg2, Identifier arg3, Identifier arg4, Identifier arg5, Identifier arg6) {
-      return MultipartBlockStateSupplier.create(block)
-         .with(BlockStateVariant.create().put(VariantSettings.MODEL, arg2))
-         .with(When.create().set(Properties.NORTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, arg3).put(VariantSettings.UVLOCK, false))
-         .with(When.create().set(Properties.EAST, true), BlockStateVariant.create().put(VariantSettings.MODEL, arg4).put(VariantSettings.UVLOCK, false))
-         .with(When.create().set(Properties.SOUTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, arg5).put(VariantSettings.UVLOCK, false))
-         .with(When.create().set(Properties.WEST, true), BlockStateVariant.create().put(VariantSettings.MODEL, arg6).put(VariantSettings.UVLOCK, false));
+   static BlockStateSupplier createCustomFenceBlockState(
+      Block fenceBlock, Identifier postModelId, Identifier northModelId, Identifier eastModelId, Identifier southModelId, Identifier westModelId
+   ) {
+      return MultipartBlockStateSupplier.create(fenceBlock)
+         .with(BlockStateVariant.create().put(VariantSettings.MODEL, postModelId))
+         .with(
+            When.create().set(Properties.NORTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, northModelId).put(VariantSettings.UVLOCK, false)
+         )
+         .with(When.create().set(Properties.EAST, true), BlockStateVariant.create().put(VariantSettings.MODEL, eastModelId).put(VariantSettings.UVLOCK, false))
+         .with(
+            When.create().set(Properties.SOUTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, southModelId).put(VariantSettings.UVLOCK, false)
+         )
+         .with(When.create().set(Properties.WEST, true), BlockStateVariant.create().put(VariantSettings.MODEL, westModelId).put(VariantSettings.UVLOCK, false));
    }
 
    /**
@@ -738,9 +758,9 @@
     * @mapping {@literal named createFenceGateBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;createFenceGateBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Z)Lnet/minecraft/data/client/model/BlockStateSupplier;}
     */
    static BlockStateSupplier createFenceGateBlockState(
-      Block fenceGateBlock, Identifier openModelId, Identifier closedModelId, Identifier openWallModelId, Identifier closedWallModelId, boolean bl
+      Block fenceGateBlock, Identifier openModelId, Identifier closedModelId, Identifier openWallModelId, Identifier closedWallModelId, boolean uvLock
    ) {
-      return VariantsBlockStateSupplier.create(fenceGateBlock, BlockStateVariant.create().put(VariantSettings.UVLOCK, bl))
+      return VariantsBlockStateSupplier.create(fenceGateBlock, BlockStateVariant.create().put(VariantSettings.UVLOCK, uvLock))
          .coordinate(createSouthDefaultHorizontalRotationStates())
          .coordinate(
             BlockStateVariantMap.create(Properties.IN_WALL, Properties.OPEN)
@@ -1284,13 +1304,13 @@
 
    /**
     * @mapping {@literal hashed m_oxulsacv Lnet/minecraft/unmapped/C_ysvjbfkt;m_oxulsacv(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_pgmmajlq;Ljava/util/function/BiConsumer;)Lnet/minecraft/unmapped/C_wqokohwr;}
-    * @mapping {@literal named m_oxulsacv Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_oxulsacv(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/model/Texture;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
+    * @mapping {@literal named createUvLockedPillarBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;createUvLockedPillarBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/model/Texture;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
     */
-   static BlockStateSupplier m_oxulsacv(Block block, Texture arg2, BiConsumer<Identifier, Supplier<JsonElement>> biConsumer) {
-      Identifier lv = Models.CUBE_COLUMN_UV_LOCKED_X.upload(block, arg2, biConsumer);
-      Identifier lv2 = Models.CUBE_COLUMN_UV_LOCKED_Y.upload(block, arg2, biConsumer);
-      Identifier lv3 = Models.CUBE_COLUMN_UV_LOCKED_Z.upload(block, arg2, biConsumer);
-      Identifier lv4 = Models.CUBE_COLUMN.upload(block, arg2, biConsumer);
+   static BlockStateSupplier createUvLockedPillarBlockState(Block block, Texture texture, BiConsumer<Identifier, Supplier<JsonElement>> modelCollector) {
+      Identifier lv = Models.CUBE_COLUMN_UV_LOCKED_X.upload(block, texture, modelCollector);
+      Identifier lv2 = Models.CUBE_COLUMN_UV_LOCKED_Y.upload(block, texture, modelCollector);
+      Identifier lv3 = Models.CUBE_COLUMN_UV_LOCKED_Z.upload(block, texture, modelCollector);
+      Identifier lv4 = Models.CUBE_COLUMN.upload(block, texture, modelCollector);
       return VariantsBlockStateSupplier.create(block, BlockStateVariant.create().put(VariantSettings.MODEL, lv4))
          .coordinate(
             BlockStateVariantMap.create(Properties.AXIS)
@@ -1436,15 +1456,16 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zffcuixd Lnet/minecraft/unmapped/C_ysvjbfkt;m_zffcuixd(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
+    * @mapping {@literal named registerHangingSign Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerHangingSign(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V}
     */
-   public void m_zffcuixd(Block arg, Block arg2, Block arg3) {
-      Texture lv = Texture.particle(arg);
-      Identifier lv2 = Models.PARTICLE.upload(arg2, lv, this.modelCollector);
-      this.blockStateCollector.accept(createSingletonBlockState(arg2, lv2));
-      this.blockStateCollector.accept(createSingletonBlockState(arg3, lv2));
-      this.registerItemModel(arg2.asItem());
-      this.excludeFromSimpleItemModelGeneration(arg3);
+   public void registerHangingSign(Block log, Block hangingSign, Block wallSign) {
+      Texture lv = Texture.particle(log);
+      Identifier lv2 = Models.PARTICLE.upload(hangingSign, lv, this.modelCollector);
+      this.blockStateCollector.accept(createSingletonBlockState(hangingSign, lv2));
+      this.blockStateCollector.accept(createSingletonBlockState(wallSign, lv2));
+      this.registerItemModel(hangingSign.asItem());
+      this.excludeFromSimpleItemModelGeneration(wallSign);
    }
 
    /**
@@ -1462,23 +1483,24 @@
       Identifier lv8 = Models.DOOR_TOP_RIGHT.upload(doorBlock, lv, this.modelCollector);
       Identifier lv9 = Models.DOOR_TOP_RIGHT_OPEN.upload(doorBlock, lv, this.modelCollector);
       this.registerItemModel(doorBlock.asItem());
-      this.blockStateCollector.accept(m_cbfhoczw(doorBlock, lv2, lv3, lv4, lv5, lv6, lv7, lv8, lv9));
+      this.blockStateCollector.accept(createDoorBlockState(doorBlock, lv2, lv3, lv4, lv5, lv6, lv7, lv8, lv9));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_ewobmawf Lnet/minecraft/unmapped/C_ysvjbfkt;m_ewobmawf(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
+    * @mapping {@literal named registerCopperDoor Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCopperDoor(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V}
     */
-   private void m_ewobmawf(Block arg, Block arg2) {
-      Identifier lv = Models.DOOR_BOTTOM_LEFT.m_izvaynaq(arg);
-      Identifier lv2 = Models.DOOR_BOTTOM_LEFT_OPEN.m_izvaynaq(arg);
-      Identifier lv3 = Models.DOOR_BOTTOM_RIGHT.m_izvaynaq(arg);
-      Identifier lv4 = Models.DOOR_BOTTOM_RIGHT_OPEN.m_izvaynaq(arg);
-      Identifier lv5 = Models.DOOR_TOP_LEFT.m_izvaynaq(arg);
-      Identifier lv6 = Models.DOOR_TOP_LEFT_OPEN.m_izvaynaq(arg);
-      Identifier lv7 = Models.DOOR_TOP_RIGHT.m_izvaynaq(arg);
-      Identifier lv8 = Models.DOOR_TOP_RIGHT_OPEN.m_izvaynaq(arg);
-      this.registerParentedItemModel(arg2, ModelIds.getItemModelId(arg.asItem()));
-      this.blockStateCollector.accept(m_cbfhoczw(arg2, lv, lv2, lv3, lv4, lv5, lv6, lv7, lv8));
+   private void registerCopperDoor(Block doorBlock, Block parent) {
+      Identifier lv = Models.DOOR_BOTTOM_LEFT.getDefaultModelId(doorBlock);
+      Identifier lv2 = Models.DOOR_BOTTOM_LEFT_OPEN.getDefaultModelId(doorBlock);
+      Identifier lv3 = Models.DOOR_BOTTOM_RIGHT.getDefaultModelId(doorBlock);
+      Identifier lv4 = Models.DOOR_BOTTOM_RIGHT_OPEN.getDefaultModelId(doorBlock);
+      Identifier lv5 = Models.DOOR_TOP_LEFT.getDefaultModelId(doorBlock);
+      Identifier lv6 = Models.DOOR_TOP_LEFT_OPEN.getDefaultModelId(doorBlock);
+      Identifier lv7 = Models.DOOR_TOP_RIGHT.getDefaultModelId(doorBlock);
+      Identifier lv8 = Models.DOOR_TOP_RIGHT_OPEN.getDefaultModelId(doorBlock);
+      this.registerParentedItemModel(parent, ModelIds.getItemModelId(doorBlock.asItem()));
+      this.blockStateCollector.accept(createDoorBlockState(parent, lv, lv2, lv3, lv4, lv5, lv6, lv7, lv8));
    }
 
    /**
@@ -1508,14 +1530,15 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_pxydxvus Lnet/minecraft/unmapped/C_ysvjbfkt;m_pxydxvus(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
+    * @mapping {@literal named registerCopperTrapdoor Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCopperTrapdoor(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V}
     */
-   private void m_pxydxvus(Block arg, Block arg2) {
-      Identifier lv = Models.TEMPLATE_TRAPDOOR_TOP.m_izvaynaq(arg);
-      Identifier lv2 = Models.TEMPLATE_TRAPDOOR_BOTTOM.m_izvaynaq(arg);
-      Identifier lv3 = Models.TEMPLATE_TRAPDOOR_OPEN.m_izvaynaq(arg);
-      this.registerParentedItemModel(arg2, ModelIds.getItemModelId(arg.asItem()));
-      this.blockStateCollector.accept(createTrapdoorBlockState(arg2, lv, lv2, lv3));
+   private void registerCopperTrapdoor(Block trapdoorBlock, Block parent) {
+      Identifier lv = Models.TEMPLATE_TRAPDOOR_TOP.getDefaultModelId(trapdoorBlock);
+      Identifier lv2 = Models.TEMPLATE_TRAPDOOR_BOTTOM.getDefaultModelId(trapdoorBlock);
+      Identifier lv3 = Models.TEMPLATE_TRAPDOOR_OPEN.getDefaultModelId(trapdoorBlock);
+      this.registerParentedItemModel(parent, ModelIds.getItemModelId(trapdoorBlock.asItem()));
+      this.blockStateCollector.accept(createTrapdoorBlockState(parent, lv, lv2, lv3));
    }
 
    /**
@@ -1603,16 +1626,16 @@
 
    /**
     * @mapping {@literal hashed m_vvrdgvwj Lnet/minecraft/unmapped/C_ysvjbfkt;m_vvrdgvwj(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ysvjbfkt$C_mqnwzrnb;Lnet/minecraft/unmapped/C_vzlztuyw;[I)V}
-    * @mapping {@literal named m_vvrdgvwj Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_vvrdgvwj(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/model/BlockStateModelGenerator$TintType;Lnet/minecraft/state/property/Property;[I)V}
+    * @mapping {@literal named registerTintableStagedCrossBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerTintableStagedCrossBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/data/client/model/BlockStateModelGenerator$TintType;Lnet/minecraft/state/property/Property;[I)V}
     */
-   private void m_vvrdgvwj(Block block, BlockStateModelGenerator.TintType arg2, Property<Integer> arg3, int... is) {
-      if (arg3.getValues().size() != is.length) {
-         throw new IllegalArgumentException("missing values for property: " + arg3);
+   private void registerTintableStagedCrossBlockState(Block block, BlockStateModelGenerator.TintType tintType, Property<Integer> stageProperty, int... stages) {
+      if (stageProperty.getValues().size() != stages.length) {
+         throw new IllegalArgumentException("missing values for property: " + stageProperty);
       } else {
-         BlockStateVariantMap lv = BlockStateVariantMap.create(arg3).register(integer -> {
-            String string = "_stage" + is[integer];
+         BlockStateVariantMap lv = BlockStateVariantMap.create(stageProperty).register(stage -> {
+            String string = "_stage" + stages[stage];
             Texture lvx = Texture.cross(Texture.getSubId(block, string));
-            Identifier lv2 = arg2.getCrossModel().upload(block, string, lvx, this.modelCollector);
+            Identifier lv2 = tintType.getCrossModel().upload(block, string, lvx, this.modelCollector);
             return BlockStateVariant.create().put(VariantSettings.MODEL, lv2);
          });
          this.registerItemModel(block.asItem());
@@ -1674,17 +1697,17 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.AGE_7)
                      .register(
-                        integer -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, Models.STEM_GROWTH_STAGES[integer].upload(stemBlock, lv, this.modelCollector))
+                        age -> BlockStateVariant.create().put(VariantSettings.MODEL, Models.STEM_GROWTH_STAGES[age].upload(stemBlock, lv, this.modelCollector))
                      )
                )
          );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mwtfkfoc Lnet/minecraft/unmapped/C_ysvjbfkt;m_mwtfkfoc()V}
+    * @mapping {@literal named registerPitcherPlant Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerPitcherPlant()V}
     */
-   private void m_mwtfkfoc() {
+   private void registerPitcherPlant() {
       Block lv = Blocks.PITCHER_PLANT;
       this.registerItemModel(lv.asItem());
       Identifier lv2 = ModelIds.getBlockSubModelId(lv, "_top");
@@ -1693,15 +1716,16 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_oxrdxyqg Lnet/minecraft/unmapped/C_ysvjbfkt;m_oxrdxyqg()V}
+    * @mapping {@literal named registerPitcherCrop Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerPitcherCrop()V}
     */
-   private void m_oxrdxyqg() {
+   private void registerPitcherCrop() {
       Block lv = Blocks.PITCHER_CROP;
       this.registerItemModel(lv.asItem());
-      BlockStateVariantMap lv2 = BlockStateVariantMap.create(PitcherCropBlock.AGE, Properties.DOUBLE_BLOCK_HALF).register((integer, arg2) -> {
-         return switch (arg2) {
-            case UPPER -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(lv, "_top_stage_" + integer));
-            case LOWER -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(lv, "_bottom_stage_" + integer));
+      BlockStateVariantMap lv2 = BlockStateVariantMap.create(PitcherCropBlock.AGE, Properties.DOUBLE_BLOCK_HALF).register((age, half) -> {
+         return switch (half) {
+            case UPPER -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(lv, "_top_stage_" + age));
+            case LOWER -> BlockStateVariant.create().put(VariantSettings.MODEL, ModelIds.getBlockSubModelId(lv, "_bottom_stage_" + age));
          };
       });
       this.blockStateCollector.accept(VariantsBlockStateSupplier.create(lv).coordinate(lv2));
@@ -1846,20 +1870,20 @@
       Identifier lv4 = this.createSubModel(rail, "_on", Models.RAIL_FLAT, Texture::rail);
       Identifier lv5 = this.createSubModel(rail, "_on", Models.TEMPLATE_RAIL_RAISED_NE, Texture::rail);
       Identifier lv6 = this.createSubModel(rail, "_on", Models.TEMPLATE_RAIL_RAISED_SW, Texture::rail);
-      BlockStateVariantMap lv7 = BlockStateVariantMap.create(Properties.POWERED, Properties.STRAIGHT_RAIL_SHAPE).register((arg7, arg8) -> {
-         switch (arg8) {
+      BlockStateVariantMap lv7 = BlockStateVariantMap.create(Properties.POWERED, Properties.STRAIGHT_RAIL_SHAPE).register((powered, straightShape) -> {
+         switch (straightShape) {
             case NORTH_SOUTH:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv4 : lv);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv4 : lv);
             case EAST_WEST:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv4 : lv).put(VariantSettings.Y, VariantSettings.Rotation.R90);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv4 : lv).put(VariantSettings.Y, VariantSettings.Rotation.R90);
             case ASCENDING_EAST:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv5 : lv2).put(VariantSettings.Y, VariantSettings.Rotation.R90);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv5 : lv2).put(VariantSettings.Y, VariantSettings.Rotation.R90);
             case ASCENDING_WEST:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv6 : lv3).put(VariantSettings.Y, VariantSettings.Rotation.R90);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv6 : lv3).put(VariantSettings.Y, VariantSettings.Rotation.R90);
             case ASCENDING_NORTH:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv5 : lv2);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv5 : lv2);
             case ASCENDING_SOUTH:
-               return BlockStateVariant.create().put(VariantSettings.MODEL, arg7 ? lv6 : lv3);
+               return BlockStateVariant.create().put(VariantSettings.MODEL, powered ? lv6 : lv3);
             default:
                throw new UnsupportedOperationException("Fix you generator!");
          }
@@ -1914,14 +1938,14 @@
 
    /**
     * @mapping {@literal hashed m_rzwirmpw Lnet/minecraft/unmapped/C_ysvjbfkt;m_rzwirmpw(Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
-    * @mapping {@literal named m_rzwirmpw Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_rzwirmpw(Lnet/minecraft/block/Block;)V}
+    * @mapping {@literal named registerFlowerbed Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerFlowerbed(Lnet/minecraft/block/Block;)V}
     */
-   private void m_rzwirmpw(Block block) {
+   private void registerFlowerbed(Block block) {
       this.registerItemModel(block.asItem());
-      Identifier lv = TexturedModel.f_wkllyois.upload(block, this.modelCollector);
-      Identifier lv2 = TexturedModel.f_blaugkpd.upload(block, this.modelCollector);
-      Identifier lv3 = TexturedModel.f_fjiipfwk.upload(block, this.modelCollector);
-      Identifier lv4 = TexturedModel.f_ulvknsfo.upload(block, this.modelCollector);
+      Identifier lv = TexturedModel.FLOWERBED_1.upload(block, this.modelCollector);
+      Identifier lv2 = TexturedModel.FLOWERBED_2.upload(block, this.modelCollector);
+      Identifier lv3 = TexturedModel.FLOWERBED_3.upload(block, this.modelCollector);
+      Identifier lv4 = TexturedModel.FLOWERBED_4.upload(block, this.modelCollector);
       this.blockStateCollector
          .accept(
             MultipartBlockStateSupplier.create(block)
@@ -2066,7 +2090,7 @@
    private void registerCommandBlock(Block commandBlock) {
       Texture lv = Texture.sideFrontBack(commandBlock);
       Identifier lv2 = Models.TEMPLATE_COMMAND_BLOCK.upload(commandBlock, lv, this.modelCollector);
-      Identifier lv3 = this.createSubModel(commandBlock, "_conditional", Models.TEMPLATE_COMMAND_BLOCK, arg2 -> lv.copyAndAdd(TextureKey.SIDE, arg2));
+      Identifier lv3 = this.createSubModel(commandBlock, "_conditional", Models.TEMPLATE_COMMAND_BLOCK, id -> lv.copyAndAdd(TextureKey.SIDE, id));
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(commandBlock)
@@ -2162,7 +2186,7 @@
                               VariantSettings.MODEL,
                               TexturedModel.CUBE_BOTTOM_TOP
                                  .get(Blocks.BARREL)
-                                 .texture(arg2 -> arg2.put(TextureKey.TOP, lv))
+                                 .texture(texture -> texture.put(TextureKey.TOP, lv))
                                  .upload(Blocks.BARREL, "_open", this.modelCollector)
                            )
                      )
@@ -2179,8 +2203,8 @@
    ) {
       BlockStateVariant lv = BlockStateVariant.create().put(VariantSettings.MODEL, higherOrEqualModelId);
       BlockStateVariant lv2 = BlockStateVariant.create().put(VariantSettings.MODEL, lowerModelId);
-      return BlockStateVariantMap.create(property).register(comparable2 -> {
-         boolean bl = comparable2.compareTo(fence) >= 0;
+      return BlockStateVariantMap.create(property).register(value -> {
+         boolean bl = value.compareTo(fence) >= 0;
          return bl ? lv : lv2;
       });
    }
@@ -2213,10 +2237,10 @@
          Int2ObjectMap<Identifier> int2ObjectMap = new Int2ObjectOpenHashMap<>();
          BlockStateVariantMap lv = BlockStateVariantMap.create(ageProperty)
             .register(
-               integer -> {
-                  int i = ageTextureIndices[integer];
+               age -> {
+                  int i = ageTextureIndices[age];
                   Identifier lvx = int2ObjectMap.computeIfAbsent(
-                     i, (Int2ObjectFunction<? extends Identifier>)(j -> this.createSubModel(crop, "_stage" + i, Models.CROP, Texture::crop))
+                     i, (Int2ObjectFunction<? extends Identifier>)(key -> this.createSubModel(crop, "_stage" + i, Models.CROP, Texture::crop))
                   );
                   return BlockStateVariant.create().put(VariantSettings.MODEL, lvx);
                }
@@ -2235,7 +2259,7 @@
       Identifier lv2 = ModelIds.getBlockSubModelId(Blocks.BELL, "_ceiling");
       Identifier lv3 = ModelIds.getBlockSubModelId(Blocks.BELL, "_wall");
       Identifier lv4 = ModelIds.getBlockSubModelId(Blocks.BELL, "_between_walls");
-      this.registerItemModel(Items.f_ufosooyx);
+      this.registerItemModel(Items.BELL);
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(Blocks.BELL)
@@ -2368,7 +2392,7 @@
    private void registerCooker(Block cooker, TexturedModel.Factory modelFactory) {
       Identifier lv = modelFactory.upload(cooker, this.modelCollector);
       Identifier lv2 = Texture.getSubId(cooker, "_front_on");
-      Identifier lv3 = modelFactory.get(cooker).texture(arg2 -> arg2.put(TextureKey.FRONT, lv2)).upload(cooker, "_on", this.modelCollector);
+      Identifier lv3 = modelFactory.get(cooker).texture(texture -> texture.put(TextureKey.FRONT, lv2)).upload(cooker, "_on", this.modelCollector);
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(cooker)
@@ -2412,9 +2436,9 @@
    private void registerPottedAzaleaBush(Block block) {
       Identifier lv;
       if (block == Blocks.POTTED_FLOWERING_AZALEA_BUSH) {
-         lv = Models.f_cvgdtrqx.upload(block, Texture.m_nzbyyqjx(block), this.modelCollector);
+         lv = Models.TEMPLATE_POTTED_FLOWERING_AZALEA_BUSH.upload(block, Texture.pottedAzalea(block), this.modelCollector);
       } else {
-         lv = Models.TEMPLATE_POTTED_AZALEA_BUSH.upload(block, Texture.m_nzbyyqjx(block), this.modelCollector);
+         lv = Models.TEMPLATE_POTTED_AZALEA_BUSH.upload(block, Texture.pottedAzalea(block), this.modelCollector);
       }
 
       this.blockStateCollector.accept(createSingletonBlockState(block, lv));
@@ -2511,7 +2535,7 @@
     * @mapping {@literal named registerComparator Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerComparator()V}
     */
    private void registerComparator() {
-      this.registerItemModel(Items.f_eqdtoijj);
+      this.registerItemModel(Items.COMPARATOR);
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(Blocks.COMPARATOR)
@@ -2559,7 +2583,7 @@
     * @mapping {@literal named registerBrewingStand Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerBrewingStand()V}
     */
    private void registerBrewingStand() {
-      this.registerItemModel(Items.f_rgwbnfoa);
+      this.registerItemModel(Items.BREWING_STAND);
       this.blockStateCollector
          .accept(
             MultipartBlockStateSupplier.create(Blocks.BREWING_STAND)
@@ -2682,7 +2706,7 @@
     * @mapping {@literal named registerCake Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCake()V}
     */
    private void registerCake() {
-      this.registerItemModel(Items.f_xigegqnt);
+      this.registerItemModel(Items.CAKE);
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(Blocks.CAKE)
@@ -2743,9 +2767,9 @@
 
    /**
     * @mapping {@literal hashed m_jzrspkqa Lnet/minecraft/unmapped/C_ysvjbfkt;m_jzrspkqa(Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
-    * @mapping {@literal named m_jzrspkqa Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_jzrspkqa(Lnet/minecraft/block/Block;)V}
+    * @mapping {@literal named registerCube Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCube(Lnet/minecraft/block/Block;)V}
     */
-   public void m_jzrspkqa(Block block) {
+   public void registerCube(Block block) {
       Texture lv = new Texture()
          .put(TextureKey.PARTICLE, Texture.getSubId(block, "_particle"))
          .put(TextureKey.DOWN, Texture.getSubId(block, "_down"))
@@ -2762,8 +2786,8 @@
     * @mapping {@literal named registerPumpkins Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerPumpkins()V}
     */
    private void registerPumpkins() {
-      Texture lv = Texture.sideEnd(Blocks.f_cyinnipu);
-      this.blockStateCollector.accept(createSingletonBlockState(Blocks.f_cyinnipu, ModelIds.getBlockModelId(Blocks.f_cyinnipu)));
+      Texture lv = Texture.sideEnd(Blocks.PUMPKIN);
+      this.blockStateCollector.accept(createSingletonBlockState(Blocks.PUMPKIN, ModelIds.getBlockModelId(Blocks.PUMPKIN)));
       this.registerNorthDefaultHorizontalRotatable(Blocks.CARVED_PUMPKIN, lv);
       this.registerNorthDefaultHorizontalRotatable(Blocks.JACK_O_LANTERN, lv);
    }
@@ -2786,7 +2810,7 @@
     * @mapping {@literal named registerCauldron Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCauldron()V}
     */
    private void registerCauldron() {
-      this.registerItemModel(Items.f_boxtlgii);
+      this.registerItemModel(Items.CAULDRON);
       this.registerSimpleState(Blocks.CAULDRON);
       this.blockStateCollector
          .accept(
@@ -2872,15 +2896,16 @@
    private void registerChorusFlower() {
       Texture lv = Texture.texture(Blocks.CHORUS_FLOWER);
       Identifier lv2 = Models.TEMPLATE_CHORUS_FLOWER.upload(Blocks.CHORUS_FLOWER, lv, this.modelCollector);
-      Identifier lv3 = this.createSubModel(Blocks.CHORUS_FLOWER, "_dead", Models.TEMPLATE_CHORUS_FLOWER, arg2 -> lv.copyAndAdd(TextureKey.TEXTURE, arg2));
+      Identifier lv3 = this.createSubModel(Blocks.CHORUS_FLOWER, "_dead", Models.TEMPLATE_CHORUS_FLOWER, id -> lv.copyAndAdd(TextureKey.TEXTURE, id));
       this.blockStateCollector
          .accept(VariantsBlockStateSupplier.create(Blocks.CHORUS_FLOWER).coordinate(createValueFencedModelMap(Properties.AGE_5, 5, lv3, lv2)));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_vgjywrmr Lnet/minecraft/unmapped/C_ysvjbfkt;m_vgjywrmr()V}
+    * @mapping {@literal named registerCrafter Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCrafter()V}
     */
-   private void m_vgjywrmr() {
+   private void registerCrafter() {
       Identifier lv = ModelIds.getBlockModelId(Blocks.CRAFTER);
       Identifier lv2 = ModelIds.getBlockSubModelId(Blocks.CRAFTER, "_triggered");
       Identifier lv3 = ModelIds.getBlockSubModelId(Blocks.CRAFTER, "_crafting");
@@ -2889,10 +2914,11 @@
          .accept(
             VariantsBlockStateSupplier.create(Blocks.CRAFTER)
                .coordinate(
-                  BlockStateVariantMap.create(Properties.ORIENTATION).register(arg -> this.addJigsawOrientationToVariant(arg, BlockStateVariant.create()))
+                  BlockStateVariantMap.create(Properties.ORIENTATION)
+                     .register(orientation -> this.addJigsawOrientationToVariant(orientation, BlockStateVariant.create()))
                )
                .coordinate(
-                  BlockStateVariantMap.create(Properties.TRIGGERED, C_dmnruvyr.f_vffbqbgm)
+                  BlockStateVariantMap.create(Properties.TRIGGERED, Crafter.f_vffbqbgm)
                      .register(false, false, BlockStateVariant.create().put(VariantSettings.MODEL, lv))
                      .register(true, true, BlockStateVariant.create().put(VariantSettings.MODEL, lv4))
                      .register(true, false, BlockStateVariant.create().put(VariantSettings.MODEL, lv2))
@@ -3156,42 +3182,43 @@
 
    /**
     * @mapping {@literal hashed m_dnjqhzou Lnet/minecraft/unmapped/C_ysvjbfkt;m_dnjqhzou(Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
-    * @mapping {@literal named m_dnjqhzou Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_dnjqhzou(Lnet/minecraft/block/Block;)V}
+    * @mapping {@literal named registerCopperBulb Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCopperBulb(Lnet/minecraft/block/Block;)V}
     */
-   private void m_dnjqhzou(Block block) {
-      Identifier lv = Models.CUBE_ALL.upload(block, Texture.all(block), this.modelCollector);
-      Identifier lv2 = this.createSubModel(block, "_powered", Models.CUBE_ALL, Texture::all);
-      Identifier lv3 = this.createSubModel(block, "_lit", Models.CUBE_ALL, Texture::all);
-      Identifier lv4 = this.createSubModel(block, "_lit_powered", Models.CUBE_ALL, Texture::all);
-      this.blockStateCollector.accept(this.m_ibtoybri(block, lv, lv3, lv2, lv4));
+   private void registerCopperBulb(Block bulb) {
+      Identifier lv = Models.CUBE_ALL.upload(bulb, Texture.all(bulb), this.modelCollector);
+      Identifier lv2 = this.createSubModel(bulb, "_powered", Models.CUBE_ALL, Texture::all);
+      Identifier lv3 = this.createSubModel(bulb, "_lit", Models.CUBE_ALL, Texture::all);
+      Identifier lv4 = this.createSubModel(bulb, "_lit_powered", Models.CUBE_ALL, Texture::all);
+      this.blockStateCollector.accept(this.createCopperBulbBlockState(bulb, lv, lv3, lv2, lv4));
    }
 
    /**
     * @mapping {@literal hashed m_ibtoybri Lnet/minecraft/unmapped/C_ysvjbfkt;m_ibtoybri(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_wqokohwr;}
-    * @mapping {@literal named m_ibtoybri Lnet/minecraft/data/client/model/BlockStateModelGenerator;m_ibtoybri(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
+    * @mapping {@literal named createCopperBulbBlockState Lnet/minecraft/data/client/model/BlockStateModelGenerator;createCopperBulbBlockState(Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/model/BlockStateSupplier;}
     */
-   private BlockStateSupplier m_ibtoybri(Block block, Identifier arg2, Identifier arg3, Identifier arg4, Identifier arg5) {
+   private BlockStateSupplier createCopperBulbBlockState(Block block, Identifier base, Identifier lit, Identifier powered, Identifier litAndPowered) {
       return VariantsBlockStateSupplier.create(block)
          .coordinate(
             BlockStateVariantMap.create(Properties.LIT, Properties.POWERED)
                .register(
-                  (arg5x, arg6) -> arg5x
-                        ? BlockStateVariant.create().put(VariantSettings.MODEL, arg6 ? arg5 : arg3)
-                        : BlockStateVariant.create().put(VariantSettings.MODEL, arg6 ? arg4 : arg2)
+                  (litx, poweredx) -> litx
+                        ? BlockStateVariant.create().put(VariantSettings.MODEL, poweredx ? litAndPowered : lit)
+                        : BlockStateVariant.create().put(VariantSettings.MODEL, poweredx ? powered : base)
                )
          );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_hjdevwtp Lnet/minecraft/unmapped/C_ysvjbfkt;m_hjdevwtp(Lnet/minecraft/unmapped/C_mmxmpdoq;Lnet/minecraft/unmapped/C_mmxmpdoq;)V}
+    * @mapping {@literal named registerWaxedCopperBulb Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerWaxedCopperBulb(Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V}
     */
-   private void m_hjdevwtp(Block arg, Block arg2) {
-      Identifier lv = ModelIds.getBlockModelId(arg);
-      Identifier lv2 = ModelIds.getBlockSubModelId(arg, "_powered");
-      Identifier lv3 = ModelIds.getBlockSubModelId(arg, "_lit");
-      Identifier lv4 = ModelIds.getBlockSubModelId(arg, "_lit_powered");
-      this.registerParentedItemModel(arg2, ModelIds.getItemModelId(arg.asItem()));
-      this.blockStateCollector.accept(this.m_ibtoybri(arg2, lv, lv3, lv2, lv4));
+   private void registerWaxedCopperBulb(Block bulb, Block waxedBulb) {
+      Identifier lv = ModelIds.getBlockModelId(bulb);
+      Identifier lv2 = ModelIds.getBlockSubModelId(bulb, "_powered");
+      Identifier lv3 = ModelIds.getBlockSubModelId(bulb, "_lit");
+      Identifier lv4 = ModelIds.getBlockSubModelId(bulb, "_lit_powered");
+      this.registerParentedItemModel(waxedBulb, ModelIds.getItemModelId(bulb.asItem()));
+      this.blockStateCollector.accept(this.createCopperBulbBlockState(waxedBulb, lv, lv3, lv2, lv4));
    }
 
    /**
@@ -3373,7 +3400,7 @@
     */
    private static List<BlockStateVariant> buildBlockStateVariants(List<Identifier> modelIds, UnaryOperator<BlockStateVariant> processor) {
       return (List<BlockStateVariant>)modelIds.stream()
-         .map(arg -> BlockStateVariant.create().put(VariantSettings.MODEL, arg))
+         .map(id -> BlockStateVariant.create().put(VariantSettings.MODEL, id))
          .map(processor)
          .collect(Collectors.toList());
    }
@@ -3395,21 +3422,21 @@
       this.blockStateCollector
          .accept(
             MultipartBlockStateSupplier.create(Blocks.FIRE)
-               .with(lv, buildBlockStateVariants(list, arg -> arg))
-               .with(When.anyOf(When.create().set(Properties.NORTH, true), lv), buildBlockStateVariants(list2, arg -> arg))
+               .with(lv, buildBlockStateVariants(list, variant -> variant))
+               .with(When.anyOf(When.create().set(Properties.NORTH, true), lv), buildBlockStateVariants(list2, variant -> variant))
                .with(
                   When.anyOf(When.create().set(Properties.EAST, true), lv),
-                  buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R90))
+                  buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R90))
                )
                .with(
                   When.anyOf(When.create().set(Properties.SOUTH, true), lv),
-                  buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R180))
+                  buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R180))
                )
                .with(
                   When.anyOf(When.create().set(Properties.WEST, true), lv),
-                  buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R270))
+                  buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R270))
                )
-               .with(When.create().set(Properties.UP, true), buildBlockStateVariants(list3, arg -> arg))
+               .with(When.create().set(Properties.UP, true), buildBlockStateVariants(list3, variant -> variant))
          );
    }
 
@@ -3423,11 +3450,11 @@
       this.blockStateCollector
          .accept(
             MultipartBlockStateSupplier.create(Blocks.SOUL_FIRE)
-               .with(buildBlockStateVariants(list, arg -> arg))
-               .with(buildBlockStateVariants(list2, arg -> arg))
-               .with(buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R90)))
-               .with(buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R180)))
-               .with(buildBlockStateVariants(list2, arg -> arg.put(VariantSettings.Y, VariantSettings.Rotation.R270)))
+               .with(buildBlockStateVariants(list, variant -> variant))
+               .with(buildBlockStateVariants(list2, variant -> variant))
+               .with(buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R90)))
+               .with(buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R180)))
+               .with(buildBlockStateVariants(list2, variant -> variant.put(VariantSettings.Y, VariantSettings.Rotation.R270)))
          );
    }
 
@@ -3443,19 +3470,21 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_mkszkjye Lnet/minecraft/unmapped/C_ysvjbfkt;m_mkszkjye()V}
+    * @mapping {@literal named registerMuddyMangroveRoots Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerMuddyMangroveRoots()V}
     */
-   private void m_mkszkjye() {
+   private void registerMuddyMangroveRoots() {
       Texture lv = Texture.sideEnd(Texture.getSubId(Blocks.MUDDY_MANGROVE_ROOTS, "_side"), Texture.getSubId(Blocks.MUDDY_MANGROVE_ROOTS, "_top"));
       Identifier lv2 = Models.CUBE_COLUMN.upload(Blocks.MUDDY_MANGROVE_ROOTS, lv, this.modelCollector);
       this.blockStateCollector.accept(createAxisRotatedBlockState(Blocks.MUDDY_MANGROVE_ROOTS, lv2));
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_zutsvuwn Lnet/minecraft/unmapped/C_ysvjbfkt;m_zutsvuwn()V}
+    * @mapping {@literal named registerMangrovePropagule Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerMangrovePropagule()V}
     */
-   private void m_zutsvuwn() {
-      this.registerItemModel(Items.f_mqfklpco);
+   private void registerMangrovePropagule() {
+      this.registerItemModel(Items.MANGROVE_PROPAGULE);
       Block lv = Blocks.MANGROVE_PROPAGULE;
       BlockStateVariantMap.DoubleProperty<Boolean, Integer> lv2 = BlockStateVariantMap.create(MangrovePropaguleBlock.HANGING, MangrovePropaguleBlock.AGE_4);
       Identifier lv3 = ModelIds.getBlockModelId(lv);
@@ -3511,12 +3540,12 @@
       this.registerTopSoil(Blocks.GRASS_BLOCK, ModelIds.getBlockModelId(Blocks.GRASS_BLOCK), lv3);
       Identifier lv4 = TexturedModel.CUBE_BOTTOM_TOP
          .get(Blocks.MYCELIUM)
-         .texture(arg2 -> arg2.put(TextureKey.BOTTOM, lv))
+         .texture(texture -> texture.put(TextureKey.BOTTOM, lv))
          .upload(Blocks.MYCELIUM, this.modelCollector);
       this.registerTopSoil(Blocks.MYCELIUM, lv4, lv3);
       Identifier lv5 = TexturedModel.CUBE_BOTTOM_TOP
          .get(Blocks.PODZOL)
-         .texture(arg2 -> arg2.put(TextureKey.BOTTOM, lv))
+         .texture(texture -> texture.put(TextureKey.BOTTOM, lv))
          .upload(Blocks.PODZOL, this.modelCollector);
       this.registerTopSoil(Blocks.PODZOL, lv5, lv3);
    }
@@ -3579,7 +3608,7 @@
    private void registerHopper() {
       Identifier lv = ModelIds.getBlockModelId(Blocks.HOPPER);
       Identifier lv2 = ModelIds.getBlockSubModelId(Blocks.HOPPER, "_side");
-      this.registerItemModel(Items.f_kbxmbvew);
+      this.registerItemModel(Items.HOPPER);
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(Blocks.HOPPER)
@@ -3731,9 +3760,10 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_juiovgan Lnet/minecraft/unmapped/C_ysvjbfkt;m_juiovgan()V}
+    * @mapping {@literal named registerFrogspawn Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerFrogspawn()V}
     */
-   private void m_juiovgan() {
+   private void registerFrogspawn() {
       this.registerItemModel(Blocks.FROGSPAWN);
       this.blockStateCollector.accept(createSingletonBlockState(Blocks.FROGSPAWN, ModelIds.getBlockModelId(Blocks.FROGSPAWN)));
    }
@@ -3923,17 +3953,18 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.SCULK_SENSOR_PHASE)
                      .register(
-                        arg3 -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, arg3 != SculkSensorPhase.ACTIVE && arg3 != SculkSensorPhase.COOLDOWN ? lv : lv2)
+                        phase -> BlockStateVariant.create()
+                              .put(VariantSettings.MODEL, phase != SculkSensorPhase.ACTIVE && phase != SculkSensorPhase.COOLDOWN ? lv : lv2)
                      )
                )
          );
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_odanwlbt Lnet/minecraft/unmapped/C_ysvjbfkt;m_odanwlbt()V}
+    * @mapping {@literal named registerCalibratedSculkSensor Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerCalibratedSculkSensor()V}
     */
-   private void m_odanwlbt() {
+   private void registerCalibratedSculkSensor() {
       Identifier lv = ModelIds.getBlockSubModelId(Blocks.CALIBRATED_SCULK_SENSOR, "_inactive");
       Identifier lv2 = ModelIds.getBlockSubModelId(Blocks.CALIBRATED_SCULK_SENSOR, "_active");
       this.registerParentedItemModel(Blocks.CALIBRATED_SCULK_SENSOR, lv);
@@ -3943,8 +3974,8 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.SCULK_SENSOR_PHASE)
                      .register(
-                        arg3 -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, arg3 != SculkSensorPhase.ACTIVE && arg3 != SculkSensorPhase.COOLDOWN ? lv : lv2)
+                        phase -> BlockStateVariant.create()
+                              .put(VariantSettings.MODEL, phase != SculkSensorPhase.ACTIVE && phase != SculkSensorPhase.COOLDOWN ? lv : lv2)
                      )
                )
                .coordinate(createNorthDefaultHorizontalRotationStates())
@@ -3952,11 +3983,12 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_xghzmykj Lnet/minecraft/unmapped/C_ysvjbfkt;m_xghzmykj()V}
+    * @mapping {@literal named registerSculkShrieker Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerSculkShrieker()V}
     */
-   private void m_xghzmykj() {
-      Identifier lv = Models.TEMPLATE_SCULK_SHRIEKER.upload(Blocks.SCULK_SHRIEKER, Texture.m_esmayivc(false), this.modelCollector);
-      Identifier lv2 = Models.TEMPLATE_SCULK_SHRIEKER.upload(Blocks.SCULK_SHRIEKER, "_can_summon", Texture.m_esmayivc(true), this.modelCollector);
+   private void registerSculkShrieker() {
+      Identifier lv = Models.TEMPLATE_SCULK_SHRIEKER.upload(Blocks.SCULK_SHRIEKER, Texture.sculkShrieker(false), this.modelCollector);
+      Identifier lv2 = Models.TEMPLATE_SCULK_SHRIEKER.upload(Blocks.SCULK_SHRIEKER, "_can_summon", Texture.sculkShrieker(true), this.modelCollector);
       this.registerParentedItemModel(Blocks.SCULK_SHRIEKER, lv);
       this.blockStateCollector
          .accept(VariantsBlockStateSupplier.create(Blocks.SCULK_SHRIEKER).coordinate(createBooleanModelMap(Properties.CAN_SUMMON, lv2, lv)));
@@ -4042,18 +4074,18 @@
     * @mapping {@literal named registerRepeater Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerRepeater()V}
     */
    private void registerRepeater() {
-      this.registerItemModel(Items.f_wpczmozf);
+      this.registerItemModel(Items.REPEATER);
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(Blocks.REPEATER)
-               .coordinate(BlockStateVariantMap.create(Properties.DELAY, Properties.LOCKED, Properties.POWERED).register((integer, arg, arg2) -> {
+               .coordinate(BlockStateVariantMap.create(Properties.DELAY, Properties.LOCKED, Properties.POWERED).register((delay, locked, powered) -> {
                   StringBuilder stringBuilder = new StringBuilder();
-                  stringBuilder.append('_').append(integer).append("tick");
-                  if (arg2) {
+                  stringBuilder.append('_').append(delay).append("tick");
+                  if (powered) {
                      stringBuilder.append("_on");
                   }
          
-                  if (arg) {
+                  if (locked) {
                      stringBuilder.append("_locked");
                   }
          
@@ -4068,7 +4100,7 @@
     * @mapping {@literal named registerSeaPickle Lnet/minecraft/data/client/model/BlockStateModelGenerator;registerSeaPickle()V}
     */
    private void registerSeaPickle() {
-      this.registerItemModel(Items.f_guehddqg);
+      this.registerItemModel(Items.SEA_PICKLE);
       this.blockStateCollector
          .accept(
             VariantsBlockStateSupplier.create(Blocks.SEA_PICKLE)
@@ -4113,8 +4145,8 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.LAYERS)
                      .register(
-                        integer -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, integer < 8 ? ModelIds.getBlockSubModelId(Blocks.SNOW, "_height" + integer * 2) : lv2)
+                        layers -> BlockStateVariant.create()
+                              .put(VariantSettings.MODEL, layers < 8 ? ModelIds.getBlockSubModelId(Blocks.SNOW, "_height" + layers * 2) : lv2)
                      )
                )
          );
@@ -4149,8 +4181,8 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.STRUCTURE_BLOCK_MODE)
                      .register(
-                        arg -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, this.createSubModel(Blocks.STRUCTURE_BLOCK, "_" + arg.asString(), Models.CUBE_ALL, Texture::all))
+                        mode -> BlockStateVariant.create()
+                              .put(VariantSettings.MODEL, this.createSubModel(Blocks.STRUCTURE_BLOCK, "_" + mode.asString(), Models.CUBE_ALL, Texture::all))
                      )
                )
          );
@@ -4168,8 +4200,8 @@
                .coordinate(
                   BlockStateVariantMap.create(Properties.AGE_3)
                      .register(
-                        integer -> BlockStateVariant.create()
-                              .put(VariantSettings.MODEL, this.createSubModel(Blocks.SWEET_BERRY_BUSH, "_stage" + integer, Models.CROSS, Texture::cross))

The diff for this file is not complete!

The remaining diff is too long!

-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,7 @@ guava = "31.1-jre" @@
     jackson_xml = "2.14.1"
     launchermeta_parser = "1.0.0"
     enigma = "1.9.0"
-    enigma_plugin = "1.3.2"
+    enigma_plugin = "1.4.0"
     tiny_remapper = "0.7.2"
     stitch = "0.6.1"
     unpick = "3.0.6"
@@ Expand Down @@

-Original file line number
+Diff line change
@@ -1,4 +1,6 @@
     CLASS net/minecraft/unmapped/C_mysyaxfs net/minecraft/advancement/criterion/Criterion
+    	METHOD m_eenzxdpn create (Lnet/minecraft/unmapped/C_zkhebbek;)Lnet/minecraft/unmapped/C_rzypsigz;
+    		ARG 1 conditions
     	METHOD m_ejusorzh conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/unmapped/C_gzewtdot;)Lnet/minecraft/unmapped/C_zkhebbek;
     		ARG 1 obj
     		ARG 2 predicateDeserializer
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up @@
     			ARG 1 block
     		METHOD m_zfazbpjw customFenceGate (Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_eonlnchv$C_bgfxtocb;
     	CLASS C_gtxnbiam Variant
+    		FIELD f_zrcdybsh name Ljava/lang/String;
     		METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
     			ARG 3 name
+    		METHOD m_xxathjaz getName ()Ljava/lang/String;

-Original file line number
+Diff line change
@@ -0,0 +1,12 @@
+    CLASS net/minecraft/unmapped/C_wwetinhi net/minecraft/data/report/BiomeParametersProvider
+    	FIELD f_bemjvqoj path Ljava/nio/file/Path;
+    	FIELD f_zrxygubc lookupProvider Ljava/util/concurrent/CompletableFuture;
+    	METHOD <init> (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;)V
+    		ARG 1 output
+    		ARG 2 lookupProvider
+    	METHOD m_dbdhbfat write (Ljava/nio/file/Path;Lnet/minecraft/unmapped/C_temnquoh;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Encoder;Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture;
+    		ARG 0 path
+    		ARG 3 encoder
+    		ARG 4 object
+    	METHOD m_lfeplmtj resolveFile (Lnet/minecraft/unmapped/C_ncpywfca;)Ljava/nio/file/Path;
+    		ARG 1 id

-Original file line number
+Diff line change
@@ -1,5 +1,7 @@
     CLASS net/minecraft/unmapped/C_ncoihxbl net/minecraft/data/server/AdvancementsProvider
     	FIELD f_kppcvhnq lookupProvider Ljava/util/concurrent/CompletableFuture;
+    	FIELD f_sqmkoixj tabGenerators Ljava/util/List;
+    	FIELD f_zdlrtzkq pathResolver Lnet/minecraft/unmapped/C_ugkmwocs$C_ehniswvc;
     	METHOD <init> (Lnet/minecraft/unmapped/C_ugkmwocs;Ljava/util/concurrent/CompletableFuture;Ljava/util/List;)V
     		ARG 1 output
     		ARG 2 lookupProvider
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Commit

There are no files selected for viewing

3 comments on commit `1f8674b`

github-actions bot commented on `1f8674b` Nov 4, 2023

github-actions bot commented on `1f8674b` Nov 4, 2023

github-actions bot commented on `1f8674b` Nov 4, 2023

Commit

There are no files selected for viewing

3 comments on commit 1f8674b

github-actions bot commented on 1f8674b Nov 4, 2023

Choose a reason for hiding this comment

github-actions bot commented on 1f8674b Nov 4, 2023

Choose a reason for hiding this comment

github-actions bot commented on 1f8674b Nov 4, 2023

Choose a reason for hiding this comment

3 comments on commit `1f8674b`

github-actions bot commented on `1f8674b` Nov 4, 2023

github-actions bot commented on `1f8674b` Nov 4, 2023

github-actions bot commented on `1f8674b` Nov 4, 2023