Skip to content

Commit

Permalink
work
Browse files Browse the repository at this point in the history
  • Loading branch information
@ix0rai
ix0rai committed Jul 3, 2024
1 parent e7dad38 commit 882e83b
Show file tree
Hide file tree
Showing 7 changed files with 113 additions and 0 deletions.
73 changes: 73 additions & 0 deletions mappings/net/minecraft/enchantment/Enchantment.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,51 @@ CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
FIELD f_scwbgtxq MAX_LEVEL I
FIELD f_yozrarfo CODEC Lcom/mojang/serialization/Codec;
METHOD m_ajxstdmb createProperties (Lnet/minecraft/unmapped/C_odfnijdo;Lnet/minecraft/unmapped/C_odfnijdo;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_qfoqahef;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
METHOD m_bhhtcbyx modifyCrossbowChargeTime (Lnet/minecraft/unmapped/C_rlomrsco;ILorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_chvflatp createItemContext (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 1 level
METHOD m_ciojbccw createEntityContext (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 1 level
ARG 2 entity
ARG 3 pos
METHOD m_dgttciah onProjectileSpawned (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;)V
ARG 3 context
METHOD m_glfcpyqa getMaxLevel ()I
COMMENT Sets the maximum number of levels, such as Sharpness which has a maximum 5 levels, the enchantment has. Default: 1.
METHOD m_iarnlloo isSupportedItem (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_igxrorrr getMinLevel ()I
COMMENT Sets the minimum number of levels, such as Sharpness which has a minimum of 1 level, the enchantment has. Default: 1.
METHOD m_ilvfmxkk modifyDamageFilteredValue (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_jhglsmkm matchesSlot (Lnet/minecraft/unmapped/C_yuycoehb;)Z
ARG 1 slot
METHOD m_kevrabge modifyProjectileCount (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_khmhdqpw isAcceptableItem (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
COMMENT {@return the type of item ({@code stack}) that can have this applied to it}
ARG 1 stack
METHOD m_laluoqcj tick (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;)V
ARG 3 context
METHOD m_lcxutjum getWeight ()I
METHOD m_leklsjht createBlockHitContext (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_txtbiemp;)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 1 level
ARG 2 entity
ARG 3 pos
METHOD m_lypftmbv modifyUnfilteredValue (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_rlomrsco;ILorg/apache/commons/lang3/mutable/MutableFloat;)V
ARG 4 value
METHOD m_mfxiclqq reapplyLocationBasedEffects (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_usxaxydn;)V
ARG 2 level
ARG 3 context
ARG 4 entity
METHOD m_nfuegjdm builder (Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 0 properties
METHOD m_npijgbpy getSupportedItems ()Lnet/minecraft/unmapped/C_odfnijdo;
METHOD m_orywsswy (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD m_ovgqiywz onHitBlock (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;Lnet/minecraft/unmapped/C_txtbiemp;)V
ARG 3 context
METHOD m_qirqbtfb applyEffects (Ljava/util/List;Lnet/minecraft/unmapped/C_iakykpgh;Ljava/util/function/Consumer;)V
ARG 0 effects
ARG 1 lootContext
ARG 2 effectConsumer
METHOD m_rftiggzk createProperties (Lnet/minecraft/unmapped/C_odfnijdo;IILnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;I[Lnet/minecraft/unmapped/C_qfoqahef;)Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
METHOD m_rtwmhoyh getMinPower (I)I
COMMENT {@return the minimum level required to by the player for the enchantment to be shown in the enchantment table.}
Expand All @@ -26,21 +57,63 @@ CLASS net/minecraft/unmapped/C_jxtrubuh net/minecraft/enchantment/Enchantment
METHOD m_tiaspbpv getEquipment (Lnet/minecraft/unmapped/C_usxaxydn;)Ljava/util/Map;
ARG 1 entity
METHOD m_tujulygf getEffect (Lnet/minecraft/unmapped/C_pscqxfcs;)Ljava/util/List;
METHOD m_ujjglmjb isImmuneToDamageFrom (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)Z
METHOD m_vjzmieep cost (I)Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;
METHOD m_webwhtnd modifyEntityFilteredValue (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
ARG 6 value
METHOD m_wqtybzdx modifyItemFilteredCount (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
ARG 5 value
METHOD m_xaezlmue getAnvilCost ()I
METHOD m_ycasfcso areCompatible (Lnet/minecraft/unmapped/C_cjzoxshv;Lnet/minecraft/unmapped/C_cjzoxshv;)Z
ARG 0 enchantment1
ARG 1 enchantment2
METHOD m_ygnxsicw cost (II)Lnet/minecraft/unmapped/C_jxtrubuh$C_jkttgiwc;
METHOD m_yyvgkyyg createDamageContext (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_sbxfkpyv;)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 1 level
ARG 2 entity
ARG 3 source
METHOD m_zfqdifee getFullName (Lnet/minecraft/unmapped/C_cjzoxshv;I)Lnet/minecraft/unmapped/C_rdaqiwdt;
ARG 0 enchantment
ARG 1 level
METHOD m_zjsipvve createLocationContext (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_astfners;Z)Lnet/minecraft/unmapped/C_iakykpgh;
ARG 1 level
ARG 2 entity
ARG 3 enchantmentActive
METHOD m_zlpziyyk modifyProjectileSpread (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_astfners;Lorg/apache/commons/lang3/mutable/MutableFloat;)V
METHOD m_znzmqxec isPrimaryItem (Lnet/minecraft/unmapped/C_sddaxwyk;)Z
METHOD m_ztycenho getMaxPower (I)I
COMMENT {@return the maximum level a Player is allowed before the enchant is not shown in the enchantment table}
COMMENT The default return is the minimum power level + 5.
ARG 1 level
CLASS C_epmoqirc Builder
FIELD f_fmooecif effectMapBuilder Lnet/minecraft/unmapped/C_kouhnfig$C_vfzyoahz;
FIELD f_radrlqvu properties Lnet/minecraft/unmapped/C_jxtrubuh$C_ryljcnwe;
FIELD f_wqwudsbq effectLists Ljava/util/Map;
FIELD f_ykzrjano exclusiveSet Lnet/minecraft/unmapped/C_odfnijdo;
METHOD m_bfbkshbc addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_zjvjrddv;Lnet/minecraft/unmapped/C_zjvjrddv;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 type
METHOD m_eirhbvlq addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 type
ARG 3 conditions
METHOD m_fcblttrk build (Lnet/minecraft/unmapped/C_ncpywfca;)Lnet/minecraft/unmapped/C_jxtrubuh;
METHOD m_fywpvdlv withExclusiveSet (Lnet/minecraft/unmapped/C_odfnijdo;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 exclusiveSet
METHOD m_ijzbgmuo getEffectsList (Lnet/minecraft/unmapped/C_pscqxfcs;)Ljava/util/List;
METHOD m_ilkklraq addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_kyhkwlnd;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 type
ARG 2 effect
METHOD m_qoopatrn addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
METHOD m_uhlhfpbp addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 type
METHOD m_vkishvxp addEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Lnet/minecraft/unmapped/C_zjvjrddv;Lnet/minecraft/unmapped/C_zjvjrddv;Ljava/lang/Object;Lnet/minecraft/unmapped/C_vqkczpuv$C_cjvmpogn;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
ARG 1 type
ARG 5 conditions
METHOD m_vmwohqmn addSpecialEffect (Lnet/minecraft/unmapped/C_pscqxfcs;Ljava/lang/Object;)Lnet/minecraft/unmapped/C_jxtrubuh$C_epmoqirc;
CLASS C_jkttgiwc Cost
METHOD m_lpzheldf forLevel (I)I
ARG 1 level
METHOD m_zfvugdzh (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
CLASS C_ryljcnwe Properties
METHOD m_vxpftpoe (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
1 change: 1 addition & 0 deletions mappings/net/minecraft/enchantment/EnchantmentEffectContext.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
CLASS net/minecraft/unmapped/C_pjrjvgrp net/minecraft/enchantment/EnchantmentEffectContext
2 changes: 2 additions & 0 deletions mappings/net/minecraft/enchantment/effect/EnchantmentEffectTarget.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
CLASS net/minecraft/unmapped/C_zjvjrddv net/minecraft/enchantment/effect/EnchantmentEffectTarget
FIELD f_bfojlfoa id Ljava/lang/String;
14 changes: 14 additions & 0 deletions mappings/net/minecraft/enchantment/effect/EnchantmentLocationBasedEffect.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
CLASS net/minecraft/unmapped/C_ecwtrfca net/minecraft/enchantment/effect/EnchantmentLocationBasedEffect
METHOD m_fmcmkyea bootstrap (Lnet/minecraft/unmapped/C_tqxyjqsk;)Lcom/mojang/serialization/MapCodec;
METHOD m_ginukglu onDeactivated (Lnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;I)V
ARG 1 context
ARG 2 entity
ARG 3 pos
ARG 4 level
METHOD m_kqdonpeg getCodec ()Lcom/mojang/serialization/MapCodec;
METHOD m_lgpocvjg onChangedBlock (Lnet/minecraft/unmapped/C_bdwnwhiu;ILnet/minecraft/unmapped/C_pjrjvgrp;Lnet/minecraft/unmapped/C_astfners;Lnet/minecraft/unmapped/C_vgpupfxx;Z)V
ARG 2 level
ARG 3 context
ARG 4 entity
ARG 5 pos
ARG 6 newlyApplied
11 changes: 11 additions & 0 deletions mappings/net/minecraft/enchantment/effect/TargetConditionalEnchantmentEffect.mapping
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
CLASS net/minecraft/unmapped/C_idcxfrny net/minecraft/enchantment/effect/TargetConditionalEnchantmentEffect
METHOD m_alatdzrm (Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_vczsvjil;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 2 instance
METHOD m_fxhflgcy createEquipmentDropsCodec (Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_vczsvjil;)Lcom/mojang/serialization/Codec;
ARG 1 type
METHOD m_lobkvims createCodec (Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_vczsvjil;)Lcom/mojang/serialization/Codec;
ARG 1 type
METHOD m_pkmvnbvx (Lcom/mojang/serialization/Codec;Lnet/minecraft/unmapped/C_vczsvjil;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 2 instance
METHOD m_sbmzbkam matches (Lnet/minecraft/unmapped/C_iakykpgh;)Z
ARG 1 context
2 changes: 2 additions & 0 deletions mappings/net/minecraft/entity/LivingEntity.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ CLASS net/minecraft/unmapped/C_usxaxydn net/minecraft/entity/LivingEntity
METHOD m_dbmgxkyo canWalkOnFluid (Lnet/minecraft/unmapped/C_xqketiuf;)Z
METHOD m_ddtvzuuf getStackInHand (Lnet/minecraft/unmapped/C_laxmzoqs;)Lnet/minecraft/unmapped/C_sddaxwyk;
ARG 1 hand
METHOD m_dgbunafc onEquippedItemBroken (Lnet/minecraft/unmapped/C_vorddnax;Lnet/minecraft/unmapped/C_yuycoehb;)V
ARG 1 item
METHOD m_dickaawl getPrimeAdversary ()Lnet/minecraft/unmapped/C_usxaxydn;
METHOD m_dmapfayh processEquippedStack (Lnet/minecraft/unmapped/C_sddaxwyk;)V
ARG 1 stack
Expand Down
10 changes: 10 additions & 0 deletions mappings/net/minecraft/item/FoodComponent.mapping
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@ CLASS net/minecraft/unmapped/C_cgikuact net/minecraft/item/FoodComponent
COMMENT Represents the components that make up the properties of a food item.
FIELD f_jxddsfxy alwaysEdible Z
FIELD f_sfnvysjq statusEffects Ljava/util/List;
FIELD f_xqccrssq DEFAULT_EAT_SECONDS F
FIELD f_zdhpbxsl hunger I
METHOD m_pwebzwha (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD m_rtewkjll getEatTicks ()I
METHOD m_tvsoxmcg isAlwaysEdible ()Z
COMMENT Checks if a food item can be eaten when the current hunger bar is full.
CLASS C_gqnloczo Builder
FIELD f_idavwrnh alwaysEdible Z
FIELD f_ladnpgbj statusEffects Lcom/google/common/collect/ImmutableList$Builder;
FIELD f_nouyflrp hunger I
FIELD f_svmtqlch saturationModifier F
FIELD f_yatwrwbg eatSeconds F
FIELD f_ymfuqryn usingConvertsTo Ljava/util/Optional;
METHOD m_crnsndln snack ()Lnet/minecraft/unmapped/C_cgikuact$C_gqnloczo;
COMMENT Specifies that a food item is snack-like and is eaten quickly.
METHOD m_fcwymctf alwaysEdible ()Lnet/minecraft/unmapped/C_cgikuact$C_gqnloczo;
Expand All @@ -22,10 +28,14 @@ CLASS net/minecraft/unmapped/C_cgikuact net/minecraft/item/FoodComponent
COMMENT <p>One hunger is equivalent to half of a hunger bar icon.
ARG 1 hunger
COMMENT the amount of hunger
METHOD m_sokfsvgk usingConvertsTo (Lnet/minecraft/unmapped/C_gmbqjnle;)Lnet/minecraft/unmapped/C_cgikuact$C_gqnloczo;
METHOD m_vlrajmqs statusEffect (Lnet/minecraft/unmapped/C_wpfizwve;F)Lnet/minecraft/unmapped/C_cgikuact$C_gqnloczo;
COMMENT Specifies a status effect to apply to an entity when a food item is consumed.
COMMENT This method may be called multiple times to apply several status effects when food is consumed.
ARG 1 effect
COMMENT the effect instance to apply
ARG 2 chance
COMMENT the chance the status effect is applied, on a scale of {@code 0.0F} to {@code 1.0F}
CLASS C_uxpigugz StatusEffectEntry
METHOD m_tkmomdjq (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance

3 comments on commit 882e83b

@github-actions
Copy link

Choose a reason for hiding this comment

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

With commit 882e83b, 106 file(s) were updated with 1294 line(s) added and 1211 removed compared to the latest Quilt Mappings version.

View the diff here (1/3): 
diff -bur namedTargetSrc/com/mojang/blaze3d/glfw/Window.java namedSrc/com/mojang/blaze3d/glfw/Window.java
--- namedTargetSrc/com/mojang/blaze3d/glfw/Window.java	2024-07-03 03:34:46.906036075 +0000
+++ namedSrc/com/mojang/blaze3d/glfw/Window.java	2024-07-03 03:33:31.629977091 +0000
@@ -47,15 +47,13 @@
     */
    private static final Logger LOGGER = LogUtils.getLogger();
    /**
-    * @mapping {@literal hashed f_gfspdhqb Lnet/minecraft/unmapped/C_snosbckc;f_gfspdhqb:I}
-    * @mapping {@literal named BASE_WIDTH Lcom/mojang/blaze3d/glfw/Window;BASE_WIDTH:I}
+    * Mapping not found
     */
-   public static final int BASE_WIDTH = 320;
+   public static final int f_gfspdhqb = 320;
    /**
-    * @mapping {@literal hashed f_njxrorbx Lnet/minecraft/unmapped/C_snosbckc;f_njxrorbx:I}
-    * @mapping {@literal named BASE_HEIGHT Lcom/mojang/blaze3d/glfw/Window;BASE_HEIGHT:I}
+    * Mapping not found
     */
-   public static final int BASE_HEIGHT = 240;
+   public static final int f_njxrorbx = 240;
    /**
     * @mapping {@literal hashed f_aqgyafzq Lnet/minecraft/unmapped/C_snosbckc;f_aqgyafzq:Lorg/lwjgl/glfw/GLFWErrorCallback;}
     * @mapping {@literal named errorCallback Lcom/mojang/blaze3d/glfw/Window;errorCallback:Lorg/lwjgl/glfw/GLFWErrorCallback;}
@@ -233,10 +231,9 @@
    }
 
    /**
-    * @mapping {@literal hashed m_dxtquvzd Lnet/minecraft/unmapped/C_snosbckc;m_dxtquvzd()Ljava/lang/String;}
-    * @mapping {@literal named getPlatform Lcom/mojang/blaze3d/glfw/Window;getPlatform()Ljava/lang/String;}
+    * Mapping not found
     */
-   public static String getPlatform() {
+   public static String m_dxtquvzd() {
       int i = GLFW.glfwGetPlatform();
 
       return switch (i) {
diff -bur namedTargetSrc/net/minecraft/block/AzaleaBlock.java namedSrc/net/minecraft/block/AzaleaBlock.java
--- namedTargetSrc/net/minecraft/block/AzaleaBlock.java	2024-07-03 03:34:47.010036160 +0000
+++ namedSrc/net/minecraft/block/AzaleaBlock.java	2024-07-03 03:33:31.753977207 +0000
@@ -1,7 +1,6 @@
 package net.minecraft.block;
 
 import com.mojang.serialization.MapCodec;
-import net.minecraft.block.sapling.TreeGrower;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.random.RandomGenerator;
@@ -82,6 +81,6 @@
     */
    @Override
    public void fertilize(ServerWorld world, RandomGenerator random, BlockPos pos, BlockState state) {
-      TreeGrower.AZALEA.growTree(world, world.getChunkManager().getChunkGenerator(), pos, state, random);
+      WoodTypes.AZALEA.m_lfmzuxpy(world, world.getChunkManager().getChunkGenerator(), pos, state, random);
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/Blocks.java namedSrc/net/minecraft/block/Blocks.java
--- namedTargetSrc/net/minecraft/block/Blocks.java	2024-07-03 03:34:46.890036061 +0000
+++ namedSrc/net/minecraft/block/Blocks.java	2024-07-03 03:33:31.617977079 +0000
@@ -19,7 +19,6 @@
 import net.minecraft.block.piston.PistonExtensionBlock;
 import net.minecraft.block.piston.PistonHeadBlock;
 import net.minecraft.block.sapling.SaplingBlock;
-import net.minecraft.block.sapling.TreeGrower;
 import net.minecraft.block.sculk.SculkBlock;
 import net.minecraft.block.sculk.SculkCatalystBlock;
 import net.minecraft.block.sculk.SculkSensorBlock;
@@ -27,6 +26,7 @@
 import net.minecraft.block.sculk.SculkVeinBlock;
 import net.minecraft.block.sign.CeilingHangingSignBlock;
 import net.minecraft.block.sign.SignBlock;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.block.sign.WallHangingSignBlock;
 import net.minecraft.block.sign.WallSignBlock;
 import net.minecraft.entity.EntityType;
@@ -317,7 +317,7 @@
    public static final Block OAK_SAPLING = register(
       "oak_sapling",
       new SaplingBlock(
-         TreeGrower.OAK,
+         WoodTypes.OAK,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
             .noCollision()
@@ -334,7 +334,7 @@
    public static final Block SPRUCE_SAPLING = register(
       "spruce_sapling",
       new SaplingBlock(
-         TreeGrower.SPRUCE,
+         WoodTypes.SPRUCE,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
             .noCollision()
@@ -351,7 +351,7 @@
    public static final Block BIRCH_SAPLING = register(
       "birch_sapling",
       new SaplingBlock(
-         TreeGrower.BIRCH,
+         WoodTypes.BIRCH,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
             .noCollision()
@@ -368,7 +368,7 @@
    public static final Block JUNGLE_SAPLING = register(
       "jungle_sapling",
       new SaplingBlock(
-         TreeGrower.JUNGLE,
+         WoodTypes.JUNGLE,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
             .noCollision()
@@ -385,7 +385,7 @@
    public static final Block ACACIA_SAPLING = register(
       "acacia_sapling",
       new SaplingBlock(
-         TreeGrower.ACACIA,
+         WoodTypes.ACACIA,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
             .noCollision()
@@ -402,7 +402,7 @@
    public static final Block CHERRY_SAPLING = register(
       "cherry_sapling",
       new SaplingBlock(
-         TreeGrower.CHERRY,
+         WoodTypes.CHERRY,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PINK)
             .noCollision()
@@ -419,7 +419,7 @@
    public static final Block DARK_OAK_SAPLING = register(
       "dark_oak_sapling",
       new SaplingBlock(
-         TreeGrower.DARK_OAK,
+         WoodTypes.DARK_OAK,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
             .noCollision()
@@ -436,7 +436,7 @@
    public static final Block MANGROVE_PROPAGULE = register(
       "mangrove_propagule",
       new MangrovePropaguleBlock(
-         TreeGrower.MANGROVE,
+         WoodTypes.MANGROVE,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PLANT)
             .noCollision()
@@ -2257,7 +2257,7 @@
    public static final Block OAK_SIGN = register(
       "oak_sign",
       new SignBlock(
-         WoodType.OAK,
+         SignType.OAK,
          AbstractBlock.Settings.create().mapColor(MapColor.WOOD).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
       )
    );
@@ -2268,7 +2268,7 @@
    public static final Block SPRUCE_SIGN = register(
       "spruce_sign",
       new SignBlock(
-         WoodType.SPRUCE,
+         SignType.SPRUCE,
          AbstractBlock.Settings.create()
             .mapColor(SPRUCE_LOG.getDefaultMapColor())
             .solid()
@@ -2285,7 +2285,7 @@
    public static final Block BIRCH_SIGN = register(
       "birch_sign",
       new SignBlock(
-         WoodType.BIRCH,
+         SignType.BIRCH,
          AbstractBlock.Settings.create().mapColor(MapColor.SAND).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
       )
    );
@@ -2296,7 +2296,7 @@
    public static final Block ACACIA_SIGN = register(
       "acacia_sign",
       new SignBlock(
-         WoodType.ACACIA,
+         SignType.ACACIA,
          AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
       )
    );
@@ -2307,7 +2307,7 @@
    public static final Block CHERRY_SIGN = register(
       "cherry_sign",
       new SignBlock(
-         WoodType.CHERRY,
+         SignType.CHERRY,
          AbstractBlock.Settings.create()
             .mapColor(CHERRY_PLANKS.getDefaultMapColor())
             .solid()
@@ -2324,7 +2324,7 @@
    public static final Block JUNGLE_SIGN = register(
       "jungle_sign",
       new SignBlock(
-         WoodType.JUNGLE,
+         SignType.JUNGLE,
          AbstractBlock.Settings.create()
             .mapColor(JUNGLE_LOG.getDefaultMapColor())
             .solid()
@@ -2341,7 +2341,7 @@
    public static final Block DARK_OAK_SIGN = register(
       "dark_oak_sign",
       new SignBlock(
-         WoodType.DARK_OAK,
+         SignType.DARK_OAK,
          AbstractBlock.Settings.create()
             .mapColor(DARK_OAK_LOG.getDefaultMapColor())
             .solid()
@@ -2358,7 +2358,7 @@
    public static final Block MANGROVE_SIGN = register(
       "mangrove_sign",
       new SignBlock(
-         WoodType.MANGROVE,
+         SignType.MANGROVE,
          AbstractBlock.Settings.create()
             .mapColor(MANGROVE_LOG.getDefaultMapColor())
             .solid()
@@ -2375,7 +2375,7 @@
    public static final Block BAMBOO_SIGN = register(
       "bamboo_sign",
       new SignBlock(
-         WoodType.BAMBOO,
+         SignType.BAMBOO,
          AbstractBlock.Settings.create()
             .mapColor(BAMBOO_PLANKS.getDefaultMapColor())
             .solid()
@@ -2429,7 +2429,7 @@
    public static final Block OAK_WALL_SIGN = register(
       "oak_wall_sign",
       new WallSignBlock(
-         WoodType.OAK,
+         SignType.OAK,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.WOOD)
             .solid()
@@ -2447,7 +2447,7 @@
    public static final Block SPRUCE_WALL_SIGN = register(
       "spruce_wall_sign",
       new WallSignBlock(
-         WoodType.SPRUCE,
+         SignType.SPRUCE,
          AbstractBlock.Settings.create()
             .mapColor(SPRUCE_LOG.getDefaultMapColor())
             .solid()
@@ -2465,7 +2465,7 @@
    public static final Block BIRCH_WALL_SIGN = register(
       "birch_wall_sign",
       new WallSignBlock(
-         WoodType.BIRCH,
+         SignType.BIRCH,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.SAND)
             .solid()
@@ -2483,7 +2483,7 @@
    public static final Block ACACIA_WALL_SIGN = register(
       "acacia_wall_sign",
       new WallSignBlock(
-         WoodType.ACACIA,
+         SignType.ACACIA,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.ORANGE)
             .solid()
@@ -2501,7 +2501,7 @@
    public static final Block CHERRY_WALL_SIGN = register(
       "cherry_wall_sign",
       new WallSignBlock(
-         WoodType.CHERRY,
+         SignType.CHERRY,
          AbstractBlock.Settings.create()
             .mapColor(CHERRY_LOG.getDefaultMapColor())
             .solid()
@@ -2519,7 +2519,7 @@
    public static final Block JUNGLE_WALL_SIGN = register(
       "jungle_wall_sign",
       new WallSignBlock(
-         WoodType.JUNGLE,
+         SignType.JUNGLE,
          AbstractBlock.Settings.create()
             .mapColor(JUNGLE_LOG.getDefaultMapColor())
             .solid()
@@ -2537,7 +2537,7 @@
    public static final Block DARK_OAK_WALL_SIGN = register(
       "dark_oak_wall_sign",
       new WallSignBlock(
-         WoodType.DARK_OAK,
+         SignType.DARK_OAK,
          AbstractBlock.Settings.create()
             .mapColor(DARK_OAK_LOG.getDefaultMapColor())
             .solid()
@@ -2555,7 +2555,7 @@
    public static final Block MANGROVE_WALL_SIGN = register(
       "mangrove_wall_sign",
       new WallSignBlock(
-         WoodType.MANGROVE,
+         SignType.MANGROVE,
          AbstractBlock.Settings.create()
             .mapColor(MANGROVE_LOG.getDefaultMapColor())
             .solid()
@@ -2573,7 +2573,7 @@
    public static final Block BAMBOO_WALL_SIGN = register(
       "bamboo_wall_sign",
       new WallSignBlock(
-         WoodType.BAMBOO,
+         SignType.BAMBOO,
          AbstractBlock.Settings.create()
             .mapColor(BAMBOO_PLANKS.getDefaultMapColor())
             .solid()
@@ -2591,7 +2591,7 @@
    public static final Block OAK_HANGING_SIGN = register(
       "oak_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.OAK,
+         SignType.OAK,
          AbstractBlock.Settings.create()
             .mapColor(OAK_LOG.getDefaultMapColor())
             .solid()
@@ -2608,7 +2608,7 @@
    public static final Block SPRUCE_HANGING_SIGN = register(
       "spruce_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.SPRUCE,
+         SignType.SPRUCE,
          AbstractBlock.Settings.create()
             .mapColor(SPRUCE_LOG.getDefaultMapColor())
             .solid()
@@ -2625,7 +2625,7 @@
    public static final Block BIRCH_HANGING_SIGN = register(
       "birch_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.BIRCH,
+         SignType.BIRCH,
          AbstractBlock.Settings.create().mapColor(MapColor.SAND).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
       )
    );
@@ -2636,7 +2636,7 @@
    public static final Block ACACIA_HANGING_SIGN = register(
       "acacia_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.ACACIA,
+         SignType.ACACIA,
          AbstractBlock.Settings.create().mapColor(MapColor.ORANGE).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
       )
    );
@@ -2647,7 +2647,7 @@
    public static final Block CHERRY_HANGING_SIGN = register(
       "cherry_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.CHERRY,
+         SignType.CHERRY,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PINK_TERRACOTTA)
             .solid()
@@ -2664,7 +2664,7 @@
    public static final Block JUNGLE_HANGING_SIGN = register(
       "jungle_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.JUNGLE,
+         SignType.JUNGLE,
          AbstractBlock.Settings.create()
             .mapColor(JUNGLE_LOG.getDefaultMapColor())
             .solid()
@@ -2681,7 +2681,7 @@
    public static final Block DARK_OAK_HANGING_SIGN = register(
       "dark_oak_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.DARK_OAK,
+         SignType.DARK_OAK,
          AbstractBlock.Settings.create()
             .mapColor(DARK_OAK_LOG.getDefaultMapColor())
             .solid()
@@ -2698,7 +2698,7 @@
    public static final Block CRIMSON_HANGING_SIGN = register(
       "crimson_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.CRIMSON,
+         SignType.CRIMSON,
          AbstractBlock.Settings.create().mapColor(MapColor.CRIMSON_STEM).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F)
       )
    );
@@ -2709,7 +2709,7 @@
    public static final Block WARPED_HANGING_SIGN = register(
       "warped_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.WARPED,
+         SignType.WARPED,
          AbstractBlock.Settings.create().mapColor(MapColor.WARPED_STEM).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F)
       )
    );
@@ -2720,7 +2720,7 @@
    public static final Block MANGROVE_HANGING_SIGN = register(
       "mangrove_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.MANGROVE,
+         SignType.MANGROVE,
          AbstractBlock.Settings.create()
             .mapColor(MANGROVE_LOG.getDefaultMapColor())
             .solid()
@@ -2737,7 +2737,7 @@
    public static final Block BAMBOO_HANGING_SIGN = register(
       "bamboo_hanging_sign",
       new CeilingHangingSignBlock(
-         WoodType.BAMBOO,
+         SignType.BAMBOO,
          AbstractBlock.Settings.create().mapColor(MapColor.YELLOW).solid().instrument(NoteBlockInstrument.BASS).noCollision().strength(1.0F).lavaIgnitable()
       )
    );
@@ -2748,7 +2748,7 @@
    public static final Block OAK_WALL_HANGING_SIGN = register(
       "oak_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.OAK,
+         SignType.OAK,
          AbstractBlock.Settings.create()
             .mapColor(OAK_LOG.getDefaultMapColor())
             .solid()
@@ -2766,7 +2766,7 @@
    public static final Block SPRUCE_WALL_HANGING_SIGN = register(
       "spruce_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.SPRUCE,
+         SignType.SPRUCE,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.WOOD)
             .solid()
@@ -2784,7 +2784,7 @@
    public static final Block BIRCH_WALL_HANGING_SIGN = register(
       "birch_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.BIRCH,
+         SignType.BIRCH,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.SAND)
             .solid()
@@ -2802,7 +2802,7 @@
    public static final Block ACACIA_WALL_HANGING_SIGN = register(
       "acacia_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.ACACIA,
+         SignType.ACACIA,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.ORANGE)
             .solid()
@@ -2820,7 +2820,7 @@
    public static final Block CHERRY_WALL_HANGING_SIGN = register(
       "cherry_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.CHERRY,
+         SignType.CHERRY,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.PINK_TERRACOTTA)
             .solid()
@@ -2838,7 +2838,7 @@
    public static final Block JUNGLE_WALL_HANGING_SIGN = register(
       "jungle_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.JUNGLE,
+         SignType.JUNGLE,
          AbstractBlock.Settings.create()
             .mapColor(JUNGLE_LOG.getDefaultMapColor())
             .solid()
@@ -2856,7 +2856,7 @@
    public static final Block DARK_OAK_WALL_HANGING_SIGN = register(
       "dark_oak_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.DARK_OAK,
+         SignType.DARK_OAK,
          AbstractBlock.Settings.create()
             .mapColor(DARK_OAK_LOG.getDefaultMapColor())
             .solid()
@@ -2874,7 +2874,7 @@
    public static final Block MANGROVE_WALL_HANGING_SIGN = register(
       "mangrove_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.MANGROVE,
+         SignType.MANGROVE,
          AbstractBlock.Settings.create()
             .mapColor(MANGROVE_LOG.getDefaultMapColor())
             .solid()
@@ -2892,7 +2892,7 @@
    public static final Block CRIMSON_WALL_HANGING_SIGN = register(
       "crimson_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.CRIMSON,
+         SignType.CRIMSON,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.CRIMSON_STEM)
             .solid()
@@ -2909,7 +2909,7 @@
    public static final Block WARPED_WALL_HANGING_SIGN = register(
       "warped_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.WARPED,
+         SignType.WARPED,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.WARPED_STEM)
             .solid()
@@ -2926,7 +2926,7 @@
    public static final Block BAMBOO_WALL_HANGING_SIGN = register(
       "bamboo_wall_hanging_sign",
       new WallHangingSignBlock(
-         WoodType.BAMBOO,
+         SignType.BAMBOO,
          AbstractBlock.Settings.create()
             .mapColor(MapColor.YELLOW)
             .solid()
@@ -4024,7 +4024,7 @@
    public static final Block OAK_FENCE_GATE = register(
       "oak_fence_gate",
       new FenceGateBlock(
-         WoodType.OAK,
+         SignType.OAK,
          AbstractBlock.Settings.create()
             .mapColor(OAK_PLANKS.getDefaultMapColor())
             .solid()
@@ -5257,7 +5257,7 @@
       new BarrierBlock(
          AbstractBlock.Settings.create()
             .strength(-1.0F, 3600000.8F)
-            .mapColor(waterlogMapColor(MapColor.NONE))
+            .mapColor(m_tobwsgju(MapColor.NONE))
             .dropsNothing()
             .nonOpaque()
             .allowsSpawning(Blocks::nonSpawnable)
@@ -5275,7 +5275,7 @@
          AbstractBlock.Settings.create()
             .replaceable()
             .strength(-1.0F, 3600000.8F)
-            .mapColor(waterlogMapColor(MapColor.NONE))
+            .mapColor(m_tobwsgju(MapColor.NONE))
             .dropsNothing()
             .nonOpaque()
             .luminance(LightBlock.STATE_TO_LUMINANCE)
@@ -6590,7 +6590,7 @@
    public static final Block SPRUCE_FENCE_GATE = register(
       "spruce_fence_gate",
       new FenceGateBlock(
-         WoodType.SPRUCE,
+         SignType.SPRUCE,
          AbstractBlock.Settings.create()
             .mapColor(SPRUCE_PLANKS.getDefaultMapColor())
             .solid()
@@ -6606,7 +6606,7 @@
    public static final Block BIRCH_FENCE_GATE = register(
       "birch_fence_gate",
       new FenceGateBlock(
-         WoodType.BIRCH,
+         SignType.BIRCH,
          AbstractBlock.Settings.create()
             .mapColor(BIRCH_PLANKS.getDefaultMapColor())
             .solid()
@@ -6622,7 +6622,7 @@
    public static final Block JUNGLE_FENCE_GATE = register(
       "jungle_fence_gate",
       new FenceGateBlock(
-         WoodType.JUNGLE,
+         SignType.JUNGLE,
          AbstractBlock.Settings.create()
             .mapColor(JUNGLE_PLANKS.getDefaultMapColor())
             .solid()
@@ -6638,7 +6638,7 @@
    public static final Block ACACIA_FENCE_GATE = register(
       "acacia_fence_gate",
       new FenceGateBlock(
-         WoodType.ACACIA,
+         SignType.ACACIA,
          AbstractBlock.Settings.create()
             .mapColor(ACACIA_PLANKS.getDefaultMapColor())
             .solid()
@@ -6654,7 +6654,7 @@
    public static final Block CHERRY_FENCE_GATE = register(
       "cherry_fence_gate",
       new FenceGateBlock(
-         WoodType.CHERRY,
+         SignType.CHERRY,
          AbstractBlock.Settings.create()
             .mapColor(CHERRY_PLANKS.getDefaultMapColor())
             .solid()
@@ -6670,7 +6670,7 @@
    public static final Block DARK_OAK_FENCE_GATE = register(
       "dark_oak_fence_gate",
       new FenceGateBlock(
-         WoodType.DARK_OAK,
+         SignType.DARK_OAK,
          AbstractBlock.Settings.create()
             .mapColor(DARK_OAK_PLANKS.getDefaultMapColor())
             .solid()
@@ -6686,7 +6686,7 @@
    public static final Block MANGROVE_FENCE_GATE = register(
       "mangrove_fence_gate",
       new FenceGateBlock(
-         WoodType.MANGROVE,
+         SignType.MANGROVE,
          AbstractBlock.Settings.create()
             .mapColor(MANGROVE_PLANKS.getDefaultMapColor())
             .solid()
@@ -6702,7 +6702,7 @@
    public static final Block BAMBOO_FENCE_GATE = register(
       "bamboo_fence_gate",
       new FenceGateBlock(
-         WoodType.BAMBOO,
+         SignType.BAMBOO,
          AbstractBlock.Settings.create()
             .mapColor(BAMBOO_PLANKS.getDefaultMapColor())
             .solid()
@@ -7164,7 +7164,7 @@
             .strength(0.5F)
             .sounds(BlockSoundGroup.GLASS)
             .nonOpaque()
-            .allowsSpawning((state, world, pos, type) -> type == EntityType.POLAR_BEAR)
+            .allowsSpawning((state, world, pos, arg4) -> arg4 == EntityType.POLAR_BEAR)
             .solidBlock(Blocks::nonSolid)
       )
    );
@@ -9498,7 +9498,7 @@
    public static final Block CRIMSON_FENCE_GATE = register(
       "crimson_fence_gate",
       new FenceGateBlock(
-         WoodType.CRIMSON,
+         SignType.CRIMSON,
          AbstractBlock.Settings.create().mapColor(CRIMSON_PLANKS.getDefaultMapColor()).solid().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F)
       )
    );
@@ -9509,7 +9509,7 @@
    public static final Block WARPED_FENCE_GATE = register(
       "warped_fence_gate",
       new FenceGateBlock(
-         WoodType.WARPED,
+         SignType.WARPED,
          AbstractBlock.Settings.create().mapColor(WARPED_PLANKS.getDefaultMapColor()).solid().instrument(NoteBlockInstrument.BASS).strength(2.0F, 3.0F)
       )
    );
@@ -9572,7 +9572,7 @@
    public static final Block CRIMSON_SIGN = register(
       "crimson_sign",
       new SignBlock(
-         WoodType.CRIMSON,
+         SignType.CRIMSON,
          AbstractBlock.Settings.create()
             .mapColor(CRIMSON_PLANKS.getDefaultMapColor())
             .instrument(NoteBlockInstrument.BASS)
@@ -9588,7 +9588,7 @@
    public static final Block WARPED_SIGN = register(
       "warped_sign",
       new SignBlock(
-         WoodType.WARPED,
+         SignType.WARPED,
          AbstractBlock.Settings.create().mapColor(WARPED_PLANKS.getDefaultMapColor()).instrument(NoteBlockInstrument.BASS).solid().noCollision().strength(1.0F)
       )
    );
@@ -9599,7 +9599,7 @@
    public static final Block CRIMSON_WALL_SIGN = register(
       "crimson_wall_sign",
       new WallSignBlock(
-         WoodType.CRIMSON,
+         SignType.CRIMSON,
          AbstractBlock.Settings.create()
             .mapColor(CRIMSON_PLANKS.getDefaultMapColor())
             .instrument(NoteBlockInstrument.BASS)
@@ -9616,7 +9616,7 @@
    public static final Block WARPED_WALL_SIGN = register(
       "warped_wall_sign",
       new WallSignBlock(
-         WoodType.WARPED,
+         SignType.WARPED,
          AbstractBlock.Settings.create()
             .mapColor(WARPED_PLANKS.getDefaultMapColor())
             .instrument(NoteBlockInstrument.BASS)
@@ -11510,11 +11510,10 @@
    }
 
    /**
-    * @mapping {@literal hashed m_tobwsgju Lnet/minecraft/unmapped/C_jricjyva;m_tobwsgju(Lnet/minecraft/unmapped/C_mlrprqox;)Ljava/util/function/Function;}
-    * @mapping {@literal named waterlogMapColor Lnet/minecraft/block/Blocks;waterlogMapColor(Lnet/minecraft/block/MapColor;)Ljava/util/function/Function;}
+    * Mapping not found
     */
-   private static Function<BlockState, MapColor> waterlogMapColor(MapColor color) {
-      return state -> state.get(Properties.WATERLOGGED) ? MapColor.WATER : color;
+   private static Function<BlockState, MapColor> m_tobwsgju(MapColor arg) {
+      return state -> state.get(Properties.WATERLOGGED) ? MapColor.WATER : arg;
    }
 
    /**
@@ -11753,8 +11752,8 @@
     * @mapping {@literal hashed m_mjiljkwg Lnet/minecraft/unmapped/C_jricjyva;m_mjiljkwg(Ljava/lang/String;Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_mmxmpdoq;}
     * @mapping {@literal named register Lnet/minecraft/block/Blocks;register(Ljava/lang/String;Lnet/minecraft/block/Block;)Lnet/minecraft/block/Block;}
     */
-   public static Block register(String id, Block block) {
-      return Registry.register(Registries.BLOCK, id, block);
+   public static Block register(String type, Block block) {
+      return Registry.register(Registries.BLOCK, type, block);
    }
 
    /**
Only in namedTargetSrc/net/minecraft/block: DecoratedPotPattern.java
diff -bur namedTargetSrc/net/minecraft/block/DecoratedPotPatterns.java namedSrc/net/minecraft/block/DecoratedPotPatterns.java
--- namedTargetSrc/net/minecraft/block/DecoratedPotPatterns.java	2024-07-03 03:34:46.946036107 +0000
+++ namedSrc/net/minecraft/block/DecoratedPotPatterns.java	2024-07-03 03:33:31.681977140 +0000
@@ -6,6 +6,7 @@
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
+import net.minecraft.unmapped.C_xtwumkqz;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
 
@@ -18,127 +19,127 @@
     * @mapping {@literal hashed f_rpqtqbxs Lnet/minecraft/unmapped/C_hzdaoazh;f_rpqtqbxs:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named BLANK Lnet/minecraft/block/DecoratedPotPatterns;BLANK:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> BLANK = createRegistryKey("blank");
+   public static final RegistryKey<C_xtwumkqz> BLANK = createRegistryKey("blank");
    /**
     * @mapping {@literal hashed f_tdgzeqiq Lnet/minecraft/unmapped/C_hzdaoazh;f_tdgzeqiq:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named ANGLER Lnet/minecraft/block/DecoratedPotPatterns;ANGLER:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> ANGLER = createRegistryKey("angler");
+   public static final RegistryKey<C_xtwumkqz> ANGLER = createRegistryKey("angler");
    /**
     * @mapping {@literal hashed f_yegqydhm Lnet/minecraft/unmapped/C_hzdaoazh;f_yegqydhm:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named ARCHER Lnet/minecraft/block/DecoratedPotPatterns;ARCHER:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> ARCHER = createRegistryKey("archer");
+   public static final RegistryKey<C_xtwumkqz> ARCHER = createRegistryKey("archer");
    /**
     * @mapping {@literal hashed f_tvwwdutj Lnet/minecraft/unmapped/C_hzdaoazh;f_tvwwdutj:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named ARMS_UP Lnet/minecraft/block/DecoratedPotPatterns;ARMS_UP:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> ARMS_UP = createRegistryKey("arms_up");
+   public static final RegistryKey<C_xtwumkqz> ARMS_UP = createRegistryKey("arms_up");
    /**
     * @mapping {@literal hashed f_bbeimxer Lnet/minecraft/unmapped/C_hzdaoazh;f_bbeimxer:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named BLADE Lnet/minecraft/block/DecoratedPotPatterns;BLADE:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> BLADE = createRegistryKey("blade");
+   public static final RegistryKey<C_xtwumkqz> BLADE = createRegistryKey("blade");
    /**
     * @mapping {@literal hashed f_vjcdyghn Lnet/minecraft/unmapped/C_hzdaoazh;f_vjcdyghn:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named BREWER Lnet/minecraft/block/DecoratedPotPatterns;BREWER:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> BREWER = createRegistryKey("brewer");
+   public static final RegistryKey<C_xtwumkqz> BREWER = createRegistryKey("brewer");
    /**
     * @mapping {@literal hashed f_zskeoegl Lnet/minecraft/unmapped/C_hzdaoazh;f_zskeoegl:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named BURN Lnet/minecraft/block/DecoratedPotPatterns;BURN:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> BURN = createRegistryKey("burn");
+   public static final RegistryKey<C_xtwumkqz> BURN = createRegistryKey("burn");
    /**
     * @mapping {@literal hashed f_krgfkrco Lnet/minecraft/unmapped/C_hzdaoazh;f_krgfkrco:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named DANGER Lnet/minecraft/block/DecoratedPotPatterns;DANGER:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> DANGER = createRegistryKey("danger");
+   public static final RegistryKey<C_xtwumkqz> DANGER = createRegistryKey("danger");
    /**
     * @mapping {@literal hashed f_bxakxnat Lnet/minecraft/unmapped/C_hzdaoazh;f_bxakxnat:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named EXPLORER Lnet/minecraft/block/DecoratedPotPatterns;EXPLORER:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> EXPLORER = createRegistryKey("explorer");
+   public static final RegistryKey<C_xtwumkqz> EXPLORER = createRegistryKey("explorer");
    /**
     * @mapping {@literal hashed f_vedzwqgq Lnet/minecraft/unmapped/C_hzdaoazh;f_vedzwqgq:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named FLOW Lnet/minecraft/block/DecoratedPotPatterns;FLOW:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> FLOW = createRegistryKey("flow");
+   public static final RegistryKey<C_xtwumkqz> FLOW = createRegistryKey("flow");
    /**
     * @mapping {@literal hashed f_uwllawyr Lnet/minecraft/unmapped/C_hzdaoazh;f_uwllawyr:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named FRIEND Lnet/minecraft/block/DecoratedPotPatterns;FRIEND:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> FRIEND = createRegistryKey("friend");
+   public static final RegistryKey<C_xtwumkqz> FRIEND = createRegistryKey("friend");
    /**
     * @mapping {@literal hashed f_xwasfkuo Lnet/minecraft/unmapped/C_hzdaoazh;f_xwasfkuo:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named GUSTER Lnet/minecraft/block/DecoratedPotPatterns;GUSTER:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> GUSTER = createRegistryKey("guster");
+   public static final RegistryKey<C_xtwumkqz> GUSTER = createRegistryKey("guster");
    /**
     * @mapping {@literal hashed f_puwmjysr Lnet/minecraft/unmapped/C_hzdaoazh;f_puwmjysr:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named HEART Lnet/minecraft/block/DecoratedPotPatterns;HEART:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> HEART = createRegistryKey("heart");
+   public static final RegistryKey<C_xtwumkqz> HEART = createRegistryKey("heart");
    /**
     * @mapping {@literal hashed f_toxdzlth Lnet/minecraft/unmapped/C_hzdaoazh;f_toxdzlth:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named HEARTBREAK Lnet/minecraft/block/DecoratedPotPatterns;HEARTBREAK:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> HEARTBREAK = createRegistryKey("heartbreak");
+   public static final RegistryKey<C_xtwumkqz> HEARTBREAK = createRegistryKey("heartbreak");
    /**
     * @mapping {@literal hashed f_vkqweizx Lnet/minecraft/unmapped/C_hzdaoazh;f_vkqweizx:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named HOWL Lnet/minecraft/block/DecoratedPotPatterns;HOWL:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> HOWL = createRegistryKey("howl");
+   public static final RegistryKey<C_xtwumkqz> HOWL = createRegistryKey("howl");
    /**
     * @mapping {@literal hashed f_niqvqbir Lnet/minecraft/unmapped/C_hzdaoazh;f_niqvqbir:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named MINER Lnet/minecraft/block/DecoratedPotPatterns;MINER:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> MINER = createRegistryKey("miner");
+   public static final RegistryKey<C_xtwumkqz> MINER = createRegistryKey("miner");
    /**
     * @mapping {@literal hashed f_xjqmtxuy Lnet/minecraft/unmapped/C_hzdaoazh;f_xjqmtxuy:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named MOURNER Lnet/minecraft/block/DecoratedPotPatterns;MOURNER:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> MOURNER = createRegistryKey("mourner");
+   public static final RegistryKey<C_xtwumkqz> MOURNER = createRegistryKey("mourner");
    /**
     * @mapping {@literal hashed f_onnsauej Lnet/minecraft/unmapped/C_hzdaoazh;f_onnsauej:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named PLENTY Lnet/minecraft/block/DecoratedPotPatterns;PLENTY:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> PLENTY = createRegistryKey("plenty");
+   public static final RegistryKey<C_xtwumkqz> PLENTY = createRegistryKey("plenty");
    /**
     * @mapping {@literal hashed f_xoccckqc Lnet/minecraft/unmapped/C_hzdaoazh;f_xoccckqc:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named PRIZE Lnet/minecraft/block/DecoratedPotPatterns;PRIZE:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> PRIZE = createRegistryKey("prize");
+   public static final RegistryKey<C_xtwumkqz> PRIZE = createRegistryKey("prize");
    /**
     * @mapping {@literal hashed f_vvnvqjfa Lnet/minecraft/unmapped/C_hzdaoazh;f_vvnvqjfa:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named SCRAPE Lnet/minecraft/block/DecoratedPotPatterns;SCRAPE:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> SCRAPE = createRegistryKey("scrape");
+   public static final RegistryKey<C_xtwumkqz> SCRAPE = createRegistryKey("scrape");
    /**
     * @mapping {@literal hashed f_dgodlelo Lnet/minecraft/unmapped/C_hzdaoazh;f_dgodlelo:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named SHEAF Lnet/minecraft/block/DecoratedPotPatterns;SHEAF:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> SHEAF = createRegistryKey("sheaf");
+   public static final RegistryKey<C_xtwumkqz> SHEAF = createRegistryKey("sheaf");
    /**
     * @mapping {@literal hashed f_tyaktebd Lnet/minecraft/unmapped/C_hzdaoazh;f_tyaktebd:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named SHELTER Lnet/minecraft/block/DecoratedPotPatterns;SHELTER:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> SHELTER = createRegistryKey("shelter");
+   public static final RegistryKey<C_xtwumkqz> SHELTER = createRegistryKey("shelter");
    /**
     * @mapping {@literal hashed f_nibuxqem Lnet/minecraft/unmapped/C_hzdaoazh;f_nibuxqem:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named SKULL Lnet/minecraft/block/DecoratedPotPatterns;SKULL:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> SKULL = createRegistryKey("skull");
+   public static final RegistryKey<C_xtwumkqz> SKULL = createRegistryKey("skull");
    /**
     * @mapping {@literal hashed f_ignnwwau Lnet/minecraft/unmapped/C_hzdaoazh;f_ignnwwau:Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named SNORT Lnet/minecraft/block/DecoratedPotPatterns;SNORT:Lnet/minecraft/registry/RegistryKey;}
     */
-   public static final RegistryKey<DecoratedPotPattern> SNORT = createRegistryKey("snort");
+   public static final RegistryKey<C_xtwumkqz> SNORT = createRegistryKey("snort");
    /**
     * @mapping {@literal hashed f_tssagzls Lnet/minecraft/unmapped/C_hzdaoazh;f_tssagzls:Ljava/util/Map;}
-    * @mapping {@literal named PATTERNS_BY_ITEM Lnet/minecraft/block/DecoratedPotPatterns;PATTERNS_BY_ITEM:Ljava/util/Map;}
+    * @mapping {@literal named PATTERNS_BY_SHARDS Lnet/minecraft/block/DecoratedPotPatterns;PATTERNS_BY_SHARDS:Ljava/util/Map;}
     */
-   private static final Map<Item, RegistryKey<DecoratedPotPattern>> PATTERNS_BY_ITEM = Map.ofEntries(
+   private static final Map<Item, RegistryKey<C_xtwumkqz>> PATTERNS_BY_SHARDS = Map.ofEntries(
       Map.entry(Items.BRICK, BLANK),
       Map.entry(Items.ANGLER_POTTERY_SHERD, ANGLER),
       Map.entry(Items.ARCHER_POTTERY_SHERD, ARCHER),
@@ -166,58 +167,57 @@
    );
 
    /**
-    * @mapping {@literal hashed m_xrykbbna Lnet/minecraft/unmapped/C_hzdaoazh;m_xrykbbna(Lnet/minecraft/unmapped/C_vorddnax;)Lnet/minecraft/unmapped/C_xhhleach;}
-    * @mapping {@literal named getPattern Lnet/minecraft/block/DecoratedPotPatterns;getPattern(Lnet/minecraft/item/Item;)Lnet/minecraft/registry/RegistryKey;}
+    * Mapping not found
     */
    @Nullable
-   public static RegistryKey<DecoratedPotPattern> getPattern(Item sherd) {
-      return (RegistryKey<DecoratedPotPattern>)PATTERNS_BY_ITEM.get(sherd);
+   public static RegistryKey<C_xtwumkqz> m_xrykbbna(Item arg) {
+      return (RegistryKey<C_xtwumkqz>)PATTERNS_BY_SHARDS.get(arg);
    }
 
    /**
     * @mapping {@literal hashed m_aoeizaaw Lnet/minecraft/unmapped/C_hzdaoazh;m_aoeizaaw(Ljava/lang/String;)Lnet/minecraft/unmapped/C_xhhleach;}
     * @mapping {@literal named createRegistryKey Lnet/minecraft/block/DecoratedPotPatterns;createRegistryKey(Ljava/lang/String;)Lnet/minecraft/registry/RegistryKey;}
     */
-   private static RegistryKey<DecoratedPotPattern> createRegistryKey(String id) {
+   private static RegistryKey<C_xtwumkqz> createRegistryKey(String id) {
       return RegistryKey.of(RegistryKeys.DECORATED_POT_PATTERN, Identifier.ofDefault(id));
    }
 
    /**
     * @mapping {@literal hashed m_hoejuqye Lnet/minecraft/unmapped/C_hzdaoazh;m_hoejuqye(Lnet/minecraft/unmapped/C_tqxyjqsk;)Lnet/minecraft/unmapped/C_xtwumkqz;}
-    * @mapping {@literal named registerPatterns Lnet/minecraft/block/DecoratedPotPatterns;registerPatterns(Lnet/minecraft/registry/Registry;)Lnet/minecraft/block/DecoratedPotPattern;}
+    * @mapping {@literal named registerPatterns Lnet/minecraft/block/DecoratedPotPatterns;registerPatterns(Lnet/minecraft/registry/Registry;)Lnet/minecraft/unmapped/C_xtwumkqz;}
     */
-   public static DecoratedPotPattern registerPatterns(Registry<DecoratedPotPattern> registry) {
-      register(registry, ANGLER, "angler_pottery_pattern");
-      register(registry, ARCHER, "archer_pottery_pattern");
-      register(registry, ARMS_UP, "arms_up_pottery_pattern");
-      register(registry, BLADE, "blade_pottery_pattern");
-      register(registry, BREWER, "brewer_pottery_pattern");
-      register(registry, BURN, "burn_pottery_pattern");
-      register(registry, DANGER, "danger_pottery_pattern");
-      register(registry, EXPLORER, "explorer_pottery_pattern");
-      register(registry, FLOW, "flow_pottery_pattern");
-      register(registry, FRIEND, "friend_pottery_pattern");
-      register(registry, GUSTER, "guster_pottery_pattern");
-      register(registry, HEART, "heart_pottery_pattern");
-      register(registry, HEARTBREAK, "heartbreak_pottery_pattern");
-      register(registry, HOWL, "howl_pottery_pattern");
-      register(registry, MINER, "miner_pottery_pattern");
-      register(registry, MOURNER, "mourner_pottery_pattern");
-      register(registry, PLENTY, "plenty_pottery_pattern");
-      register(registry, PRIZE, "prize_pottery_pattern");
-      register(registry, SCRAPE, "scrape_pottery_pattern");
-      register(registry, SHEAF, "sheaf_pottery_pattern");
-      register(registry, SHELTER, "shelter_pottery_pattern");
-      register(registry, SKULL, "skull_pottery_pattern");
-      register(registry, SNORT, "snort_pottery_pattern");
-      return register(registry, BLANK, "decorated_pot_side");
+   public static C_xtwumkqz registerPatterns(Registry<C_xtwumkqz> registry) {
+      m_ynjeyckb(registry, ANGLER, "angler_pottery_pattern");
+      m_ynjeyckb(registry, ARCHER, "archer_pottery_pattern");
+      m_ynjeyckb(registry, ARMS_UP, "arms_up_pottery_pattern");
+      m_ynjeyckb(registry, BLADE, "blade_pottery_pattern");
+      m_ynjeyckb(registry, BREWER, "brewer_pottery_pattern");
+      m_ynjeyckb(registry, BURN, "burn_pottery_pattern");
+      m_ynjeyckb(registry, DANGER, "danger_pottery_pattern");
+      m_ynjeyckb(registry, EXPLORER, "explorer_pottery_pattern");
+      m_ynjeyckb(registry, FLOW, "flow_pottery_pattern");
+      m_ynjeyckb(registry, FRIEND, "friend_pottery_pattern");
+      m_ynjeyckb(registry, GUSTER, "guster_pottery_pattern");
+      m_ynjeyckb(registry, HEART, "heart_pottery_pattern");
+      m_ynjeyckb(registry, HEARTBREAK, "heartbreak_pottery_pattern");
+      m_ynjeyckb(registry, HOWL, "howl_pottery_pattern");
+      m_ynjeyckb(registry, MINER, "miner_pottery_pattern");
+      m_ynjeyckb(registry, MOURNER, "mourner_pottery_pattern");
+      m_ynjeyckb(registry, PLENTY, "plenty_pottery_pattern");
+      m_ynjeyckb(registry, PRIZE, "prize_pottery_pattern");
+      m_ynjeyckb(registry, SCRAPE, "scrape_pottery_pattern");
+      m_ynjeyckb(registry, SHEAF, "sheaf_pottery_pattern");
+      m_ynjeyckb(registry, SHELTER, "shelter_pottery_pattern");
+      m_ynjeyckb(registry, SKULL, "skull_pottery_pattern");
+      m_ynjeyckb(registry, SNORT, "snort_pottery_pattern");
+      return m_ynjeyckb(registry, BLANK, "decorated_pot_side");
    }
 
    /**
     * @mapping {@literal hashed m_ynjeyckb Lnet/minecraft/unmapped/C_hzdaoazh;m_ynjeyckb(Lnet/minecraft/unmapped/C_tqxyjqsk;Lnet/minecraft/unmapped/C_xhhleach;Ljava/lang/String;)Lnet/minecraft/unmapped/C_xtwumkqz;}
-    * @mapping {@literal named register Lnet/minecraft/block/DecoratedPotPatterns;register(Lnet/minecraft/registry/Registry;Lnet/minecraft/registry/RegistryKey;Ljava/lang/String;)Lnet/minecraft/block/DecoratedPotPattern;}
+    * @mapping {@literal named m_ynjeyckb Lnet/minecraft/block/DecoratedPotPatterns;m_ynjeyckb(Lnet/minecraft/registry/Registry;Lnet/minecraft/registry/RegistryKey;Ljava/lang/String;)Lnet/minecraft/unmapped/C_xtwumkqz;}
     */
-   private static DecoratedPotPattern register(Registry<DecoratedPotPattern> registry, RegistryKey<DecoratedPotPattern> registryKey, String path) {
-      return Registry.register(registry, registryKey, new DecoratedPotPattern(Identifier.ofDefault(path)));
+   private static C_xtwumkqz m_ynjeyckb(Registry<C_xtwumkqz> registry, RegistryKey<C_xtwumkqz> registryKey, String path) {
+      return Registry.register(registry, registryKey, new C_xtwumkqz(Identifier.ofDefault(path)));
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-07-03 03:34:46.950036111 +0000
+++ namedSrc/net/minecraft/block/dispenser/DispenserBehavior.java	2024-07-03 03:33:31.685977143 +0000
@@ -265,7 +265,7 @@
             World lv3 = pointer.world();
             if (lv.placeFluid(null, lv3, lv2, null)) {
                lv.onEmptied(null, lv3, stack, lv2);
-               return this.consumeWithRemainder(pointer, stack, new ItemStack(Items.BUCKET));
+               return this.m_hdvxaiaq(pointer, stack, new ItemStack(Items.BUCKET));
             } else {
                return this.filledBucketDispenserBehavior.dispense(pointer, stack);
             }
@@ -296,7 +296,7 @@
                } else {
                   lv.emitGameEvent(null, GameEvent.FLUID_PICKUP, lv2);
                   Item lv7 = lv6.getItem();
-                  return this.consumeWithRemainder(pointer, stack, new ItemStack(lv7));
+                  return this.m_hdvxaiaq(pointer, stack, new ItemStack(lv7));
                }
             } else {
                return super.dispenseSilently(pointer, stack);
@@ -457,7 +457,7 @@
              */
             private ItemStack fillEmptyBottle(BlockPointer dispenser, ItemStack emptyBottleStack, ItemStack filledBottleStack) {
                dispenser.world().emitGameEvent(null, GameEvent.FLUID_PICKUP, dispenser.pos());
-               return this.consumeWithRemainder(dispenser, emptyBottleStack, filledBottleStack);
+               return this.m_hdvxaiaq(dispenser, emptyBottleStack, filledBottleStack);
             }
 
             /**
@@ -599,7 +599,7 @@
                      lv2.playSound(null, lv3, SoundEvents.ITEM_BOTTLE_EMPTY, SoundCategory.BLOCKS, 1.0F, 1.0F);
                      lv2.emitGameEvent(null, GameEvent.FLUID_PLACE, lv3);
                      lv2.setBlockState(lv4, Blocks.MUD.getDefaultState());
-                     return this.consumeWithRemainder(pointer, stack, new ItemStack(Items.GLASS_BOTTLE));
+                     return this.m_hdvxaiaq(pointer, stack, new ItemStack(Items.GLASS_BOTTLE));
                   }
                }
             }
diff -bur namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java
--- namedTargetSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2024-07-03 03:34:46.822036006 +0000
+++ namedSrc/net/minecraft/block/dispenser/ItemDispenserBehavior.java	2024-07-03 03:33:31.533977001 +0000
@@ -71,7 +71,7 @@
     * @mapping {@literal named playSound Lnet/minecraft/block/dispenser/ItemDispenserBehavior;playSound(Lnet/minecraft/util/math/BlockPointer;)V}
     */
    protected void playSound(BlockPointer pointer) {
-      playDefaultSound(pointer);
+      m_umjaspru(pointer);
    }
 
    /**
@@ -83,32 +83,30 @@
    }
 
    /**
-    * @mapping {@literal hashed m_umjaspru Lnet/minecraft/unmapped/C_dnfsxzwl;m_umjaspru(Lnet/minecraft/unmapped/C_wzdnszcs;)V}
-    * @mapping {@literal named playDefaultSound Lnet/minecraft/block/dispenser/ItemDispenserBehavior;playDefaultSound(Lnet/minecraft/util/math/BlockPointer;)V}
+    * Mapping not found
     */
-   private static void playDefaultSound(BlockPointer pointer) {
-      pointer.world().syncWorldEvent(WorldEvents.DISPENSER_DISPENSES, pointer.pos(), 0);
+   private static void m_umjaspru(BlockPointer arg) {
+      arg.world().syncWorldEvent(WorldEvents.DISPENSER_DISPENSES, arg.pos(), 0);
    }
 
    /**
     * @mapping {@literal hashed m_yfabkxkw Lnet/minecraft/unmapped/C_dnfsxzwl;m_yfabkxkw(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_xpuuihxf;)V}
     * @mapping {@literal named m_yfabkxkw Lnet/minecraft/block/dispenser/ItemDispenserBehavior;m_yfabkxkw(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/util/math/Direction;)V}
     */
-   private static void m_yfabkxkw(BlockPointer pointer, Direction direction) {
-      pointer.world().syncWorldEvent(WorldEvents.DISPENSER_FIRED, pointer.pos(), direction.getId());
+   private static void m_yfabkxkw(BlockPointer arg, Direction direction) {
+      arg.world().syncWorldEvent(WorldEvents.DISPENSER_FIRED, arg.pos(), direction.getId());
    }
 
    /**
-    * @mapping {@literal hashed m_hdvxaiaq Lnet/minecraft/unmapped/C_dnfsxzwl;m_hdvxaiaq(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;Lnet/minecraft/unmapped/C_sddaxwyk;)Lnet/minecraft/unmapped/C_sddaxwyk;}
-    * @mapping {@literal named consumeWithRemainder Lnet/minecraft/block/dispenser/ItemDispenserBehavior;consumeWithRemainder(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/item/ItemStack;}
+    * Mapping not found
     */
-   protected ItemStack consumeWithRemainder(BlockPointer pointer, ItemStack stack, ItemStack remainder) {
-      stack.decrement(1);
-      if (stack.isEmpty()) {
-         return remainder;
+   protected ItemStack m_hdvxaiaq(BlockPointer arg, ItemStack arg2, ItemStack arg3) {
+      arg2.decrement(1);
+      if (arg2.isEmpty()) {
+         return arg3;
       } else {
-         this.m_fhxczazc(pointer, remainder);
-         return stack;
+         this.m_fhxczazc(arg, arg3);
+         return arg2;
       }
    }
 
@@ -116,13 +114,13 @@
     * @mapping {@literal hashed m_fhxczazc Lnet/minecraft/unmapped/C_dnfsxzwl;m_fhxczazc(Lnet/minecraft/unmapped/C_wzdnszcs;Lnet/minecraft/unmapped/C_sddaxwyk;)V}
     * @mapping {@literal named m_fhxczazc Lnet/minecraft/block/dispenser/ItemDispenserBehavior;m_fhxczazc(Lnet/minecraft/util/math/BlockPointer;Lnet/minecraft/item/ItemStack;)V}
     */
-   private void m_fhxczazc(BlockPointer pointer, ItemStack stack) {
-      ItemStack lv = pointer.blockEntity().m_idqgppgo(stack);
+   private void m_fhxczazc(BlockPointer arg, ItemStack stack) {
+      ItemStack lv = arg.blockEntity().m_idqgppgo(stack);
       if (!lv.isEmpty()) {
-         Direction lv2 = pointer.state().get(DispenserBlock.FACING);
-         spawnItem(pointer.world(), lv, 6, lv2, DispenserBlock.m_tfzksanp(pointer));
-         playDefaultSound(pointer);
-         m_yfabkxkw(pointer, lv2);
+         Direction lv2 = arg.state().get(DispenserBlock.FACING);
+         spawnItem(arg.world(), lv, 6, lv2, DispenserBlock.m_tfzksanp(arg));
+         m_umjaspru(arg);
+         m_yfabkxkw(arg, lv2);
       }
    }
 }
diff -bur namedTargetSrc/net/minecraft/block/FenceGateBlock.java namedSrc/net/minecraft/block/FenceGateBlock.java
--- namedTargetSrc/net/minecraft/block/FenceGateBlock.java	2024-07-03 03:34:47.058036200 +0000
+++ namedSrc/net/minecraft/block/FenceGateBlock.java	2024-07-03 03:33:31.797977248 +0000
@@ -3,6 +3,7 @@
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.function.BiConsumer;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.entity.ai.pathing.NavigationType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemPlacementContext;
@@ -34,7 +35,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/FenceGateBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<FenceGateBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(WoodType.CODEC.fieldOf("wood_type").forGetter(block -> block.signType), getSettingsCodec())
+      instance -> instance.group(SignType.CODEC.fieldOf("wood_type").forGetter(block -> block.signType), getSettingsCodec())
             .apply(instance, FenceGateBlock::new)
    );
    /**
@@ -122,9 +123,9 @@
    );
    /**
     * @mapping {@literal hashed f_whecgsjr Lnet/minecraft/unmapped/C_nfehypbw;f_whecgsjr:Lnet/minecraft/unmapped/C_xlaykyai;}
-    * @mapping {@literal named signType Lnet/minecraft/block/FenceGateBlock;signType:Lnet/minecraft/block/WoodType;}
+    * @mapping {@literal named signType Lnet/minecraft/block/FenceGateBlock;signType:Lnet/minecraft/block/sign/SignType;}
     */
-   private final WoodType signType;
+   private final SignType signType;
 
    /**
     * Mapping not found
@@ -136,9 +137,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nfehypbw;<init>(Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/FenceGateBlock;<init>(Lnet/minecraft/block/WoodType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/FenceGateBlock;<init>(Lnet/minecraft/block/sign/SignType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public FenceGateBlock(WoodType signType, AbstractBlock.Settings settings) {
+   public FenceGateBlock(SignType signType, AbstractBlock.Settings settings) {
       super(settings.sounds(signType.soundType()));
       this.signType = signType;
       this.setDefaultState(
diff -bur namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java namedSrc/net/minecraft/block/MangrovePropaguleBlock.java
--- namedTargetSrc/net/minecraft/block/MangrovePropaguleBlock.java	2024-07-03 03:34:46.818036003 +0000
+++ namedSrc/net/minecraft/block/MangrovePropaguleBlock.java	2024-07-03 03:33:31.529976997 +0000
@@ -3,7 +3,6 @@
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.block.sapling.SaplingBlock;
-import net.minecraft.block.sapling.TreeGrower;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemPlacementContext;
@@ -33,7 +32,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/MangrovePropaguleBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<MangrovePropaguleBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(TreeGrower.CODEC.fieldOf("tree").forGetter(arg -> arg.grower), getSettingsCodec())
+      instance -> instance.group(WoodTypes.CODEC.fieldOf("tree").forGetter(arg -> arg.generator), getSettingsCodec())
             .apply(instance, MangrovePropaguleBlock::new)
    );
    /**
@@ -78,9 +77,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_txfkypkg;<init>(Lnet/minecraft/unmapped/C_hupbiznx;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/MangrovePropaguleBlock;<init>(Lnet/minecraft/block/sapling/TreeGrower;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/MangrovePropaguleBlock;<init>(Lnet/minecraft/block/WoodTypes;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public MangrovePropaguleBlock(TreeGrower arg, AbstractBlock.Settings settings) {
+   public MangrovePropaguleBlock(WoodTypes arg, AbstractBlock.Settings settings) {
       super(arg, settings);
       this.setDefaultState(
          this.stateManager
diff -bur namedTargetSrc/net/minecraft/block/sapling/SaplingBlock.java namedSrc/net/minecraft/block/sapling/SaplingBlock.java
--- namedTargetSrc/net/minecraft/block/sapling/SaplingBlock.java	2024-07-03 03:34:46.874036049 +0000
+++ namedSrc/net/minecraft/block/sapling/SaplingBlock.java	2024-07-03 03:33:31.597977060 +0000
@@ -8,6 +8,7 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Fertilizable;
 import net.minecraft.block.ShapeContext;
+import net.minecraft.block.WoodTypes;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.IntProperty;
@@ -29,7 +30,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/sapling/SaplingBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<SaplingBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(TreeGrower.CODEC.fieldOf("tree").forGetter(block -> block.grower), getSettingsCodec()).apply(instance, SaplingBlock::new)
+      instance -> instance.group(WoodTypes.CODEC.fieldOf("tree").forGetter(block -> block.generator), getSettingsCodec()).apply(instance, SaplingBlock::new)
    );
    /**
     * @mapping {@literal hashed f_xkirgufi Lnet/minecraft/unmapped/C_zzbhjpvq;f_xkirgufi:Lnet/minecraft/unmapped/C_vltzvhxi;}
@@ -48,9 +49,9 @@
    protected static final VoxelShape SHAPE = Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 12.0, 14.0);
    /**
     * @mapping {@literal hashed f_tbvcakjw Lnet/minecraft/unmapped/C_zzbhjpvq;f_tbvcakjw:Lnet/minecraft/unmapped/C_hupbiznx;}
-    * @mapping {@literal named grower Lnet/minecraft/block/sapling/SaplingBlock;grower:Lnet/minecraft/block/sapling/TreeGrower;}
+    * @mapping {@literal named generator Lnet/minecraft/block/sapling/SaplingBlock;generator:Lnet/minecraft/block/WoodTypes;}
     */
-   protected final TreeGrower grower;
+   protected final WoodTypes generator;
 
    /**
     * Mapping not found
@@ -62,11 +63,11 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_zzbhjpvq;<init>(Lnet/minecraft/unmapped/C_hupbiznx;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/sapling/SaplingBlock;<init>(Lnet/minecraft/block/sapling/TreeGrower;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/sapling/SaplingBlock;<init>(Lnet/minecraft/block/WoodTypes;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   protected SaplingBlock(TreeGrower grower, AbstractBlock.Settings settings) {
+   protected SaplingBlock(WoodTypes generator, AbstractBlock.Settings settings) {
       super(settings);
-      this.grower = grower;
+      this.generator = generator;
       this.setDefaultState(this.stateManager.getDefaultState().with(STAGE, Integer.valueOf(0)));
    }
 
@@ -96,7 +97,7 @@
       if ((Integer)state.get(STAGE) == 0) {
          world.setBlockState(pos, state.cycle(STAGE), Block.NO_REDRAW);
       } else {
-         this.grower.growTree(world, world.getChunkManager().getChunkGenerator(), pos, state, random);
+         this.generator.m_lfmzuxpy(world, world.getChunkManager().getChunkGenerator(), pos, state, random);
       }
    }
 
Only in namedTargetSrc/net/minecraft/block/sapling: TreeGrower.java
diff -bur namedTargetSrc/net/minecraft/block/sign/AbstractSignBlock.java namedSrc/net/minecraft/block/sign/AbstractSignBlock.java
--- namedTargetSrc/net/minecraft/block/sign/AbstractSignBlock.java	2024-07-03 03:34:47.042036187 +0000
+++ namedSrc/net/minecraft/block/sign/AbstractSignBlock.java	2024-07-03 03:33:31.781977233 +0000
@@ -9,7 +9,6 @@
 import net.minecraft.block.BlockWithEntity;
 import net.minecraft.block.ShapeContext;
 import net.minecraft.block.Waterloggable;
-import net.minecraft.block.WoodType;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
@@ -63,15 +62,15 @@
    protected static final VoxelShape SHAPE = Block.createCuboidShape(4.0, 0.0, 4.0, 12.0, 16.0, 12.0);
    /**
     * @mapping {@literal hashed f_mryvqsio Lnet/minecraft/unmapped/C_siepybep;f_mryvqsio:Lnet/minecraft/unmapped/C_xlaykyai;}
-    * @mapping {@literal named type Lnet/minecraft/block/sign/AbstractSignBlock;type:Lnet/minecraft/block/WoodType;}
+    * @mapping {@literal named type Lnet/minecraft/block/sign/AbstractSignBlock;type:Lnet/minecraft/block/sign/SignType;}
     */
-   private final WoodType type;
+   private final SignType type;
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_siepybep;<init>(Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/sign/AbstractSignBlock;<init>(Lnet/minecraft/block/WoodType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/sign/AbstractSignBlock;<init>(Lnet/minecraft/block/sign/SignType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   protected AbstractSignBlock(WoodType type, AbstractBlock.Settings settings) {
+   protected AbstractSignBlock(SignType type, AbstractBlock.Settings settings) {
       super(settings);
       this.type = type;
    }
@@ -215,22 +214,22 @@
 
    /**
     * @mapping {@literal hashed m_wtsxgame Lnet/minecraft/unmapped/C_siepybep;m_wtsxgame()Lnet/minecraft/unmapped/C_xlaykyai;}
-    * @mapping {@literal named getSignType Lnet/minecraft/block/sign/AbstractSignBlock;getSignType()Lnet/minecraft/block/WoodType;}
+    * @mapping {@literal named getSignType Lnet/minecraft/block/sign/AbstractSignBlock;getSignType()Lnet/minecraft/block/sign/SignType;}
     */
-   public WoodType getSignType() {
+   public SignType getSignType() {
       return this.type;
    }
 
    /**
     * @mapping {@literal hashed m_ltbhesyf Lnet/minecraft/unmapped/C_siepybep;m_ltbhesyf(Lnet/minecraft/unmapped/C_mmxmpdoq;)Lnet/minecraft/unmapped/C_xlaykyai;}
-    * @mapping {@literal named getSignType Lnet/minecraft/block/sign/AbstractSignBlock;getSignType(Lnet/minecraft/block/Block;)Lnet/minecraft/block/WoodType;}
+    * @mapping {@literal named getSignType Lnet/minecraft/block/sign/AbstractSignBlock;getSignType(Lnet/minecraft/block/Block;)Lnet/minecraft/block/sign/SignType;}
     */
-   public static WoodType getSignType(Block block) {
-      WoodType lv;
+   public static SignType getSignType(Block block) {
+      SignType lv;
       if (block instanceof AbstractSignBlock) {
          lv = ((AbstractSignBlock)block).getSignType();
       } else {
-         lv = WoodType.OAK;
+         lv = SignType.OAK;
       }
 
       return lv;

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (2/3): 
diff -bur namedTargetSrc/net/minecraft/block/sign/CeilingHangingSignBlock.java namedSrc/net/minecraft/block/sign/CeilingHangingSignBlock.java
--- namedTargetSrc/net/minecraft/block/sign/CeilingHangingSignBlock.java	2024-07-03 03:34:46.814036000 +0000
+++ namedSrc/net/minecraft/block/sign/CeilingHangingSignBlock.java	2024-07-03 03:33:31.525976992 +0000
@@ -12,7 +12,6 @@
 import net.minecraft.block.Blocks;
 import net.minecraft.block.ShapeContext;
 import net.minecraft.block.SideShapeType;
-import net.minecraft.block.WoodType;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
@@ -54,7 +53,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/sign/CeilingHangingSignBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<CeilingHangingSignBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(WoodType.CODEC.fieldOf("wood_type").forGetter(AbstractSignBlock::getSignType), getSettingsCodec())
+      instance -> instance.group(SignType.CODEC.fieldOf("wood_type").forGetter(AbstractSignBlock::getSignType), getSettingsCodec())
             .apply(instance, CeilingHangingSignBlock::new)
    );
    /**
@@ -104,9 +103,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_vsqrirpz;<init>(Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/sign/CeilingHangingSignBlock;<init>(Lnet/minecraft/block/WoodType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/sign/CeilingHangingSignBlock;<init>(Lnet/minecraft/block/sign/SignType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public CeilingHangingSignBlock(WoodType arg, AbstractBlock.Settings settings) {
+   public CeilingHangingSignBlock(SignType arg, AbstractBlock.Settings settings) {
       super(arg, settings.sounds(arg.hangingSignSoundType()));
       this.setDefaultState(
          this.stateManager
diff -bur namedTargetSrc/net/minecraft/block/sign/SignBlock.java namedSrc/net/minecraft/block/sign/SignBlock.java
--- namedTargetSrc/net/minecraft/block/sign/SignBlock.java	2024-07-03 03:34:46.838036020 +0000
+++ namedSrc/net/minecraft/block/sign/SignBlock.java	2024-07-03 03:33:31.557977023 +0000
@@ -6,7 +6,6 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.WoodType;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemPlacementContext;
@@ -31,7 +30,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/sign/SignBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<SignBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(WoodType.CODEC.fieldOf("wood_type").forGetter(AbstractSignBlock::getSignType), getSettingsCodec())
+      instance -> instance.group(SignType.CODEC.fieldOf("wood_type").forGetter(AbstractSignBlock::getSignType), getSettingsCodec())
             .apply(instance, SignBlock::new)
    );
    /**
@@ -50,9 +49,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_kkhuxlco;<init>(Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/sign/SignBlock;<init>(Lnet/minecraft/block/WoodType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/sign/SignBlock;<init>(Lnet/minecraft/block/sign/SignType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public SignBlock(WoodType arg, AbstractBlock.Settings settings) {
+   public SignBlock(SignType arg, AbstractBlock.Settings settings) {
       super(arg, settings.sounds(arg.soundType()));
       this.setDefaultState(this.stateManager.getDefaultState().with(ROTATION, Integer.valueOf(0)).with(WATERLOGGED, Boolean.valueOf(false)));
    }
Only in namedSrc/net/minecraft/block/sign: SignType.java
diff -bur namedTargetSrc/net/minecraft/block/sign/WallHangingSignBlock.java namedSrc/net/minecraft/block/sign/WallHangingSignBlock.java
--- namedTargetSrc/net/minecraft/block/sign/WallHangingSignBlock.java	2024-07-03 03:34:46.962036121 +0000
+++ namedSrc/net/minecraft/block/sign/WallHangingSignBlock.java	2024-07-03 03:33:31.697977155 +0000
@@ -12,7 +12,6 @@
 import net.minecraft.block.HorizontalFacingBlock;
 import net.minecraft.block.ShapeContext;
 import net.minecraft.block.SideShapeType;
-import net.minecraft.block.WoodType;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
@@ -53,7 +52,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/sign/WallHangingSignBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<WallHangingSignBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(WoodType.CODEC.fieldOf("wood_type").forGetter(AbstractSignBlock::getSignType), getSettingsCodec())
+      instance -> instance.group(SignType.CODEC.fieldOf("wood_type").forGetter(AbstractSignBlock::getSignType), getSettingsCodec())
             .apply(instance, WallHangingSignBlock::new)
    );
    /**
@@ -99,9 +98,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_hzvmpvoj;<init>(Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/sign/WallHangingSignBlock;<init>(Lnet/minecraft/block/WoodType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/sign/WallHangingSignBlock;<init>(Lnet/minecraft/block/sign/SignType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public WallHangingSignBlock(WoodType arg, AbstractBlock.Settings settings) {
+   public WallHangingSignBlock(SignType arg, AbstractBlock.Settings settings) {
       super(arg, settings.sounds(arg.hangingSignSoundType()));
       this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(WATERLOGGED, Boolean.valueOf(false)));
    }
diff -bur namedTargetSrc/net/minecraft/block/sign/WallSignBlock.java namedSrc/net/minecraft/block/sign/WallSignBlock.java
--- namedTargetSrc/net/minecraft/block/sign/WallSignBlock.java	2024-07-03 03:34:46.862036039 +0000
+++ namedSrc/net/minecraft/block/sign/WallSignBlock.java	2024-07-03 03:33:31.585977050 +0000
@@ -11,7 +11,6 @@
 import net.minecraft.block.Blocks;
 import net.minecraft.block.HorizontalFacingBlock;
 import net.minecraft.block.ShapeContext;
-import net.minecraft.block.WoodType;
 import net.minecraft.fluid.FluidState;
 import net.minecraft.fluid.Fluids;
 import net.minecraft.item.ItemPlacementContext;
@@ -38,7 +37,7 @@
     * @mapping {@literal named CODEC Lnet/minecraft/block/sign/WallSignBlock;CODEC:Lcom/mojang/serialization/MapCodec;}
     */
    public static final MapCodec<WallSignBlock> CODEC = RecordCodecBuilder.mapCodec(
-      instance -> instance.group(WoodType.CODEC.fieldOf("wood_type").forGetter(AbstractSignBlock::getSignType), getSettingsCodec())
+      instance -> instance.group(SignType.CODEC.fieldOf("wood_type").forGetter(AbstractSignBlock::getSignType), getSettingsCodec())
             .apply(instance, WallSignBlock::new)
    );
    /**
@@ -88,9 +87,9 @@
 
    /**
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_rgitojot;<init>(Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_triydqro$C_xnkxsdfy;)V}
-    * @mapping {@literal named <init> Lnet/minecraft/block/sign/WallSignBlock;<init>(Lnet/minecraft/block/WoodType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
+    * @mapping {@literal named <init> Lnet/minecraft/block/sign/WallSignBlock;<init>(Lnet/minecraft/block/sign/SignType;Lnet/minecraft/block/AbstractBlock$Settings;)V}
     */
-   public WallSignBlock(WoodType arg, AbstractBlock.Settings settings) {
+   public WallSignBlock(SignType arg, AbstractBlock.Settings settings) {
       super(arg, settings.sounds(arg.soundType()));
       this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(WATERLOGGED, Boolean.valueOf(false)));
    }
Only in namedTargetSrc/net/minecraft/block: WoodType.java
Only in namedSrc/net/minecraft/block: WoodTypes.java
diff -bur namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java
--- namedTargetSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-07-03 03:34:46.910036078 +0000
+++ namedSrc/net/minecraft/client/gui/hud/in_game/InGameHud.java	2024-07-03 03:33:31.633977095 +0000
@@ -25,7 +25,6 @@
 import net.minecraft.client.option.AttackIndicator;
 import net.minecraft.client.option.GameOptions;
 import net.minecraft.client.render.Camera;
-import net.minecraft.client.render.DeltaTracker;
 import net.minecraft.client.render.LightmapTextureManager;
 import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.texture.Sprite;
@@ -55,6 +54,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_lrgsdfwv;
 import net.minecraft.util.Arm;
 import net.minecraft.util.ChatUtil;
 import net.minecraft.util.Formatting;
@@ -488,10 +488,10 @@
          .add(this::renderHotbar)
          .add(this::renderExperienceLevel)
          .add(this::renderStatusEffectOverlay)
-         .add((graphics, tracker) -> this.bossBarHud.render(graphics));
+         .add((graphics, arg2) -> this.bossBarHud.render(graphics));
       RenderList lv2 = new RenderList()
          .add(this::renderDemoTimer)
-         .add((graphics, tracker) -> {
+         .add((graphics, arg2) -> {
             if (this.debugHud.chartsVisible()) {
                this.debugHud.render(graphics);
             }
@@ -501,7 +501,7 @@
          .add(this::renderTitles)
          .add(this::renderChat)
          .add(this::renderPlayerList)
-         .add((graphics, tracker) -> this.subtitlesHud.render(graphics));
+         .add((graphics, arg2) -> this.subtitlesHud.render(graphics));
       this.renderList.add(lv, () -> !client.options.hudHidden).add(this::renderSleep).add(lv2, () -> !client.options.hudHidden);
    }
 
@@ -517,24 +517,24 @@
 
    /**
     * @mapping {@literal hashed m_ettyzsyv Lnet/minecraft/unmapped/C_nepwsmgw;m_ettyzsyv(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named render Lnet/minecraft/client/gui/hud/in_game/InGameHud;render(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named render Lnet/minecraft/client/gui/hud/in_game/InGameHud;render(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   public void render(GuiGraphics graphics, DeltaTracker tracker) {
+   public void render(GuiGraphics graphics, C_lrgsdfwv arg2) {
       RenderSystem.enableDepthTest();
-      this.renderList.render(graphics, tracker);
+      this.renderList.render(graphics, arg2);
       RenderSystem.disableDepthTest();
    }
 
    /**
     * @mapping {@literal hashed m_ronzofwm Lnet/minecraft/unmapped/C_nepwsmgw;m_ronzofwm(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderOverlays Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderOverlays(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderOverlays Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderOverlays(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderOverlays(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderOverlays(GuiGraphics graphics, C_lrgsdfwv arg2) {
       if (MinecraftClient.isFancyGraphicsOrBetter()) {
          this.renderVignetteOverlay(graphics, this.client.getCameraEntity());
       }
 
-      float f = tracker.m_ndzzsdqi();
+      float f = arg2.m_ndzzsdqi();
       this.spyglassScale = MathHelper.lerp(0.5F * f, this.spyglassScale, 1.125F);
       if (this.client.options.getPerspective().isFirstPerson()) {
          if (this.client.player.isUsingSpyglass()) {
@@ -552,7 +552,7 @@
          this.renderOverlay(graphics, POWDER_SNOW_OUTLINE_TEXTURE, this.client.player.getFreezingScale());
       }
 
-      float g = MathHelper.lerp(tracker.m_ixtdjbfz(false), this.client.player.lastScreenSwirlIntensity, this.client.player.screenSwirlIntensity);
+      float g = MathHelper.lerp(arg2.m_ixtdjbfz(false), this.client.player.lastScreenSwirlIntensity, this.client.player.screenSwirlIntensity);
       if (g > 0.0F && !this.client.player.hasStatusEffect(StatusEffects.NAUSEA)) {
          this.renderPortalOverlay(graphics, g);
       }
@@ -560,9 +560,9 @@
 
    /**
     * @mapping {@literal hashed m_gbnvpsmk Lnet/minecraft/unmapped/C_nepwsmgw;m_gbnvpsmk(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderSleep Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderSleep(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderSleep Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderSleep(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderSleep(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderSleep(GuiGraphics graphics, C_lrgsdfwv arg2) {
       if (this.client.player.getSleepTimer() > 0) {
          this.client.getProfiler().push("sleep");
          float f = (float)this.client.player.getSleepTimer();
@@ -579,13 +579,13 @@
 
    /**
     * @mapping {@literal hashed m_cwobkefs Lnet/minecraft/unmapped/C_nepwsmgw;m_cwobkefs(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderOverlayMessage Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderOverlayMessage(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderOverlayMessage Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderOverlayMessage(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderOverlayMessage(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderOverlayMessage(GuiGraphics graphics, C_lrgsdfwv arg2) {
       TextRenderer lv = this.getTextRenderer();
       if (this.overlayMessage != null && this.overlayRemaining > 0) {
          this.client.getProfiler().push("overlayMessage");
-         float f = (float)this.overlayRemaining - tracker.m_ixtdjbfz(false);
+         float f = (float)this.overlayRemaining - arg2.m_ixtdjbfz(false);
          int i = (int)(f * 255.0F / 20.0F);
          if (i > 255) {
             i = 255;
@@ -612,13 +612,13 @@
 
    /**
     * @mapping {@literal hashed m_qgtzabmx Lnet/minecraft/unmapped/C_nepwsmgw;m_qgtzabmx(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderTitles Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderTitles(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderTitles Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderTitles(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderTitles(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderTitles(GuiGraphics graphics, C_lrgsdfwv arg2) {
       if (this.title != null && this.titleTotalTicks > 0) {
          TextRenderer lv = this.getTextRenderer();
          this.client.getProfiler().push("titleAndSubtitle");
-         float f = (float)this.titleTotalTicks - tracker.m_ixtdjbfz(false);
+         float f = (float)this.titleTotalTicks - arg2.m_ixtdjbfz(false);
          int i = 255;
          if (this.titleTotalTicks > this.titleFadeOutTicks + this.titleRemainTicks) {
             float g = (float)(this.titleFadeInTicks + this.titleRemainTicks + this.titleFadeOutTicks) - f;
@@ -656,9 +656,9 @@
 
    /**
     * @mapping {@literal hashed m_hmpeaweq Lnet/minecraft/unmapped/C_nepwsmgw;m_hmpeaweq(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderChat Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderChat(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderChat Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderChat(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderChat(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderChat(GuiGraphics graphics, C_lrgsdfwv arg2) {
       if (!this.chatHud.isChatFocused()) {
          Window lv = this.client.getWindow();
          int i = MathHelper.floor(this.client.mouse.getX() * (double)lv.getScaledWidth() / (double)lv.getWidth());
@@ -669,9 +669,9 @@
 
    /**
     * @mapping {@literal hashed m_iucytvnr Lnet/minecraft/unmapped/C_nepwsmgw;m_iucytvnr(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderScoreboard Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderScoreboard(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderScoreboard Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderScoreboard(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderScoreboard(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderScoreboard(GuiGraphics graphics, C_lrgsdfwv arg2) {
       Scoreboard lv = this.client.world.getScoreboard();
       ScoreboardObjective lv2 = null;
       Team lv3 = lv.getPlayerTeam(this.client.player.getProfileName());
@@ -690,9 +690,9 @@
 
    /**
     * @mapping {@literal hashed m_lcsxraft Lnet/minecraft/unmapped/C_nepwsmgw;m_lcsxraft(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderPlayerList Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderPlayerList(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderPlayerList Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderPlayerList(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderPlayerList(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderPlayerList(GuiGraphics graphics, C_lrgsdfwv arg2) {
       Scoreboard lv = this.client.world.getScoreboard();
       ScoreboardObjective lv2 = lv.getObjectiveForSlot(ScoreboardDisplaySlot.LIST);
       if (!this.client.options.playerListKey.isPressed()
@@ -706,9 +706,9 @@
 
    /**
     * @mapping {@literal hashed m_btqrbwce Lnet/minecraft/unmapped/C_nepwsmgw;m_btqrbwce(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderCrosshair Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderCrosshair(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderCrosshair Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderCrosshair(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderCrosshair(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderCrosshair(GuiGraphics graphics, C_lrgsdfwv arg2) {
       GameOptions lv = this.client.options;
       if (lv.getPerspective().isFirstPerson()) {
          if (this.client.interactionManager.getCurrentGameMode() != GameMode.SPECTATOR || this.shouldRenderSpectatorCrosshair(this.client.crosshairTarget)) {
@@ -782,9 +782,9 @@
 
    /**
     * @mapping {@literal hashed m_oafggdwi Lnet/minecraft/unmapped/C_nepwsmgw;m_oafggdwi(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderStatusEffectOverlay Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderStatusEffectOverlay(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderStatusEffectOverlay Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderStatusEffectOverlay(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderStatusEffectOverlay(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderStatusEffectOverlay(GuiGraphics graphics, C_lrgsdfwv arg2) {
       Collection<StatusEffectInstance> collection = this.client.player.getStatusEffects();
       if (!collection.isEmpty()) {
          if (this.client.currentScreen instanceof AbstractInventoryScreen lv && lv.hideStatusEffectHud()) {
@@ -847,13 +847,13 @@
 
    /**
     * @mapping {@literal hashed m_srkhzgsd Lnet/minecraft/unmapped/C_nepwsmgw;m_srkhzgsd(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderHotbar Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderHotbar(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderHotbar Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderHotbar(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderHotbar(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderHotbar(GuiGraphics graphics, C_lrgsdfwv arg2) {
       if (this.client.interactionManager.getCurrentGameMode() == GameMode.SPECTATOR) {
          this.spectatorHud.renderHotbar(graphics);
       } else {
-         this.renderSurvivalHotbar(graphics, tracker);
+         this.renderSurvivalHotbar(graphics, arg2);
       }
 
       int i = graphics.getScaledWindowWidth() / 2 - 91;
@@ -878,9 +878,9 @@
 
    /**
     * @mapping {@literal hashed m_yahflzho Lnet/minecraft/unmapped/C_nepwsmgw;m_yahflzho(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderSurvivalHotbar Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderSurvivalHotbar(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderSurvivalHotbar Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderSurvivalHotbar(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderSurvivalHotbar(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderSurvivalHotbar(GuiGraphics graphics, C_lrgsdfwv arg2) {
       PlayerEntity lv = this.getCameraPlayer();
       if (lv != null) {
          ItemStack lv2 = lv.getOffHandStack();
@@ -908,15 +908,15 @@
          for (int m = 0; m < 9; m++) {
             int n = i - 90 + m * 20 + 2;
             int o = graphics.getScaledWindowHeight() - 16 - 3;
-            this.renderHotbarItem(graphics, n, o, tracker, lv, lv.getInventory().main.get(m), l++);
+            this.renderHotbarItem(graphics, n, o, arg2, lv, lv.getInventory().main.get(m), l++);
          }
 
          if (!lv2.isEmpty()) {
             int p = graphics.getScaledWindowHeight() - 16 - 3;
             if (lv3 == Arm.LEFT) {
-               this.renderHotbarItem(graphics, i - 91 - 26, p, tracker, lv, lv2, l++);
+               this.renderHotbarItem(graphics, i - 91 - 26, p, arg2, lv, lv2, l++);
             } else {
-               this.renderHotbarItem(graphics, i + 91 + 10, p, tracker, lv, lv2, l++);
+               this.renderHotbarItem(graphics, i + 91 + 10, p, arg2, lv, lv2, l++);
             }
          }
 
@@ -987,9 +987,9 @@
 
    /**
     * @mapping {@literal hashed m_wyafzzmv Lnet/minecraft/unmapped/C_nepwsmgw;m_wyafzzmv(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderExperienceLevel Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderExperienceLevel(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderExperienceLevel Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderExperienceLevel(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderExperienceLevel(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderExperienceLevel(GuiGraphics graphics, C_lrgsdfwv arg2) {
       int i = this.client.player.experienceLevel;
       if (this.shouldRenderExperience() && i > 0) {
          this.client.getProfiler().push("expLevel");
@@ -1047,9 +1047,9 @@
 
    /**
     * @mapping {@literal hashed m_fmuufkwf Lnet/minecraft/unmapped/C_nepwsmgw;m_fmuufkwf(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderDemoTimer Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderDemoTimer(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderDemoTimer Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderDemoTimer(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderDemoTimer(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderDemoTimer(GuiGraphics graphics, C_lrgsdfwv arg2) {
       if (this.client.isDemo()) {
          this.client.getProfiler().push("demo");
          Text lv;
@@ -1584,11 +1584,11 @@
 
    /**
     * @mapping {@literal hashed m_pjslufig Lnet/minecraft/unmapped/C_nepwsmgw;m_pjslufig(Lnet/minecraft/unmapped/C_sedilmty;IILnet/minecraft/unmapped/C_lrgsdfwv;Lnet/minecraft/unmapped/C_jzrpycqo;Lnet/minecraft/unmapped/C_sddaxwyk;I)V}
-    * @mapping {@literal named renderHotbarItem Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderHotbarItem(Lnet/minecraft/client/gui/GuiGraphics;IILnet/minecraft/client/render/DeltaTracker;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;I)V}
+    * @mapping {@literal named renderHotbarItem Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderHotbarItem(Lnet/minecraft/client/gui/GuiGraphics;IILnet/minecraft/unmapped/C_lrgsdfwv;Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/item/ItemStack;I)V}
     */
-   private void renderHotbarItem(GuiGraphics graphics, int x, int y, DeltaTracker tracker, PlayerEntity player, ItemStack stack, int seed) {
+   private void renderHotbarItem(GuiGraphics graphics, int x, int y, C_lrgsdfwv arg2, PlayerEntity player, ItemStack stack, int seed) {
       if (!stack.isEmpty()) {
-         float f = (float)stack.getCooldown() - tracker.m_ixtdjbfz(false);
+         float f = (float)stack.getCooldown() - arg2.m_ixtdjbfz(false);
          if (f > 0.0F) {
             float g = 1.0F + f / 5.0F;
             graphics.getMatrices().push();
@@ -1831,12 +1831,12 @@
 
    /**
     * @mapping {@literal hashed m_koznghsj Lnet/minecraft/unmapped/C_nepwsmgw;m_koznghsj(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderAutosaveIndicator Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderAutosaveIndicator(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderAutosaveIndicator Lnet/minecraft/client/gui/hud/in_game/InGameHud;renderAutosaveIndicator(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   public void renderAutosaveIndicator(GuiGraphics graphics, DeltaTracker tracker) {
+   public void renderAutosaveIndicator(GuiGraphics graphics, C_lrgsdfwv arg2) {
       if (this.client.options.getAutosaveIndicator().get() && (this.autosaveIndicatorAlpha > 0.0F || this.lastAutosaveIndicatorAlpha > 0.0F)) {
          int i = MathHelper.floor(
-            255.0F * MathHelper.clamp(MathHelper.lerp(tracker.m_kgixoaxb(), this.lastAutosaveIndicatorAlpha, this.autosaveIndicatorAlpha), 0.0F, 1.0F)
+            255.0F * MathHelper.clamp(MathHelper.lerp(arg2.m_kgixoaxb(), this.lastAutosaveIndicatorAlpha, this.autosaveIndicatorAlpha), 0.0F, 1.0F)
          );
          if (i > 8) {
             TextRenderer lv = this.getTextRenderer();
diff -bur namedTargetSrc/net/minecraft/client/gui/RenderList.java namedSrc/net/minecraft/client/gui/RenderList.java
--- namedTargetSrc/net/minecraft/client/gui/RenderList.java	2024-07-03 03:34:46.834036017 +0000
+++ namedSrc/net/minecraft/client/gui/RenderList.java	2024-07-03 03:33:31.553977020 +0000
@@ -5,7 +5,7 @@
 import java.util.function.BooleanSupplier;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.client.render.DeltaTracker;
+import net.minecraft.unmapped.C_lrgsdfwv;
 
 /**
  * @mapping {@literal hashed net/minecraft/unmapped/C_nihbhmxv}
@@ -38,30 +38,30 @@
     * @mapping {@literal named add Lnet/minecraft/client/gui/RenderList;add(Lnet/minecraft/client/gui/RenderList;Ljava/util/function/BooleanSupplier;)Lnet/minecraft/client/gui/RenderList;}
     */
    public RenderList add(RenderList subList, BooleanSupplier renderCondition) {
-      return this.add((graphics, tracker) -> {
+      return this.add((graphics, arg3) -> {
          if (renderCondition.getAsBoolean()) {
-            subList.renderLayers(graphics, tracker);
+            subList.renderLayers(graphics, arg3);
          }
       });
    }
 
    /**
     * @mapping {@literal hashed m_odhxuxlp Lnet/minecraft/unmapped/C_nihbhmxv;m_odhxuxlp(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named render Lnet/minecraft/client/gui/RenderList;render(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named render Lnet/minecraft/client/gui/RenderList;render(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   public void render(GuiGraphics graphics, DeltaTracker tracker) {
+   public void render(GuiGraphics graphics, C_lrgsdfwv arg2) {
       graphics.getMatrices().push();
-      this.renderLayers(graphics, tracker);
+      this.renderLayers(graphics, arg2);
       graphics.getMatrices().pop();
    }
 
    /**
     * @mapping {@literal hashed m_fyitalyz Lnet/minecraft/unmapped/C_nihbhmxv;m_fyitalyz(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderLayers Lnet/minecraft/client/gui/RenderList;renderLayers(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderLayers Lnet/minecraft/client/gui/RenderList;renderLayers(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   private void renderLayers(GuiGraphics graphics, DeltaTracker tracker) {
+   private void renderLayers(GuiGraphics graphics, C_lrgsdfwv arg2) {
       for (RenderList.Layer lv : this.layers) {
-         lv.render(graphics, tracker);
+         lv.render(graphics, arg2);
          graphics.getMatrices().translate(0.0F, 0.0F, 200.0F);
       }
    }
@@ -74,8 +74,8 @@
    public interface Layer {
       /**
        * @mapping {@literal hashed render Lnet/minecraft/unmapped/C_nihbhmxv$C_lkrghfli;render(Lnet/minecraft/unmapped/C_sedilmty;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-       * @mapping {@literal named render Lnet/minecraft/client/gui/RenderList$Layer;render(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/render/DeltaTracker;)V}
+       * @mapping {@literal named render Lnet/minecraft/client/gui/RenderList$Layer;render(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
        */
-      void render(GuiGraphics graphics, DeltaTracker tracker);
+      void render(GuiGraphics graphics, C_lrgsdfwv arg2);
    }
 }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/DeathScreen.java namedSrc/net/minecraft/client/gui/screen/DeathScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/DeathScreen.java	2024-07-03 03:34:47.022036170 +0000
+++ namedSrc/net/minecraft/client/gui/screen/DeathScreen.java	2024-07-03 03:33:31.765977218 +0000
@@ -11,6 +11,7 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_yfulyots;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -137,7 +138,7 @@
          this.client.world.disconnect();
       }
 
-      this.client.disconnect(new GenericMessageScreen(Text.translatable("menu.savingLevel")));
+      this.client.disconnect(new C_yfulyots(Text.translatable("menu.savingLevel")));
       this.client.setScreen(new TitleScreen());
    }
 
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/GameMenuScreen.java namedSrc/net/minecraft/client/gui/screen/GameMenuScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/GameMenuScreen.java	2024-07-03 03:34:46.922036088 +0000
+++ namedSrc/net/minecraft/client/gui/screen/GameMenuScreen.java	2024-07-03 03:33:31.649977110 +0000
@@ -8,7 +8,6 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.advancement.AdvancementsScreen;
 import net.minecraft.client.gui.screen.multiplayer.SelectServerScreen;
-import net.minecraft.client.gui.screen.multiplayer.ServerLinksScreen;
 import net.minecraft.client.gui.screen.multiplayer.SocialInteractionsScreen;
 import net.minecraft.client.gui.screen.option.OptionsScreen;
 import net.minecraft.client.gui.screen.realms.RealmsMainScreen;
@@ -20,7 +19,9 @@
 import net.minecraft.client.network.ServerInfo;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_miigerkk;
 import net.minecraft.unmapped.C_ouodvkzu;
+import net.minecraft.unmapped.C_yfulyots;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.UrlConstants;
 import org.jetbrains.annotations.Nullable;
@@ -87,15 +88,13 @@
     */
    private static final Text REPORT_BUGS = Text.translatable("menu.reportBugs");
    /**
-    * @mapping {@literal hashed f_wqcewayi Lnet/minecraft/unmapped/C_gxawvqxt;f_wqcewayi:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named FEEDBACK Lnet/minecraft/client/gui/screen/GameMenuScreen;FEEDBACK:Lnet/minecraft/text/Text;}
+    * Mapping not found
     */
-   private static final Text FEEDBACK = Text.translatable("menu.feedback");
+   private static final Text f_wqcewayi = Text.translatable("menu.feedback");
    /**
-    * @mapping {@literal hashed f_jqicrmms Lnet/minecraft/unmapped/C_gxawvqxt;f_jqicrmms:Lnet/minecraft/unmapped/C_rdaqiwdt;}
-    * @mapping {@literal named SERVER_LINKS Lnet/minecraft/client/gui/screen/GameMenuScreen;SERVER_LINKS:Lnet/minecraft/text/Text;}
+    * Mapping not found
     */
-   private static final Text SERVER_LINKS = Text.translatable("menu.server_links");
+   private static final Text f_jqicrmms = Text.translatable("menu.server_links");
    /**
     * @mapping {@literal hashed f_vjmldoku Lnet/minecraft/unmapped/C_gxawvqxt;f_vjmldoku:Lnet/minecraft/unmapped/C_rdaqiwdt;}
     * @mapping {@literal named OPTIONS Lnet/minecraft/client/gui/screen/GameMenuScreen;OPTIONS:Lnet/minecraft/text/Text;}
@@ -190,8 +189,8 @@
       if (lv3.m_akdguovu()) {
          m_iaamtvkr(this, lv2);
       } else {
-         lv2.add(this.createButton(FEEDBACK, () -> new GameMenuScreen.C_srkumfch(this)));
-         lv2.add(this.createButton(SERVER_LINKS, () -> new ServerLinksScreen(this, lv3)));
+         lv2.add(this.createButton(f_wqcewayi, () -> new GameMenuScreen.C_srkumfch(this)));
+         lv2.add(this.createButton(f_jqicrmms, () -> new C_miigerkk(this, lv3)));
       }
 
       lv2.add(this.createButton(OPTIONS, () -> new OptionsScreen(this, this.client.options)));
@@ -234,7 +233,7 @@
       ServerInfo lv = this.client.getCurrentServerEntry();
       this.client.world.disconnect();
       if (bl) {
-         this.client.disconnect(new GenericMessageScreen(SAVING_WORLD));
+         this.client.disconnect(new C_yfulyots(SAVING_WORLD));
       } else {
          this.client.disconnect();
       }
Only in namedTargetSrc/net/minecraft/client/gui/screen: GenericMessageScreen.java
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java	2024-07-03 03:34:46.802035990 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/AbstractSignEditScreen.java	2024-07-03 03:33:31.509976978 +0000
@@ -5,10 +5,10 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.WoodType;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.block.entity.SignText;
 import net.minecraft.block.sign.AbstractSignBlock;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.button.ButtonWidget;
@@ -51,9 +51,9 @@
    private final boolean fromFront;
    /**
     * @mapping {@literal hashed f_xlaqfmub Lnet/minecraft/unmapped/C_dqqnwcwi;f_xlaqfmub:Lnet/minecraft/unmapped/C_xlaykyai;}
-    * @mapping {@literal named signType Lnet/minecraft/client/gui/screen/ingame/AbstractSignEditScreen;signType:Lnet/minecraft/block/WoodType;}
+    * @mapping {@literal named signType Lnet/minecraft/client/gui/screen/ingame/AbstractSignEditScreen;signType:Lnet/minecraft/block/sign/SignType;}
     */
-   protected final WoodType signType;
+   protected final SignType signType;
    /**
     * @mapping {@literal hashed f_ojnprmbf Lnet/minecraft/unmapped/C_dqqnwcwi;f_ojnprmbf:I}
     * @mapping {@literal named ticks Lnet/minecraft/client/gui/screen/ingame/AbstractSignEditScreen;ticks:I}
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-07-03 03:34:46.874036049 +0000
+++ namedSrc/net/minecraft/client/gui/screen/ingame/EnchantmentScreen.java	2024-07-03 03:33:31.597977060 +0000
@@ -277,7 +277,9 @@
             int o = l + 1;
             if (this.isPointWithinBounds(60, 14 + 19 * l, 108, 17, (double)mouseX, (double)mouseY) && m > 0 && n >= 0 && optional != null) {
                List<Text> list = Lists.<Text>newArrayList();
-               list.add(Text.translatable("container.enchant.clue", Enchantment.m_zfqdifee((Holder<Enchantment>)optional.get(), n)).formatted(Formatting.WHITE));
+               list.add(
+                  Text.translatable("container.enchant.clue", Enchantment.getFullName((Holder<Enchantment>)optional.get(), n)).formatted(Formatting.WHITE)
+               );
                if (!bl) {
                   list.add(CommonTexts.EMPTY);
                   if (this.client.player.experienceLevel < m) {
Only in namedTargetSrc/net/minecraft/client/gui/screen/multiplayer: ServerLinksScreen.java
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-07-03 03:34:46.814036000 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/CreateWorldScreen.java	2024-07-03 03:33:31.525976992 +0000
@@ -29,7 +29,6 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.Selectable;
 import net.minecraft.client.gui.screen.ConfirmScreen;
-import net.minecraft.client.gui.screen.GenericMessageScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ScreenArea;
 import net.minecraft.client.gui.screen.pack.PackScreen;
@@ -66,6 +65,7 @@
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_yfulyots;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -328,7 +328,7 @@
     * @mapping {@literal named showMessage Lnet/minecraft/client/gui/screen/world/CreateWorldScreen;showMessage(Lnet/minecraft/client/MinecraftClient;Lnet/minecraft/text/Text;)V}
     */
    private static void showMessage(MinecraftClient client, Text message) {
-      client.forceSetScreen(new GenericMessageScreen(message));
+      client.forceSetScreen(new C_yfulyots(message));
    }
 
    /**
@@ -538,7 +538,7 @@
     * @mapping {@literal named validateDataPacks Lnet/minecraft/client/gui/screen/world/CreateWorldScreen;validateDataPacks(Lnet/minecraft/resource/pack/PackManager;Lnet/minecraft/server/world/FeatureAndDataSettings;Ljava/util/function/Consumer;)V}
     */
    private void validateDataPacks(PackManager manager, FeatureAndDataSettings settings, Consumer<FeatureAndDataSettings> consumer) {
-      this.client.forceSetScreen(new GenericMessageScreen(Text.translatable("dataPack.validation.working")));
+      this.client.forceSetScreen(new C_yfulyots(Text.translatable("dataPack.validation.working")));
       WorldLoader.InitConfig lv = createDefaultLoadConfig(manager, settings);
       WorldLoader.<CreateWorldScreen.WorldCreationSettings, WorldCreationContext>load(
             lv,
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/world/EditWorldScreen.java namedSrc/net/minecraft/client/gui/screen/world/EditWorldScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/world/EditWorldScreen.java	2024-07-03 03:34:47.042036187 +0000
+++ namedSrc/net/minecraft/client/gui/screen/world/EditWorldScreen.java	2024-07-03 03:33:31.785977237 +0000
@@ -21,10 +21,10 @@
 import net.minecraft.client.gui.widget.layout.LinearLayoutWidget;
 import net.minecraft.client.gui.widget.text.TextWidget;
 import net.minecraft.client.toast.SystemToast;
-import net.minecraft.nbt.NbtCrashException;
 import net.minecraft.nbt.NbtException;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_gjgvzuad;
 import net.minecraft.util.ChatUtil;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Formatting;
@@ -230,7 +230,7 @@
    private void commit(String name) {
       try {
          this.storageSession.save(name);
-      } catch (NbtException | NbtCrashException | IOException var3) {
+      } catch (NbtException | C_gjgvzuad | IOException var3) {
          LOGGER.error("Failed to access world '{}'", this.storageSession.getDirectoryName(), var3);
          SystemToast.addWorldAccessFailureToast(this.client, this.storageSession.getDirectoryName());
       }
diff -bur namedTargetSrc/net/minecraft/client/gui/screen/WorldRecoveryScreen.java namedSrc/net/minecraft/client/gui/screen/WorldRecoveryScreen.java
--- namedTargetSrc/net/minecraft/client/gui/screen/WorldRecoveryScreen.java	2024-07-03 03:34:46.850036029 +0000
+++ namedSrc/net/minecraft/client/gui/screen/WorldRecoveryScreen.java	2024-07-03 03:33:31.569977034 +0000
@@ -16,11 +16,12 @@
 import net.minecraft.client.gui.widget.list.world.WorldEntryListWidget;
 import net.minecraft.client.gui.widget.text.MultilineTextWidget;
 import net.minecraft.client.gui.widget.text.TextWidget;
-import net.minecraft.nbt.NbtCrashException;
 import net.minecraft.nbt.NbtException;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_gjgvzuad;
+import net.minecraft.unmapped.C_yfulyots;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.UrlConstants;
 import net.minecraft.world.storage.WorldSaveStorage;
@@ -147,7 +148,7 @@
       Exception exception = this.m_dupeoioq(this.f_bhznuxmh, false);
       Exception exception2 = this.m_dupeoioq(this.f_bhznuxmh, true);
       if (exception != null && exception2 == null) {
-         client.forceSetScreen(new GenericMessageScreen(Text.translatable("recover_world.restoring")));
+         client.forceSetScreen(new C_yfulyots(Text.translatable("recover_world.restoring")));
          EditWorldScreen.createBackup(this.f_bhznuxmh);
          if (this.f_bhznuxmh.m_pucxqtif()) {
             client.setScreen(new ConfirmScreen(this.f_bsgnpxxl, DONE_TITLE, DONE_SUCCESS, CommonTexts.CONTINUE, CommonTexts.BACK));
@@ -181,7 +182,7 @@
             lv.append(ISSUE_NONE);
          } else if (exception instanceof FileNotFoundException) {
             lv.append(ISSUE_MISSING_FILE);
-         } else if (exception instanceof NbtCrashException) {
+         } else if (exception instanceof C_gjgvzuad) {
             lv.append(Text.literal(exception.getCause().toString()).formatted(Formatting.RED));
          } else {
             lv.append(Text.literal(exception.toString()).formatted(Formatting.RED));
@@ -204,7 +205,7 @@
          }
 
          return null;
-      } catch (NbtException | NbtCrashException | IOException var4) {
+      } catch (NbtException | C_gjgvzuad | IOException var4) {
          return var4;
       }
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-07-03 03:34:46.826036010 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/EntryListWidget.java	2024-07-03 03:33:31.541977008 +0000
@@ -111,8 +111,8 @@
     * @mapping {@literal hashed <init> Lnet/minecraft/unmapped/C_nmdfcqgq;<init>(Lnet/minecraft/unmapped/C_ayfeobid;IIII)V}
     * @mapping {@literal named <init> Lnet/minecraft/client/gui/widget/list/EntryListWidget;<init>(Lnet/minecraft/client/MinecraftClient;IIII)V}
     */
-   public EntryListWidget(MinecraftClient client, int width, int height, int y, int itemHeight) {
-      super(0, y, width, height, CommonTexts.EMPTY);
+   public EntryListWidget(MinecraftClient client, int y, int width, int height, int itemHeight) {
+      super(0, height, y, width, CommonTexts.EMPTY);
       this.client = client;
       this.itemHeight = itemHeight;
    }
diff -bur namedTargetSrc/net/minecraft/client/gui/widget/list/world/WorldEntryListWidget.java namedSrc/net/minecraft/client/gui/widget/list/world/WorldEntryListWidget.java
--- namedTargetSrc/net/minecraft/client/gui/widget/list/world/WorldEntryListWidget.java	2024-07-03 03:34:46.970036127 +0000
+++ namedSrc/net/minecraft/client/gui/widget/list/world/WorldEntryListWidget.java	2024-07-03 03:33:31.705977162 +0000
@@ -31,7 +31,6 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screen.ConfirmScreen;
 import net.minecraft.client.gui.screen.FatalErrorScreen;
-import net.minecraft.client.gui.screen.GenericMessageScreen;
 import net.minecraft.client.gui.screen.LoadingDisplay;
 import net.minecraft.client.gui.screen.NoticeScreen;
 import net.minecraft.client.gui.screen.ProgressScreen;
@@ -47,11 +46,12 @@
 import net.minecraft.client.texture.FaviconTexture;
 import net.minecraft.client.toast.SystemToast;
 import net.minecraft.client.world.WorldCreationContext;
-import net.minecraft.nbt.NbtCrashException;
 import net.minecraft.nbt.NbtException;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.text.CommonTexts;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_gjgvzuad;
+import net.minecraft.unmapped.C_yfulyots;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -805,7 +805,7 @@
 
                this.client.setScreen(this.parent);
             });
-         } catch (NbtException | NbtCrashException | IOException var5) {
+         } catch (NbtException | C_gjgvzuad | IOException var5) {
             lv.m_ansyrdez();
             SystemToast.addWorldAccessFailureToast(this.client, string);
             WorldEntryListWidget.LOGGER.error("Failed to load world data {}", string, var5);
@@ -865,7 +865,7 @@
        * @mapping {@literal named openReadingWorldScreen Lnet/minecraft/client/gui/widget/list/world/WorldEntryListWidget$WorldEntry;openReadingWorldScreen()V}
        */
       private void openReadingWorldScreen() {
-         this.client.forceSetScreen(new GenericMessageScreen(Text.translatable("selectWorld.data_read")));
+         this.client.forceSetScreen(new C_yfulyots(Text.translatable("selectWorld.data_read")));
       }
 
       /**
diff -bur namedTargetSrc/net/minecraft/client/MinecraftClient.java namedSrc/net/minecraft/client/MinecraftClient.java
--- namedTargetSrc/net/minecraft/client/MinecraftClient.java	2024-07-03 03:34:46.850036029 +0000
+++ namedSrc/net/minecraft/client/MinecraftClient.java	2024-07-03 03:33:31.577977042 +0000
@@ -83,7 +83,6 @@
 import net.minecraft.client.gui.screen.DeathScreen;
 import net.minecraft.client.gui.screen.DownloadingTerrainScreen;
 import net.minecraft.client.gui.screen.GameMenuScreen;
-import net.minecraft.client.gui.screen.GenericMessageScreen;
 import net.minecraft.client.gui.screen.OutOfMemoryScreen;
 import net.minecraft.client.gui.screen.Overlay;
 import net.minecraft.client.gui.screen.ProgressScreen;
@@ -119,7 +118,6 @@
 import net.minecraft.client.realms.RealmsDataFetchers;
 import net.minecraft.client.render.BackgroundRenderer;
 import net.minecraft.client.render.BufferBuilderStorage;
-import net.minecraft.client.render.DeltaTracker;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.render.block.BlockModels;
@@ -210,6 +208,8 @@
 import net.minecraft.text.component.KeyBindTextResolver;
 import net.minecraft.unmapped.C_ccpekhhb;
 import net.minecraft.unmapped.C_fpcijbbg;
+import net.minecraft.unmapped.C_lrgsdfwv;
+import net.minecraft.unmapped.C_yfulyots;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.FileNameUtil;
 import net.minecraft.util.Formatting;
@@ -266,7 +266,7 @@
  * The Minecraft client instance may be obtained using {@link MinecraftClient#getInstance()}.
  * 
  * <p>Rendering on a Minecraft client is split into several facilities.
- * The primary entrypoint for rendering is {@link net.minecraft.client.render.GameRenderer#render(net.minecraft.client.render.DeltaTracker, boolean)}.
+ * The primary entrypoint for rendering is {@link net.minecraft.client.render.GameRenderer#render(net.minecraft.unmapped.C_lrgsdfwv, boolean)}.
  * <div class="quilt"><table border=1>
  * <caption>Rendering facilities</caption>
  * <tr>
@@ -402,9 +402,9 @@
    private final Window window;
    /**
     * @mapping {@literal hashed f_yjhobbqr Lnet/minecraft/unmapped/C_ayfeobid;f_yjhobbqr:Lnet/minecraft/unmapped/C_lrgsdfwv$C_xwflveoj;}
-    * @mapping {@literal named renderTickCounter Lnet/minecraft/client/MinecraftClient;renderTickCounter:Lnet/minecraft/client/render/DeltaTracker$C_xwflveoj;}
+    * @mapping {@literal named renderTickCounter Lnet/minecraft/client/MinecraftClient;renderTickCounter:Lnet/minecraft/unmapped/C_lrgsdfwv$C_xwflveoj;}
     */
-   private final DeltaTracker.C_xwflveoj renderTickCounter = new DeltaTracker.C_xwflveoj(20.0F, 0L, this::m_kldqgccz);
+   private final C_lrgsdfwv.C_xwflveoj renderTickCounter = new C_lrgsdfwv.C_xwflveoj(20.0F, 0L, this::m_kldqgccz);
    /**
     * @mapping {@literal hashed f_iuqlwerq Lnet/minecraft/unmapped/C_ayfeobid;f_iuqlwerq:Lnet/minecraft/unmapped/C_dfmwjguw;}
     * @mapping {@literal named bufferBuilders Lnet/minecraft/client/MinecraftClient;bufferBuilders:Lnet/minecraft/client/render/BufferBuilderStorage;}
@@ -1211,7 +1211,7 @@
       this.chatListener.setMessageDelay(this.options.getChatDelay().get());
       this.chatReportingContext = AbuseReportContext.create(AbuseReportEnvironment.createLocal(), this.userApiService);
       SplashOverlay.init(this);
-      this.setScreen(new GenericMessageScreen(Text.translatable("gui.loadingMinecraft")));
+      this.setScreen(new C_yfulyots(Text.translatable("gui.loadingMinecraft")));
       List<ResourcePack> list = this.resourcePackManager.createResourcePacks();
       this.resourceReloadLogger.reload(ResourceReloadLogger.ReloadReason.INITIAL, list);
       ResourceReload lv7 = this.resourceManager.reload(Util.getMainWorkerExecutor(), this, COMPLETED_UNIT_FUTURE, list);
@@ -1969,8 +1969,8 @@
       this.paused = this.isIntegratedServerRunning()
          && (this.currentScreen != null && this.currentScreen.isPauseScreen() || this.overlay != null && this.overlay.pausesGame())
          && !this.server.isRemote();
-      this.renderTickCounter.setPaused(this.paused);
-      this.renderTickCounter.setFrozen(!this.m_hviqgiga());
+      this.renderTickCounter.m_dnvmgdut(this.paused);
+      this.renderTickCounter.m_dhhbrjet(!this.m_hviqgiga());
       long m = Util.getMeasuringTimeNano();
       long n = m - this.lastMetricsSampleTime;
       if (bl3) {
@@ -2129,7 +2129,7 @@
             this.server.stop(true);
          }
 
-         this.disconnect(new GenericMessageScreen(Text.translatable("menu.savingLevel")));
+         this.disconnect(new C_yfulyots(Text.translatable("menu.savingLevel")));
       } catch (Throwable var2) {
       }
 
@@ -3401,7 +3401,7 @@
          "Window size",
          (Supplier<String>)(() -> client != null ? client.window.getFramebufferWidth() + "x" + client.window.getFramebufferHeight() : "<not initialized>")
       );
-      systemDetails.addSection("GFLW Platform", Window::getPlatform);
+      systemDetails.addSection("GFLW Platform", Window::m_dxtquvzd);
       systemDetails.addSection("GL Caps", RenderSystem::getCapsString);
       systemDetails.addSection(
          "GL debug messages", (Supplier<String>)(() -> GlDebug.isDebugMessageEnabled() ? String.join("\n", GlDebug.collectDebugMessages()) : "<disabled>")
@@ -3769,7 +3769,7 @@
    /**
     * Mapping not found
     */
-   public DeltaTracker m_gvlptpwr() {
+   public C_lrgsdfwv m_gvlptpwr() {
       return this.renderTickCounter;
    }
 
@@ -3926,7 +3926,7 @@
             this.player.prevYaw = this.player.getYaw();
             this.player.prevPitch = this.player.getPitch();
             lv.beginWrite(true);
-            this.gameRenderer.renderWorld(DeltaTracker.f_kodrqmus);
+            this.gameRenderer.renderWorld(C_lrgsdfwv.f_kodrqmus);
 
             try {
                Thread.sleep(10L);
diff -bur namedTargetSrc/net/minecraft/client/realms/FileDownload.java namedSrc/net/minecraft/client/realms/FileDownload.java
--- namedTargetSrc/net/minecraft/client/realms/FileDownload.java	2024-07-03 03:34:46.786035976 +0000
+++ namedSrc/net/minecraft/client/realms/FileDownload.java	2024-07-03 03:33:31.481976952 +0000
@@ -21,8 +21,8 @@
 import net.minecraft.client.gui.screen.realms.RealmsDownloadLatestWorldScreen;
 import net.minecraft.client.realms.dto.WorldDownload;
 import net.minecraft.client.realms.exception.RealmsDefaultUncaughtExceptionHandler;
-import net.minecraft.nbt.NbtCrashException;
 import net.minecraft.nbt.NbtException;
+import net.minecraft.unmapped.C_gjgvzuad;
 import net.minecraft.util.path.InvalidSymlinkException;
 import net.minecraft.world.storage.WorldSaveStorage;
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
@@ -407,7 +407,7 @@
 
          try (WorldSaveStorage.Session lv6 = storage.createSession(string4)) {
             lv6.m_rsddwmuj(string4);
-         } catch (NbtException | NbtCrashException | IOException var39) {
+         } catch (NbtException | C_gjgvzuad | IOException var39) {
             LOGGER.error("Failed to modify unpacked realms level {}", string4, var39);
          } catch (InvalidSymlinkException var40) {
             LOGGER.warn("{}", var40.getMessage());
diff -bur namedTargetSrc/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.java namedSrc/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.java
--- namedTargetSrc/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.java	2024-07-03 03:34:46.898036069 +0000
+++ namedSrc/net/minecraft/client/realms/task/RealmsGetServerDetailsTask.java	2024-07-03 03:33:31.621977083 +0000
@@ -12,7 +12,6 @@
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.DialogScreen;
-import net.minecraft.client.gui.screen.GenericMessageScreen;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.realms.RealmsBrokenWorldScreen;
 import net.minecraft.client.gui.screen.realms.RealmsGenericErrorScreen;
@@ -26,6 +25,7 @@
 import net.minecraft.client.realms.exception.RetryCallException;
 import net.minecraft.client.resource.RemoteResourcePackProvider;
 import net.minecraft.text.Text;
+import net.minecraft.unmapped.C_yfulyots;
 import net.minecraft.unmapped.C_yyqttyjf;
 import org.slf4j.Logger;
 
@@ -170,7 +170,7 @@
    private DialogScreen m_zvypmejf(RealmsServerAddress arg, UUID uuid, Function<RealmsServerAddress, Screen> function) {
       Text lv = Text.translatable("mco.configure.world.resourcepack.question");
       return C_yyqttyjf.m_ghrkomsd(this.lastScreen, lv, arg2 -> {
-         setScreen(new GenericMessageScreen(APPLYING_PACK));
+         setScreen(new C_yfulyots(APPLYING_PACK));
          this.downloadResourcePack(arg, uuid).thenRun(() -> setScreen((Screen)function.apply(arg))).exceptionally(throwable -> {
             MinecraftClient.getInstance().getRemoteResourcePackProvider().m_akhfcswe();
             LOGGER.error("Failed to download resource pack from {}", arg, throwable);
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java	2024-07-03 03:34:46.962036121 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/DecoratedPotBlockEntityRenderer.java	2024-07-03 03:33:31.693977150 +0000
@@ -164,7 +164,7 @@
     */
    private static Material m_qcbcrkkn(Optional<Item> optional) {
       if (optional.isPresent()) {
-         Material lv = TexturedRenderLayers.getDecoratedPotPatternTextureId(DecoratedPotPatterns.getPattern((Item)optional.get()));
+         Material lv = TexturedRenderLayers.getDecoratedPotPatternTextureId(DecoratedPotPatterns.m_xrykbbna((Item)optional.get()));
          if (lv != null) {
             return lv;
          }
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.java	2024-07-03 03:34:46.966036124 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer.java	2024-07-03 03:33:31.697977155 +0000
@@ -6,10 +6,10 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.WoodType;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.block.sign.AbstractSignBlock;
 import net.minecraft.block.sign.CeilingHangingSignBlock;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.client.model.Model;
 import net.minecraft.client.model.ModelData;
 import net.minecraft.client.model.ModelPart;
@@ -92,14 +92,14 @@
     * @mapping {@literal hashed f_ncuabxhv Lnet/minecraft/unmapped/C_zcgkklbo;f_ncuabxhv:Ljava/util/Map;}
     * @mapping {@literal named models Lnet/minecraft/client/render/block/entity/HangingSignBlockEntityRenderer;models:Ljava/util/Map;}
     */
-   private final Map<WoodType, HangingSignBlockEntityRenderer.HangingSignModel> models;
+   private final Map<SignType, HangingSignBlockEntityRenderer.HangingSignModel> models;
 
    /**
     * Mapping not found
     */
    public HangingSignBlockEntityRenderer(BlockEntityRendererFactory.Context arg) {
       super(arg);
-      this.models = (Map<WoodType, HangingSignBlockEntityRenderer.HangingSignModel>)WoodType.stream()
+      this.models = (Map<SignType, HangingSignBlockEntityRenderer.HangingSignModel>)SignType.stream()
          .collect(
             ImmutableMap.toImmutableMap(
                signType -> signType,
@@ -132,7 +132,7 @@
    public void render(SignBlockEntity arg, float f, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, int j) {
       BlockState lv = arg.getCachedState();
       AbstractSignBlock lv2 = (AbstractSignBlock)lv.getBlock();
-      WoodType lv3 = AbstractSignBlock.getSignType(lv2);
+      SignType lv3 = AbstractSignBlock.getSignType(lv2);
       HangingSignBlockEntityRenderer.HangingSignModel lv4 = (HangingSignBlockEntityRenderer.HangingSignModel)this.models.get(lv3);
       lv4.update(lv);
       this.render(arg, matrices, vertexConsumers, i, j, lv, lv2, lv3, lv4);
@@ -161,7 +161,7 @@
     * Mapping not found
     */
    @Override
-   Material getSignTexture(WoodType signType) {
+   Material getSignTexture(SignType signType) {
       return TexturedRenderLayers.getHangingSignTextureId(signType);
    }

@github-actions
Copy link

Choose a reason for hiding this comment

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

View the diff here (3/3): 
diff -bur namedTargetSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java namedSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java
--- namedTargetSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java	2024-07-03 03:34:47.026036173 +0000
+++ namedSrc/net/minecraft/client/render/block/entity/SignBlockEntityRenderer.java	2024-07-03 03:33:31.769977222 +0000
@@ -7,11 +7,11 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.WoodType;
 import net.minecraft.block.entity.SignBlockEntity;
 import net.minecraft.block.entity.SignText;
 import net.minecraft.block.sign.AbstractSignBlock;
 import net.minecraft.block.sign.SignBlock;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.model.Model;
@@ -73,7 +73,7 @@
     * @mapping {@literal hashed f_zdzdnbbj Lnet/minecraft/unmapped/C_dqmzvcln;f_zdzdnbbj:Ljava/util/Map;}
     * @mapping {@literal named typeToModel Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;typeToModel:Ljava/util/Map;}
     */
-   private final Map<WoodType, SignBlockEntityRenderer.SignModel> typeToModel;
+   private final Map<SignType, SignBlockEntityRenderer.SignModel> typeToModel;
    /**
     * @mapping {@literal hashed f_zqsxfxbd Lnet/minecraft/unmapped/C_dqmzvcln;f_zqsxfxbd:Lnet/minecraft/unmapped/C_mavozmpp;}
     * @mapping {@literal named textRenderer Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;textRenderer:Lnet/minecraft/client/font/TextRenderer;}
@@ -85,7 +85,7 @@
     * @mapping {@literal named <init> Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;<init>(Lnet/minecraft/client/render/block/entity/BlockEntityRendererFactory$Context;)V}
     */
    public SignBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) {
-      this.typeToModel = (Map<WoodType, SignBlockEntityRenderer.SignModel>)WoodType.stream()
+      this.typeToModel = (Map<SignType, SignBlockEntityRenderer.SignModel>)SignType.stream()
          .collect(
             ImmutableMap.toImmutableMap(
                signType -> signType, signType -> new SignBlockEntityRenderer.SignModel(ctx.getLayerModelPart(EntityModelLayers.createSign(signType)))
@@ -101,7 +101,7 @@
    public void render(SignBlockEntity arg, float f, MatrixStack matrices, VertexConsumerProvider vertexConsumers, int i, int j) {
       BlockState lv = arg.getCachedState();
       AbstractSignBlock lv2 = (AbstractSignBlock)lv.getBlock();
-      WoodType lv3 = AbstractSignBlock.getSignType(lv2);
+      SignType lv3 = AbstractSignBlock.getSignType(lv2);
       SignBlockEntityRenderer.SignModel lv4 = (SignBlockEntityRenderer.SignModel)this.typeToModel.get(lv3);
       lv4.stick.visible = lv.getBlock() instanceof SignBlock;
       this.render(arg, matrices, vertexConsumers, i, j, lv, lv2, lv3, lv4);
@@ -125,7 +125,7 @@
 
    /**
     * @mapping {@literal hashed m_rbmzplgv Lnet/minecraft/unmapped/C_dqmzvcln;m_rbmzplgv(Lnet/minecraft/unmapped/C_axouvzlg;Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;IILnet/minecraft/unmapped/C_txtbiemp;Lnet/minecraft/unmapped/C_siepybep;Lnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_lzwtpfka;)V}
-    * @mapping {@literal named render Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;render(Lnet/minecraft/block/entity/SignBlockEntity;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/block/BlockState;Lnet/minecraft/block/sign/AbstractSignBlock;Lnet/minecraft/block/WoodType;Lnet/minecraft/client/model/Model;)V}
+    * @mapping {@literal named render Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;render(Lnet/minecraft/block/entity/SignBlockEntity;Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/block/BlockState;Lnet/minecraft/block/sign/AbstractSignBlock;Lnet/minecraft/block/sign/SignType;Lnet/minecraft/client/model/Model;)V}
     */
    void render(
       SignBlockEntity blockEntity,
@@ -135,7 +135,7 @@
       int overlay,
       BlockState state,
       AbstractSignBlock block,
-      WoodType type,
+      SignType type,
       Model model
    ) {
       matrices.push();
@@ -178,9 +178,9 @@
 
    /**
     * @mapping {@literal hashed m_ulkbkhst Lnet/minecraft/unmapped/C_dqmzvcln;m_ulkbkhst(Lnet/minecraft/unmapped/C_cnszsxvd;Lnet/minecraft/unmapped/C_igrgeffe;IILnet/minecraft/unmapped/C_xlaykyai;Lnet/minecraft/unmapped/C_lzwtpfka;)V}
-    * @mapping {@literal named renderModel Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;renderModel(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/block/WoodType;Lnet/minecraft/client/model/Model;)V}
+    * @mapping {@literal named renderModel Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;renderModel(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;IILnet/minecraft/block/sign/SignType;Lnet/minecraft/client/model/Model;)V}
     */
-   void renderModel(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, WoodType signType, Model model) {
+   void renderModel(MatrixStack matrices, VertexConsumerProvider vertexConsumers, int light, int overlay, SignType signType, Model model) {
       matrices.push();
       float f = this.getModelRenderScale();
       matrices.scale(f, -f, -f);
@@ -201,9 +201,9 @@
 
    /**
     * @mapping {@literal hashed m_huhacyeq Lnet/minecraft/unmapped/C_dqmzvcln;m_huhacyeq(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;}
-    * @mapping {@literal named getSignTexture Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;getSignTexture(Lnet/minecraft/block/WoodType;)Lnet/minecraft/client/resource/Material;}
+    * @mapping {@literal named getSignTexture Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;getSignTexture(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/resource/Material;}
     */
-   Material getSignTexture(WoodType signType) {
+   Material getSignTexture(SignType signType) {
       return TexturedRenderLayers.getSignTextureId(signType);
    }
 
@@ -309,9 +309,9 @@
 
    /**
     * @mapping {@literal hashed m_evwupjxx Lnet/minecraft/unmapped/C_dqmzvcln;m_evwupjxx(Lnet/minecraft/unmapped/C_qncyfzro;Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_dqmzvcln$C_keslmkli;}
-    * @mapping {@literal named createSignModel Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;createSignModel(Lnet/minecraft/client/render/entity/model/EntityModelLoader;Lnet/minecraft/block/WoodType;)Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer$SignModel;}
+    * @mapping {@literal named createSignModel Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer;createSignModel(Lnet/minecraft/client/render/entity/model/EntityModelLoader;Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/render/block/entity/SignBlockEntityRenderer$SignModel;}
     */
-   public static SignBlockEntityRenderer.SignModel createSignModel(EntityModelLoader entityModelLoader, WoodType type) {
+   public static SignBlockEntityRenderer.SignModel createSignModel(EntityModelLoader entityModelLoader, SignType type) {
       return new SignBlockEntityRenderer.SignModel(entityModelLoader.getModelPart(EntityModelLayers.createSign(type)));
    }
 
Only in namedTargetSrc/net/minecraft/client/render: DeltaTracker.java
diff -bur namedTargetSrc/net/minecraft/client/render/entity/EntityRenderers.java namedSrc/net/minecraft/client/render/entity/EntityRenderers.java
--- namedTargetSrc/net/minecraft/client/render/entity/EntityRenderers.java	2024-07-03 03:34:46.810035996 +0000
+++ namedSrc/net/minecraft/client/render/entity/EntityRenderers.java	2024-07-03 03:33:31.521976989 +0000
@@ -15,6 +15,7 @@
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.registry.Registries;
+import net.minecraft.unmapped.C_djwyalez;
 import org.slf4j.Logger;
 
 /**
@@ -168,7 +169,7 @@
       register(EntityType.ITEM, ItemEntityRenderer::new);
       register(EntityType.ITEM_DISPLAY, DisplayEntityRenderer.ItemDisplayEntityRenderer::new);
       register(EntityType.ITEM_FRAME, ItemFrameEntityRenderer::new);
-      register(EntityType.OMINOUS_ITEM_SPAWNER, OminousItemSpawnerEntityRenderer::new);
+      register(EntityType.OMINOUS_ITEM_SPAWNER, C_djwyalez::new);
       register(EntityType.LEASH_KNOT, LeashKnotEntityRenderer::new);
       register(EntityType.LIGHTNING_BOLT, LightningEntityRenderer::new);
       register(EntityType.LLAMA, ctx -> new LlamaEntityRenderer(ctx, EntityModelLayers.LLAMA));
@@ -243,8 +244,8 @@
       register(EntityType.ZOMBIE_VILLAGER, ZombieVillagerEntityRenderer::new);
       register(
          EntityType.ZOMBIFIED_PIGLIN,
-         ctx -> new PiglinEntityRenderer(
-               ctx, EntityModelLayers.ZOMBIFIED_PIGLIN, EntityModelLayers.ZOMBIFIED_PIGLIN_INNER_ARMOR, EntityModelLayers.ZOMBIFIED_PIGLIN_OUTER_ARMOR, true
+         arg -> new PiglinEntityRenderer(
+               arg, EntityModelLayers.ZOMBIFIED_PIGLIN, EntityModelLayers.ZOMBIFIED_PIGLIN_INNER_ARMOR, EntityModelLayers.ZOMBIFIED_PIGLIN_OUTER_ARMOR, true
             )
       );
    }
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java namedSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java	2024-07-03 03:34:46.882036056 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/EntityModelLayers.java	2024-07-03 03:33:31.609977072 +0000
@@ -5,7 +5,7 @@
 import java.util.stream.Stream;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.block.WoodType;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.entity.vehicle.BoatEntity;
 import net.minecraft.util.Identifier;
 
@@ -970,17 +970,17 @@
 
    /**
     * @mapping {@literal hashed m_wggqfugh Lnet/minecraft/unmapped/C_ikhmhinf;m_wggqfugh(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_rghfgwax;}
-    * @mapping {@literal named createSign Lnet/minecraft/client/render/entity/model/EntityModelLayers;createSign(Lnet/minecraft/block/WoodType;)Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
+    * @mapping {@literal named createSign Lnet/minecraft/client/render/entity/model/EntityModelLayers;createSign(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
     */
-   public static EntityModelLayer createSign(WoodType type) {
+   public static EntityModelLayer createSign(SignType type) {
       return create("sign/" + type.getName(), "main");
    }
 
    /**
     * @mapping {@literal hashed m_qkfhnizl Lnet/minecraft/unmapped/C_ikhmhinf;m_qkfhnizl(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_rghfgwax;}
-    * @mapping {@literal named createHangingSign Lnet/minecraft/client/render/entity/model/EntityModelLayers;createHangingSign(Lnet/minecraft/block/WoodType;)Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
+    * @mapping {@literal named createHangingSign Lnet/minecraft/client/render/entity/model/EntityModelLayers;createHangingSign(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/render/entity/model/EntityModelLayer;}
     */
-   public static EntityModelLayer createHangingSign(WoodType type) {
+   public static EntityModelLayer createHangingSign(SignType type) {
       return create("hanging_sign/" + type.getName(), "main");
    }
 
diff -bur namedTargetSrc/net/minecraft/client/render/entity/model/EntityModels.java namedSrc/net/minecraft/client/render/entity/model/EntityModels.java
--- namedTargetSrc/net/minecraft/client/render/entity/model/EntityModels.java	2024-07-03 03:34:46.926036092 +0000
+++ namedSrc/net/minecraft/client/render/entity/model/EntityModels.java	2024-07-03 03:33:31.653977113 +0000
@@ -7,7 +7,7 @@
 import java.util.stream.Collectors;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.block.WoodType;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.client.model.Dilation;
 import net.minecraft.client.model.TexturedModelData;
 import net.minecraft.client.render.block.entity.BannerBlockEntityRenderer;
@@ -263,9 +263,9 @@
       }
 
       TexturedModelData lv25 = SignBlockEntityRenderer.getTexturedModelData();
-      WoodType.stream().forEach(signType -> builder.put(EntityModelLayers.createSign(signType), lv25));
+      SignType.stream().forEach(signType -> builder.put(EntityModelLayers.createSign(signType), lv25));
       TexturedModelData lv26 = HangingSignBlockEntityRenderer.getTexturedModelData();
-      WoodType.stream().forEach(arg2 -> builder.put(EntityModelLayers.createHangingSign(arg2), lv26));
+      SignType.stream().forEach(arg2 -> builder.put(EntityModelLayers.createHangingSign(arg2), lv26));
       ImmutableMap<EntityModelLayer, TexturedModelData> immutableMap = builder.build();
       List<EntityModelLayer> list = (List<EntityModelLayer>)EntityModelLayers.getLayers()
          .filter(arg -> !immutableMap.containsKey(arg))
Only in namedTargetSrc/net/minecraft/client/render/entity: OminousItemSpawnerEntityRenderer.java
diff -bur namedTargetSrc/net/minecraft/client/render/GameRenderer.java namedSrc/net/minecraft/client/render/GameRenderer.java
--- namedTargetSrc/net/minecraft/client/render/GameRenderer.java	2024-07-03 03:34:46.846036026 +0000
+++ namedSrc/net/minecraft/client/render/GameRenderer.java	2024-07-03 03:33:31.565977031 +0000
@@ -58,6 +58,7 @@
 import net.minecraft.resource.ResourceReloader;
 import net.minecraft.resource.SinglePreparationResourceReloader;
 import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.unmapped.C_lrgsdfwv;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
 import net.minecraft.util.crash.CrashCallable;
@@ -1409,7 +1410,7 @@
       this.zoomY = zoomY;
       this.setBlockOutlineEnabled(false);
       this.setRenderHand(false);
-      this.renderWorld(DeltaTracker.f_oedhoyhd);
+      this.renderWorld(C_lrgsdfwv.f_oedhoyhd);
       this.zoom = 1.0F;
    }
 
@@ -1503,9 +1504,9 @@
 
    /**
     * @mapping {@literal hashed m_yxzmkufu Lnet/minecraft/unmapped/C_sktkdoun;m_yxzmkufu(Lnet/minecraft/unmapped/C_lrgsdfwv;Z)V}
-    * @mapping {@literal named render Lnet/minecraft/client/render/GameRenderer;render(Lnet/minecraft/client/render/DeltaTracker;Z)V}
+    * @mapping {@literal named render Lnet/minecraft/client/render/GameRenderer;render(Lnet/minecraft/unmapped/C_lrgsdfwv;Z)V}
     */
-   public void render(DeltaTracker tracker, boolean tick) {
+   public void render(C_lrgsdfwv arg, boolean tick) {
       if (!this.client.isWindowFocused()
          && this.client.options.pauseOnLostFocus
          && (!this.client.options.getTouchscreen().get() || !this.client.mouse.hasRightClicked())) {
@@ -1523,14 +1524,14 @@
          RenderSystem.viewport(0, 0, this.client.getWindow().getFramebufferWidth(), this.client.getWindow().getFramebufferHeight());
          if (bl2 && tick && this.client.world != null) {
             this.client.getProfiler().push("level");
-            this.renderWorld(tracker);
+            this.renderWorld(arg);
             this.updateWorldIcon();
             this.client.worldRenderer.drawEntityOutlinesFramebuffer();
             if (this.shader != null && this.shadersEnabled) {
                RenderSystem.disableBlend();
                RenderSystem.disableDepthTest();
                RenderSystem.resetTextureMatrix();
-               this.shader.render(tracker.m_ndzzsdqi());
+               this.shader.render(arg.m_ndzzsdqi());
             }
 
             this.client.getFramebuffer().beginWrite(true);
@@ -1557,7 +1558,7 @@
          if (bl2 && tick && this.client.world != null) {
             this.client.getProfiler().swap("gui");
             if (this.client.player != null) {
-               float f = MathHelper.lerp(tracker.m_ixtdjbfz(false), this.client.player.lastScreenSwirlIntensity, this.client.player.screenSwirlIntensity);
+               float f = MathHelper.lerp(arg.m_ixtdjbfz(false), this.client.player.lastScreenSwirlIntensity, this.client.player.screenSwirlIntensity);
                float g = this.client.options.getDistortionEffectScale().get().floatValue();
                if (f > 0.0F && this.client.player.hasStatusEffect(StatusEffects.NAUSEA) && g < 1.0F) {
                   this.renderNauseaOverlay(lv2, f * (1.0F - g));
@@ -1565,17 +1566,17 @@
             }
 
             if (!this.client.options.hudHidden) {
-               this.renderFloatingItem(lv2, tracker.m_ixtdjbfz(false));
+               this.renderFloatingItem(lv2, arg.m_ixtdjbfz(false));
             }
 
-            this.client.inGameHud.render(lv2, tracker);
+            this.client.inGameHud.render(lv2, arg);
             RenderSystem.clear(256, MinecraftClient.IS_SYSTEM_MAC);
             this.client.getProfiler().pop();
          }
 
          if (this.client.getOverlay() != null) {
             try {
-               this.client.getOverlay().render(lv2, i, j, tracker.m_kgixoaxb());
+               this.client.getOverlay().render(lv2, i, j, arg.m_kgixoaxb());
             } catch (Throwable var15) {
                CrashReport lv3 = CrashReport.create(var15, "Rendering overlay");
                CrashReportSection lv4 = lv3.addElement("Overlay render details");
@@ -1584,7 +1585,7 @@
             }
          } else if (bl2 && this.client.currentScreen != null) {
             try {
-               this.client.currentScreen.renderWithTooltip(lv2, i, j, tracker.m_kgixoaxb());
+               this.client.currentScreen.renderWithTooltip(lv2, i, j, arg.m_kgixoaxb());
             } catch (Throwable var14) {
                CrashReport lv5 = CrashReport.create(var14, "Rendering screen");
                CrashReportSection lv6 = lv5.addElement("Screen render details");
@@ -1623,7 +1624,7 @@
          }
 
          if (bl2 && tick && this.client.world != null) {
-            this.client.inGameHud.renderAutosaveIndicator(lv2, tracker);
+            this.client.inGameHud.renderAutosaveIndicator(lv2, arg);
          }
 
          if (bl2) {
@@ -1725,10 +1726,10 @@
 
    /**
     * @mapping {@literal hashed m_xtnwmdic Lnet/minecraft/unmapped/C_sktkdoun;m_xtnwmdic(Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
-    * @mapping {@literal named renderWorld Lnet/minecraft/client/render/GameRenderer;renderWorld(Lnet/minecraft/client/render/DeltaTracker;)V}
+    * @mapping {@literal named renderWorld Lnet/minecraft/client/render/GameRenderer;renderWorld(Lnet/minecraft/unmapped/C_lrgsdfwv;)V}
     */
-   public void renderWorld(DeltaTracker tracker) {
-      float f = tracker.m_ixtdjbfz(true);
+   public void renderWorld(C_lrgsdfwv arg) {
+      float f = arg.m_ixtdjbfz(true);
       this.lightmapTextureManager.update(f);
       if (this.client.getCameraEntity() == null) {
          this.client.setCameraEntity(this.client.player);
@@ -1771,7 +1772,7 @@
       this.client
          .worldRenderer
          .setupFrustum(lv.getPos(), matrix4f2, this.getBasicProjectionMatrix(Math.max(d, (double)this.client.options.getFov().get().intValue())));
-      this.client.worldRenderer.render(tracker, bl, lv, this, this.lightmapTextureManager, matrix4f2, matrix4f);
+      this.client.worldRenderer.render(arg, bl, lv, this, this.lightmapTextureManager, matrix4f2, matrix4f);
       this.client.getProfiler().swap("hand");
       if (this.renderHand) {
          RenderSystem.clear(256, MinecraftClient.IS_SYSTEM_MAC);
diff -bur namedTargetSrc/net/minecraft/client/render/TexturedRenderLayers.java namedSrc/net/minecraft/client/render/TexturedRenderLayers.java
--- namedTargetSrc/net/minecraft/client/render/TexturedRenderLayers.java	2024-07-03 03:34:46.986036141 +0000
+++ namedSrc/net/minecraft/client/render/TexturedRenderLayers.java	2024-07-03 03:33:31.725977181 +0000
@@ -11,18 +11,18 @@
 import java.util.stream.Stream;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
-import net.minecraft.block.DecoratedPotPattern;
-import net.minecraft.block.WoodType;
 import net.minecraft.block.entity.BannerPattern;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.EnderChestBlockEntity;
 import net.minecraft.block.entity.TrappedChestBlockEntity;
 import net.minecraft.block.enums.ChestType;
+import net.minecraft.block.sign.SignType;
 import net.minecraft.client.resource.Material;
 import net.minecraft.client.texture.SpriteAtlasTexture;
 import net.minecraft.registry.Holder;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.RegistryKey;
+import net.minecraft.unmapped.C_xtwumkqz;
 import net.minecraft.util.DyeColor;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -151,13 +151,13 @@
     * @mapping {@literal hashed f_kbtzkawa Lnet/minecraft/unmapped/C_vkaoetfp;f_kbtzkawa:Ljava/util/Map;}
     * @mapping {@literal named SIGN_TEXTURES Lnet/minecraft/client/render/TexturedRenderLayers;SIGN_TEXTURES:Ljava/util/Map;}
     */
-   public static final Map<WoodType, Material> SIGN_TEXTURES = (Map<WoodType, Material>)WoodType.stream()
+   public static final Map<SignType, Material> SIGN_TEXTURES = (Map<SignType, Material>)SignType.stream()
       .collect(Collectors.toMap(Function.identity(), TexturedRenderLayers::createSignTextureId));
    /**
     * @mapping {@literal hashed f_cudkfurs Lnet/minecraft/unmapped/C_vkaoetfp;f_cudkfurs:Ljava/util/Map;}
     * @mapping {@literal named HANGING_SIGN_TEXTURES Lnet/minecraft/client/render/TexturedRenderLayers;HANGING_SIGN_TEXTURES:Ljava/util/Map;}
     */
-   public static final Map<WoodType, Material> HANGING_SIGN_TEXTURES = (Map<WoodType, Material>)WoodType.stream()
+   public static final Map<SignType, Material> HANGING_SIGN_TEXTURES = (Map<SignType, Material>)SignType.stream()
       .collect(Collectors.toMap(Function.identity(), TexturedRenderLayers::createHangingSignTextureId));
    /**
     * Mapping not found
@@ -181,9 +181,9 @@
     * @mapping {@literal hashed f_vyyzdzdt Lnet/minecraft/unmapped/C_vkaoetfp;f_vyyzdzdt:Ljava/util/Map;}
     * @mapping {@literal named DECORATED_POT_PATTERN_TEXTURES Lnet/minecraft/client/render/TexturedRenderLayers;DECORATED_POT_PATTERN_TEXTURES:Ljava/util/Map;}
     */
-   public static final Map<RegistryKey<DecoratedPotPattern>, Material> DECORATED_POT_PATTERN_TEXTURES = (Map<RegistryKey<DecoratedPotPattern>, Material>)Registries.DECORATED_POT_PATTERN
+   public static final Map<RegistryKey<C_xtwumkqz>, Material> DECORATED_POT_PATTERN_TEXTURES = (Map<RegistryKey<C_xtwumkqz>, Material>)Registries.DECORATED_POT_PATTERN
       .holders()
-      .collect(Collectors.toMap(Holder.Reference::getRegistryKey, arg -> createDecoratedPotPatternTextureId(((DecoratedPotPattern)arg.value()).assetId())));
+      .collect(Collectors.toMap(Holder.Reference::getRegistryKey, arg -> createDecoratedPotPatternTextureId(((C_xtwumkqz)arg.value()).assetId())));
    /**
     * Mapping not found
     */
@@ -349,33 +349,33 @@
 
    /**
     * @mapping {@literal hashed m_tkhoovme Lnet/minecraft/unmapped/C_vkaoetfp;m_tkhoovme(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;}
-    * @mapping {@literal named createSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;createSignTextureId(Lnet/minecraft/block/WoodType;)Lnet/minecraft/client/resource/Material;}
+    * @mapping {@literal named createSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;createSignTextureId(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/resource/Material;}
     */
-   private static Material createSignTextureId(WoodType type) {
+   private static Material createSignTextureId(SignType type) {
       return new Material(SIGNS_ATLAS_TEXTURE, Identifier.ofDefault("entity/signs/" + type.getName()));
    }
 
    /**
     * @mapping {@literal hashed m_ealwunls Lnet/minecraft/unmapped/C_vkaoetfp;m_ealwunls(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;}
-    * @mapping {@literal named createHangingSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;createHangingSignTextureId(Lnet/minecraft/block/WoodType;)Lnet/minecraft/client/resource/Material;}
+    * @mapping {@literal named createHangingSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;createHangingSignTextureId(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/resource/Material;}
     */
-   private static Material createHangingSignTextureId(WoodType type) {
+   private static Material createHangingSignTextureId(SignType type) {
       return new Material(SIGNS_ATLAS_TEXTURE, Identifier.ofDefault("entity/signs/hanging/" + type.getName()));
    }
 
    /**
     * @mapping {@literal hashed m_vaqmvmry Lnet/minecraft/unmapped/C_vkaoetfp;m_vaqmvmry(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;}
-    * @mapping {@literal named getSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getSignTextureId(Lnet/minecraft/block/WoodType;)Lnet/minecraft/client/resource/Material;}
+    * @mapping {@literal named getSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getSignTextureId(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/resource/Material;}
     */
-   public static Material getSignTextureId(WoodType signType) {
+   public static Material getSignTextureId(SignType signType) {
       return (Material)SIGN_TEXTURES.get(signType);
    }
 
    /**
     * @mapping {@literal hashed m_ezczexcd Lnet/minecraft/unmapped/C_vkaoetfp;m_ezczexcd(Lnet/minecraft/unmapped/C_xlaykyai;)Lnet/minecraft/unmapped/C_djlixbky;}
-    * @mapping {@literal named getHangingSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getHangingSignTextureId(Lnet/minecraft/block/WoodType;)Lnet/minecraft/client/resource/Material;}
+    * @mapping {@literal named getHangingSignTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getHangingSignTextureId(Lnet/minecraft/block/sign/SignType;)Lnet/minecraft/client/resource/Material;}
     */
-   public static Material getHangingSignTextureId(WoodType type) {
+   public static Material getHangingSignTextureId(SignType type) {
       return (Material)HANGING_SIGN_TEXTURES.get(type);
    }
 
@@ -422,7 +422,7 @@
     * @mapping {@literal named getDecoratedPotPatternTextureId Lnet/minecraft/client/render/TexturedRenderLayers;getDecoratedPotPatternTextureId(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/client/resource/Material;}
     */
    @Nullable
-   public static Material getDecoratedPotPatternTextureId(@Nullable RegistryKey<DecoratedPotPattern> registryKey) {
+   public static Material getDecoratedPotPatternTextureId(@Nullable RegistryKey<C_xtwumkqz> registryKey) {
       return registryKey == null ? null : (Material)DECORATED_POT_PATTERN_TEXTURES.get(registryKey);
    }
 
diff -bur namedTargetSrc/net/minecraft/client/render/WorldRenderer.java namedSrc/net/minecraft/client/render/WorldRenderer.java
--- namedTargetSrc/net/minecraft/client/render/WorldRenderer.java	2024-07-03 03:34:46.842036022 +0000
+++ namedSrc/net/minecraft/client/render/WorldRenderer.java	2024-07-03 03:33:31.557977023 +0000
@@ -97,6 +97,7 @@
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_fpcijbbg;
 import net.minecraft.unmapped.C_jnliocmw;
+import net.minecraft.unmapped.C_lrgsdfwv;
 import net.minecraft.unmapped.C_sjynkhfr;
 import net.minecraft.unmapped.C_yeazlrrn;
 import net.minecraft.util.Identifier;
@@ -1281,10 +1282,10 @@
 
    /**
     * @mapping {@literal hashed m_nsrbbxvx Lnet/minecraft/unmapped/C_sfkkabhx;m_nsrbbxvx(Lnet/minecraft/unmapped/C_lrgsdfwv;ZLnet/minecraft/unmapped/C_dcmtgrvm;Lnet/minecraft/unmapped/C_sktkdoun;Lnet/minecraft/unmapped/C_grwstqbm;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V}
-    * @mapping {@literal named render Lnet/minecraft/client/render/WorldRenderer;render(Lnet/minecraft/client/render/DeltaTracker;ZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lnet/minecraft/client/render/LightmapTextureManager;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V}
+    * @mapping {@literal named render Lnet/minecraft/client/render/WorldRenderer;render(Lnet/minecraft/unmapped/C_lrgsdfwv;ZLnet/minecraft/client/render/Camera;Lnet/minecraft/client/render/GameRenderer;Lnet/minecraft/client/render/LightmapTextureManager;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V}
     */
    public void render(
-      DeltaTracker tracker,
+      C_lrgsdfwv arg,
       boolean renderBlockOutline,
       Camera camera,
       GameRenderer gameRenderer,
@@ -1293,7 +1294,7 @@
       Matrix4f matrix4f2
    ) {
       TickManager lv = this.client.world.getTickManager();
-      float f = tracker.m_ixtdjbfz(false);
+      float f = arg.m_ixtdjbfz(false);
       RenderSystem.setShaderGameTime(this.world.getTime(), f);
       this.blockEntityRenderDispatcher.configure(this.world, camera, this.client.crosshairTarget);
       this.entityRenderDispatcher.configure(this.world, camera, this.client.targetedEntity);
@@ -1402,7 +1403,7 @@
                   lv11 = lv7;
                }
 
-               float j = tracker.m_ixtdjbfz(!lv.shouldSkipTick(lv8));
+               float j = arg.m_ixtdjbfz(!lv.shouldSkipTick(lv8));
                this.renderEntity(lv8, d, e, g, j, lv6, lv11);
             }
          }
@@ -1468,7 +1469,7 @@
       lv7.draw(TexturedRenderLayers.getChest());
       this.bufferBuilders.getOutlineVertexConsumers().draw();
       if (bl4) {
-         this.entityOutlineShader.render(tracker.m_ndzzsdqi());
+         this.entityOutlineShader.render(arg.m_ndzzsdqi());
          this.client.getFramebuffer().beginWrite(false);
       }
 
@@ -1564,7 +1565,7 @@
          this.renderWeather(lightmapTextureManager, f, d, e, g);
          this.renderWorldBorder(camera);
          RenderPhase.WEATHER_TARGET.endDrawing();
-         this.transparencyShader.render(tracker.m_ndzzsdqi());
+         this.transparencyShader.render(arg.m_ndzzsdqi());
          this.client.getFramebuffer().beginWrite(false);
       } else {
          RenderSystem.depthMask(false);
Only in namedSrc/net/minecraft/component: EnchantmentEffectComponentTypes.java
diff -bur namedTargetSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java
--- namedTargetSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-07-03 03:34:46.986036141 +0000
+++ namedSrc/net/minecraft/component/type/ItemEnchantmentsComponent.java	2024-07-03 03:33:31.721977177 +0000
@@ -47,7 +47,7 @@
     * @mapping {@literal hashed f_weawpons Lnet/minecraft/unmapped/C_qlclfxvn;f_weawpons:Lcom/mojang/serialization/Codec;}
     * @mapping {@literal named LEVELS_CODEC Lnet/minecraft/component/type/ItemEnchantmentsComponent;LEVELS_CODEC:Lcom/mojang/serialization/Codec;}
     */
-   private static final Codec<Object2IntOpenHashMap<Holder<Enchantment>>> LEVELS_CODEC = Codec.unboundedMap(Enchantment.f_cvunyugc, LEVEL_CODEC)
+   private static final Codec<Object2IntOpenHashMap<Holder<Enchantment>>> LEVELS_CODEC = Codec.unboundedMap(Enchantment.ENTRY_CODEC, LEVEL_CODEC)
       .xmap(Object2IntOpenHashMap::new, Function.identity());
    /**
     * @mapping {@literal hashed f_nekwvric Lnet/minecraft/unmapped/C_qlclfxvn;f_nekwvric:Lcom/mojang/serialization/Codec;}
@@ -72,7 +72,7 @@
     * @mapping {@literal named PACKET_CODEC Lnet/minecraft/component/type/ItemEnchantmentsComponent;PACKET_CODEC:Lnet/minecraft/network/codec/PacketCodec;}
     */
    public static final PacketCodec<RegistryByteBuf, ItemEnchantmentsComponent> PACKET_CODEC = PacketCodec.tuple(
-      PacketCodecs.map(Object2IntOpenHashMap::new, Enchantment.PACKET_CODEC, PacketCodecs.VAR_INT),
+      PacketCodecs.map(Object2IntOpenHashMap::new, Enchantment.ENTRY_PACKET_CODEC, PacketCodecs.VAR_INT),
       component -> component.levels,
       PacketCodecs.BOOL,
       component -> component.shownInTooltip,
@@ -124,14 +124,14 @@
          for (Holder<Enchantment> lv3 : lv2) {
             int i = this.levels.getInt(lv3);
             if (i > 0) {
-               tooltipConsumer.accept(Enchantment.m_zfqdifee(lv3, i));
+               tooltipConsumer.accept(Enchantment.getFullName(lv3, i));
             }
          }
 
          for (Entry<Holder<Enchantment>> entry : this.levels.object2IntEntrySet()) {
             Holder<Enchantment> lv4 = (Holder<Enchantment>)entry.getKey();
             if (!lv2.contains(lv4)) {
-               tooltipConsumer.accept(Enchantment.m_zfqdifee((Holder<Enchantment>)entry.getKey(), entry.getIntValue()));
+               tooltipConsumer.accept(Enchantment.getFullName((Holder<Enchantment>)entry.getKey(), entry.getIntValue()));
             }
          }
       }
diff -bur namedTargetSrc/net/minecraft/data/Main.java namedSrc/net/minecraft/data/Main.java
--- namedTargetSrc/net/minecraft/data/Main.java	2024-07-03 03:34:46.934036098 +0000
+++ namedSrc/net/minecraft/data/Main.java	2024-07-03 03:33:31.665977124 +0000
@@ -42,7 +42,6 @@
 import net.minecraft.data.server.tag.MapTagsProvider;
 import net.minecraft.data.server.tag.PaintingTagProvider;
 import net.minecraft.data.server.tag.PoiTagProvider;
-import net.minecraft.data.server.tag.TradeRebalanceEnchantmentTagsProvider;
 import net.minecraft.data.server.tag.WorldPresetTagProvider;
 import net.minecraft.data.validate.StructureValidatorProvider;
 import net.minecraft.feature_flags.FeatureFlagBitSet;
@@ -55,6 +54,7 @@
 import net.minecraft.registry.tag.StructureTagsProvider;
 import net.minecraft.text.Text;
 import net.minecraft.unmapped.C_apbctukq;
+import net.minecraft.unmapped.C_vdecfbtc;
 import net.minecraft.unmapped.C_vkynrwhu;
 import net.minecraft.unmapped.C_ythfdxbi;
 import net.minecraft.util.Util;
@@ -188,7 +188,7 @@
       );
       lv13.addProvider(createFactory(TradeRebalanceLootTableProviders::createTradeRebalanceProvider, completableFuture));
       lv13.addProvider(createFactory(MapTagsProvider::new, completableFuture));
-      lv13.addProvider(createFactory(TradeRebalanceEnchantmentTagsProvider::new, completableFuture));
+      lv13.addProvider(createFactory(C_vdecfbtc::new, completableFuture));
       return lv;
    }
 }
Only in namedTargetSrc/net/minecraft/data/server/tag: TradeRebalanceEnchantmentTagsProvider.java
Only in namedTargetSrc/net/minecraft/datafixer/fix: AttributeModifierIdFix.java
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/ChoiceWriteReadFix.java namedSrc/net/minecraft/datafixer/fix/ChoiceWriteReadFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/ChoiceWriteReadFix.java	2024-07-03 03:34:46.854036032 +0000
+++ namedSrc/net/minecraft/datafixer/fix/ChoiceWriteReadFix.java	2024-07-03 03:33:31.577977042 +0000
@@ -71,7 +71,7 @@
             Typed<S> typed = new Typed<>(type, ops, (S)object);
             return typed.update(opticFinder, type3, objectx -> {
                Typed<A> typedx = new Typed<>((Type<A>)type4, ops, (A)objectx);
-               return Util.writeAndReadTypedOrThrow(typedx, type3, this::fix).getValue();
+               return Util.writeAndReadTypedOrThrow(typedx, type3, this::m_yugdcpvb).getValue();
             }).getValue();
          });
    }
@@ -89,7 +89,7 @@
 
    /**
     * @mapping {@literal hashed m_yugdcpvb Lnet/minecraft/unmapped/C_gydoytis;m_yugdcpvb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
-    * @mapping {@literal named fix Lnet/minecraft/datafixer/fix/ChoiceWriteReadFix;fix(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named m_yugdcpvb Lnet/minecraft/datafixer/fix/ChoiceWriteReadFix;m_yugdcpvb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
-   protected abstract <T> Dynamic<T> fix(Dynamic<T> dynamic);
+   protected abstract <T> Dynamic<T> m_yugdcpvb(Dynamic<T> dynamic);
 }
Only in namedTargetSrc/net/minecraft/datafixer/fix: EmptyItemInVillagerTradeFix.java
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/HorseArmorFix.java namedSrc/net/minecraft/datafixer/fix/HorseArmorFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/HorseArmorFix.java	2024-07-03 03:34:46.962036121 +0000
+++ namedSrc/net/minecraft/datafixer/fix/HorseArmorFix.java	2024-07-03 03:33:31.697977155 +0000
@@ -31,10 +31,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yugdcpvb Lnet/minecraft/unmapped/C_ozobotfj;m_yugdcpvb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named m_yugdcpvb Lnet/minecraft/datafixer/fix/HorseArmorFix;m_yugdcpvb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
    @Override
-   protected <T> Dynamic<T> fix(Dynamic<T> dynamic) {
+   protected <T> Dynamic<T> m_yugdcpvb(Dynamic<T> dynamic) {
       Optional<? extends Dynamic<?>> optional = dynamic.get(this.f_mmitgeer).result();
       if (optional.isPresent()) {
          Dynamic<?> dynamic2 = (Dynamic<?>)optional.get();
Only in namedTargetSrc/net/minecraft/datafixer/fix: JukeboxTicksSinceSongStartedFix.java
Only in namedTargetSrc/net/minecraft/datafixer/fix: OptionsMenuBlurrinessFix.java
Only in namedTargetSrc/net/minecraft/datafixer/fix: ParticleUnflatteningFix.java
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/PrimedTntBlockStateFix.java namedSrc/net/minecraft/datafixer/fix/PrimedTntBlockStateFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/PrimedTntBlockStateFix.java	2024-07-03 03:34:46.906036075 +0000
+++ namedSrc/net/minecraft/datafixer/fix/PrimedTntBlockStateFix.java	2024-07-03 03:33:31.633977095 +0000
@@ -37,10 +37,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yugdcpvb Lnet/minecraft/unmapped/C_fakozzpo;m_yugdcpvb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named m_yugdcpvb Lnet/minecraft/datafixer/fix/PrimedTntBlockStateFix;m_yugdcpvb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
    @Override
-   protected <T> Dynamic<T> fix(Dynamic<T> dynamic) {
+   protected <T> Dynamic<T> m_yugdcpvb(Dynamic<T> dynamic) {
       return fixFuse(setBlockState(dynamic));
    }
 }
Only in namedTargetSrc/net/minecraft/datafixer/fix: RemoveEmptyItemInBrushableBlockFix.java
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/TippedArrowPotionToItemFix.java namedSrc/net/minecraft/datafixer/fix/TippedArrowPotionToItemFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/TippedArrowPotionToItemFix.java	2024-07-03 03:34:47.018036167 +0000
+++ namedSrc/net/minecraft/datafixer/fix/TippedArrowPotionToItemFix.java	2024-07-03 03:33:31.761977214 +0000
@@ -19,10 +19,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yugdcpvb Lnet/minecraft/unmapped/C_fqylcxas;m_yugdcpvb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named m_yugdcpvb Lnet/minecraft/datafixer/fix/TippedArrowPotionToItemFix;m_yugdcpvb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
    @Override
-   protected <T> Dynamic<T> fix(Dynamic<T> dynamic) {
+   protected <T> Dynamic<T> m_yugdcpvb(Dynamic<T> dynamic) {
       Optional<Dynamic<T>> optional = dynamic.get("Potion").result();
       Optional<Dynamic<T>> optional2 = dynamic.get("custom_potion_effects").result();
       Optional<Dynamic<T>> optional3 = dynamic.get("Color").result();
diff -bur namedTargetSrc/net/minecraft/datafixer/fix/TrialSpawnConfigTagFix.java namedSrc/net/minecraft/datafixer/fix/TrialSpawnConfigTagFix.java
--- namedTargetSrc/net/minecraft/datafixer/fix/TrialSpawnConfigTagFix.java	2024-07-03 03:34:47.010036160 +0000
+++ namedSrc/net/minecraft/datafixer/fix/TrialSpawnConfigTagFix.java	2024-07-03 03:33:31.753977207 +0000
@@ -51,10 +51,11 @@
    }
 
    /**
-    * Mapping not found
+    * @mapping {@literal hashed m_yugdcpvb Lnet/minecraft/unmapped/C_oylwhwjk;m_yugdcpvb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
+    * @mapping {@literal named m_yugdcpvb Lnet/minecraft/datafixer/fix/TrialSpawnConfigTagFix;m_yugdcpvb(Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic;}
     */
    @Override
-   protected <T> Dynamic<T> fix(Dynamic<T> dynamic) {
+   protected <T> Dynamic<T> m_yugdcpvb(Dynamic<T> dynamic) {
       return m_dnfkuqjd(dynamic);
    }
 }
Only in namedTargetSrc/net/minecraft/datafixer/schema: Schema3808v2.java
Only in namedTargetSrc/net/minecraft/datafixer/schema: Schema3818v5.java
Only in namedTargetSrc/net/minecraft/datafixer/schema: Schema3938.java
diff -bur namedTargetSrc/net/minecraft/datafixer/Schemas.java namedSrc/net/minecraft/datafixer/Schemas.java
--- namedTargetSrc/net/minecraft/datafixer/Schemas.java	2024-07-03 03:34:47.006036157 +0000
+++ namedSrc/net/minecraft/datafixer/Schemas.java	2024-07-03 03:33:31.753977207 +0000
@@ -29,7 +29,6 @@
 import net.minecraft.datafixer.fix.AdvancementsFix;
 import net.minecraft.datafixer.fix.AreaEffectCloudPotionFix;
 import net.minecraft.datafixer.fix.ArrowPickupFix;
-import net.minecraft.datafixer.fix.AttributeModifierIdFix;
 import net.minecraft.datafixer.fix.BannerPatternFormatFix;
 import net.minecraft.datafixer.fix.BedBlockEntityFix;
 import net.minecraft.datafixer.fix.BedItemColorFix;
@@ -76,7 +75,6 @@
 import net.minecraft.datafixer.fix.DragonFightFix;
 import net.minecraft.datafixer.fix.DropInvalidSignDataFix;
 import net.minecraft.datafixer.fix.EmptyItemInHotbarFix;
-import net.minecraft.datafixer.fix.EmptyItemInVillagerTradeFix;
 import net.minecraft.datafixer.fix.EntityArmorStandSilentFix;
 import net.minecraft.datafixer.fix.EntityBlockStateFix;
 import net.minecraft.datafixer.fix.EntityBrushableBlockFieldsRenameFix;
@@ -138,7 +136,6 @@
 import net.minecraft.datafixer.fix.ItemWrittenBookPagesStrictJsonFix;
 import net.minecraft.datafixer.fix.JigsawPropertiesFix;
 import net.minecraft.datafixer.fix.JigsawRotationFix;
-import net.minecraft.datafixer.fix.JukeboxTicksSinceSongStartedFix;
 import net.minecraft.datafixer.fix.LeavesFix;
 import net.minecraft.datafixer.fix.LevelDataGeneratorOptionsFix;
 import net.minecraft.datafixer.fix.LevelFlatGeneratorInfoFix;
@@ -163,10 +160,8 @@
 import net.minecraft.datafixer.fix.OptionsKeyLwjgl3Fix;
 import net.minecraft.datafixer.fix.OptionsKeyTranslationFix;
 import net.minecraft.datafixer.fix.OptionsLowerCaseLanguageFix;
-import net.minecraft.datafixer.fix.OptionsMenuBlurrinessFix;
 import net.minecraft.datafixer.fix.OptionsProgrammerArtFix;
 import net.minecraft.datafixer.fix.OverreachingTickFix;
-import net.minecraft.datafixer.fix.ParticleUnflatteningFix;
 import net.minecraft.datafixer.fix.PersistentStateUuidFix;
 import net.minecraft.datafixer.fix.PlayerHeadBlockProfileFix;
 import net.minecraft.datafixer.fix.PlayerUuidFix;
@@ -180,7 +175,6 @@
 import net.minecraft.datafixer.fix.RecipeRenamingFix;
 import net.minecraft.datafixer.fix.RedstoneConnectionsFix;
 import net.minecraft.datafixer.fix.RemapChunkStatusFix;
-import net.minecraft.datafixer.fix.RemoveEmptyItemInBrushableBlockFix;
 import net.minecraft.datafixer.fix.RemoveFeatureFlagFix;
 import net.minecraft.datafixer.fix.RemoveGolemGossipFix;
 import net.minecraft.datafixer.fix.RemovePoiValidTagFix;
@@ -292,14 +286,11 @@
 import net.minecraft.datafixer.schema.Schema3807;
 import net.minecraft.datafixer.schema.Schema3808;
 import net.minecraft.datafixer.schema.Schema3808v1;
-import net.minecraft.datafixer.schema.Schema3808v2;
 import net.minecraft.datafixer.schema.Schema3816;
 import net.minecraft.datafixer.schema.Schema3818;
 import net.minecraft.datafixer.schema.Schema3818v3;
 import net.minecraft.datafixer.schema.Schema3818v4;
-import net.minecraft.datafixer.schema.Schema3818v5;
 import net.minecraft.datafixer.schema.Schema3825;
-import net.minecraft.datafixer.schema.Schema3938;
 import net.minecraft.datafixer.schema.Schema501;
 import net.minecraft.datafixer.schema.Schema700;
 import net.minecraft.datafixer.schema.Schema701;
@@ -309,7 +300,16 @@
 import net.minecraft.datafixer.schema.Schema705;
 import net.minecraft.datafixer.schema.Schema808;
 import net.minecraft.datafixer.schema.Schema99;
+import net.minecraft.unmapped.C_asohzhmn;
+import net.minecraft.unmapped.C_dxtlxcwy;
+import net.minecraft.unmapped.C_hwfxjmrq;
+import net.minecraft.unmapped.C_mhcnsduw;
+import net.minecraft.unmapped.C_ndmcqqzd;
+import net.minecraft.unmapped.C_orxszuap;
+import net.minecraft.unmapped.C_rmfftleh;
 import net.minecraft.unmapped.C_sjuegdjy;
+import net.minecraft.unmapped.C_vhatytxj;
+import net.minecraft.unmapped.C_zjsuejaf;
 import net.minecraft.util.Util;
 
 /**
@@ -1323,7 +1323,7 @@
       builder.addFixer(new HorseArmorFix(schema204, "minecraft:horse", "ArmorItem", true));
       Schema schema205 = builder.addSchema(3808, 1, Schema3808v1::new);
       builder.addFixer(new HorseArmorFix(schema205, "minecraft:llama", "DecorItem", false));
-      Schema schema206 = builder.addSchema(3808, 2, Schema3808v2::new);
+      Schema schema206 = builder.addSchema(3808, 2, C_mhcnsduw::new);
       builder.addFixer(new HorseArmorFix(schema206, "minecraft:trader_llama", "DecorItem", false));
       Schema schema207 = builder.addSchema(3809, EMPTY_IDENTIFIER_NORMALIZE);
       builder.addFixer(new HorseChestIndexingFix(schema207));
@@ -1349,8 +1349,8 @@
       Schema schema215 = builder.addSchema(3818, 3, Schema3818v3::new);
       builder.addFixer(new WriteAndReadFix(schema215, "Inject data component types", TypeReferences.DATA_COMPONENTS));
       Schema schema216 = builder.addSchema(3818, 4, Schema3818v4::new);
-      builder.addFixer(new ParticleUnflatteningFix(schema216));
-      Schema schema217 = builder.addSchema(3818, 5, Schema3818v5::new);
+      builder.addFixer(new C_asohzhmn(schema216));
+      Schema schema217 = builder.addSchema(3818, 5, C_orxszuap::new);
       builder.addFixer(new ItemStackComponentizationFix(schema217));
       Schema schema218 = builder.addSchema(3818, 6, EMPTY_IDENTIFIER_NORMALIZE);
       builder.addFixer(new AreaEffectCloudPotionFix(schema218));
@@ -1363,18 +1363,18 @@
       builder.addFixer(new TrialSpawnConfigTagFix(schema220));
       builder.addFixer(new ChoiceTypesFix(schema220, "Added Ominous Item Spawner", TypeReferences.ENTITY));
       Schema schema221 = builder.addSchema(3828, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new EmptyItemInVillagerTradeFix(schema221));
+      builder.addFixer(new C_rmfftleh(schema221));
       Schema schema222 = builder.addSchema(3833, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new RemoveEmptyItemInBrushableBlockFix(schema222));
-      Schema schema223 = builder.addSchema(3938, Schema3938::new);
+      builder.addFixer(new C_dxtlxcwy(schema222));
+      Schema schema223 = builder.addSchema(3938, C_hwfxjmrq::new);
       builder.addFixer(new C_sjuegdjy(schema223));
       Schema schema224 = builder.addSchema(3939, EMPTY_IDENTIFIER_NORMALIZE);
       builder.addFixer(new RemoveFeatureFlagFix(schema224, "Remove 1.21 feature toggle", Set.of("minecraft:update_1_21")));
       Schema schema225 = builder.addSchema(3943, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new OptionsMenuBlurrinessFix(schema225));
+      builder.addFixer(new C_vhatytxj(schema225));
       Schema schema226 = builder.addSchema(3945, EMPTY_IDENTIFIER_NORMALIZE);
-      builder.addFixer(new AttributeModifierIdFix(schema226));
-      builder.addFixer(new JukeboxTicksSinceSongStartedFix(schema226));
+      builder.addFixer(new C_zjsuejaf(schema226));
+      builder.addFixer(new C_ndmcqqzd(schema226));
    }
 
    /**
Only in namedSrc/net/minecraft/enchantment: effect
Only in namedSrc/net/minecraft/enchantment: EnchantmentEffectContext.java
diff -bur namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java namedSrc/net/minecraft/enchantment/EnchantmentHelper.java
--- namedTargetSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-07-03 03:34:46.954036115 +0000
+++ namedSrc/net/minecraft/enchantment/EnchantmentHelper.java	2024-07-03 03:33:31.685977143 +0000
@@ -13,7 +13,10 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.component.DataComponentType;
 import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.EnchantmentEffectComponentTypes;
 import net.minecraft.component.type.ItemEnchantmentsComponent;
+import net.minecraft.enchantment.effect.EnchantmentEffectTarget;
+import net.minecraft.enchantment.effect.EnchantmentValueEffect;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.EquipmentSlotGroup;
@@ -33,11 +36,7 @@
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.server.world.ServerWorld;
-import net.minecraft.unmapped.C_nzjqewao;
-import net.minecraft.unmapped.C_pjrjvgrp;
 import net.minecraft.unmapped.C_qraehchg;
-import net.minecraft.unmapped.C_rkxlblfn;
-import net.minecraft.unmapped.C_zjvjrddv;
 import net.minecraft.util.Util;
 import net.minecraft.util.collection.Weighting;
 import net.minecraft.util.math.MathHelper;
@@ -191,11 +190,11 @@
       if (!stack.isEmpty()) {
          ItemEnchantmentsComponent lv = stack.get(DataComponentTypes.ENCHANTMENTS);
          if (lv != null && !lv.isEmpty()) {
-            C_pjrjvgrp lv2 = new C_pjrjvgrp(stack, inSlot, owner);
+            EnchantmentEffectContext lv2 = new EnchantmentEffectContext(stack, inSlot, owner);
 
             for (Entry<Holder<Enchantment>> entry : lv.getEnchantmentEntries()) {
                Holder<Enchantment> lv3 = (Holder<Enchantment>)entry.getKey();
-               if (lv3.value().m_jhglsmkm(inSlot)) {
+               if (lv3.value().matchesSlot(inSlot)) {
                   arg4.accept(lv3, entry.getIntValue(), lv2);
                }
             }
@@ -218,7 +217,7 @@
     */
    public static boolean m_gqfvpbsm(ServerWorld world, LivingEntity arg2, DamageSource arg3) {
       MutableBoolean mutableBoolean = new MutableBoolean();
-      m_kvkboaps(arg2, (arg4, i, arg5) -> mutableBoolean.setValue(mutableBoolean.isTrue() || arg4.value().m_ujjglmjb(world, i, arg2, arg3)));
+      m_kvkboaps(arg2, (arg4, i, arg5) -> mutableBoolean.setValue(mutableBoolean.isTrue() || arg4.value().isImmuneToDamageFrom(world, i, arg2, arg3)));
       return mutableBoolean.isTrue();
    }
 
@@ -290,11 +289,13 @@
     */
    public static void m_swhrpoib(ServerWorld world, Entity arg2, DamageSource arg3, @Nullable ItemStack stack) {
       if (arg2 instanceof LivingEntity lv) {
-         m_kvkboaps(lv, (arg4, i, arg5) -> arg4.value().m_umpbrnfg(world, i, arg5, C_zjvjrddv.VICTIM, arg2, arg3));
+         m_kvkboaps(lv, (arg4, i, arg5) -> arg4.value().m_umpbrnfg(world, i, arg5, EnchantmentEffectTarget.VICTIM, arg2, arg3));
       }
 
       if (stack != null && arg3.getAttacker() instanceof LivingEntity lv2) {
-         m_xdjgfpqn(stack, EquipmentSlot.MAINHAND, lv2, (arg4, i, arg5) -> arg4.value().m_umpbrnfg(world, i, arg5, C_zjvjrddv.ATTACKER, arg2, arg3));
+         m_xdjgfpqn(
+            stack, EquipmentSlot.MAINHAND, lv2, (arg4, i, arg5) -> arg4.value().m_umpbrnfg(world, i, arg5, EnchantmentEffectTarget.ATTACKER, arg2, arg3)
+         );
       }
    }
 
@@ -303,7 +304,7 @@
     * @mapping {@literal named m_unfnerqk Lnet/minecraft/enchantment/EnchantmentHelper;m_unfnerqk(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;)V}
     */
    public static void m_unfnerqk(ServerWorld world, LivingEntity arg2) {
-      m_kvkboaps(arg2, (arg3, i, arg4) -> arg3.value().m_mfxiclqq(world, i, arg4, arg2));
+      m_kvkboaps(arg2, (arg3, i, arg4) -> arg3.value().reapplyLocationBasedEffects(world, i, arg4, arg2));
    }
 
    /**
@@ -311,7 +312,7 @@
     * @mapping {@literal named m_aqtkrfxn Lnet/minecraft/enchantment/EnchantmentHelper;m_aqtkrfxn(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/LivingEntity;Lnet/minecraft/entity/EquipmentSlot;)V}
     */
    public static void m_aqtkrfxn(ServerWorld world, ItemStack stack, LivingEntity owner, EquipmentSlot inSlot) {
-      m_xdjgfpqn(stack, inSlot, owner, (arg3, i, arg4) -> arg3.value().m_mfxiclqq(world, i, arg4, owner));
+      m_xdjgfpqn(stack, inSlot, owner, (arg3, i, arg4) -> arg3.value().reapplyLocationBasedEffects(world, i, arg4, owner));
    }
 
    /**
@@ -334,7 +335,7 @@
     * @mapping {@literal named m_anckqezf Lnet/minecraft/enchantment/EnchantmentHelper;m_anckqezf(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/entity/LivingEntity;)V}
     */
    public static void m_anckqezf(ServerWorld world, LivingEntity arg2) {
-      m_kvkboaps(arg2, (arg3, i, arg4) -> arg3.value().m_laluoqcj(world, i, arg4, arg2));
+      m_kvkboaps(arg2, (arg3, i, arg4) -> arg3.value().tick(world, i, arg4, arg2));
    }
 
    /**
@@ -361,7 +362,7 @@
     */
    public static int m_hsagtbhc(ServerWorld world, ItemStack stack, Entity arg3, int i) {
       MutableFloat mutableFloat = new MutableFloat((float)i);
-      m_akhrohzh(stack, (arg4, ix) -> arg4.value().m_kevrabge(world, ix, stack, arg3, mutableFloat));
+      m_akhrohzh(stack, (arg4, ix) -> arg4.value().modifyProjectileCount(world, ix, stack, arg3, mutableFloat));
       return Math.max(0, mutableFloat.intValue());
    }
 
@@ -371,7 +372,7 @@
     */
    public static float m_lkbuzftr(ServerWorld world, ItemStack stack, Entity arg3, float f) {
       MutableFloat mutableFloat = new MutableFloat(f);
-      m_akhrohzh(stack, (arg4, i) -> arg4.value().m_zlpziyyk(world, i, stack, arg3, mutableFloat));
+      m_akhrohzh(stack, (arg4, i) -> arg4.value().modifyProjectileSpread(world, i, stack, arg3, mutableFloat));
       return Math.max(0.0F, mutableFloat.floatValue());
    }
 
@@ -391,8 +392,8 @@
     */
    public static void m_yolmdyfp(ServerWorld world, ItemStack stack, PersistentProjectileEntity arg3, java.util.function.Consumer<Item> consumer) {
       LivingEntity lv2 = arg3.getOwner() instanceof LivingEntity lv ? lv : null;
-      C_pjrjvgrp lv3 = new C_pjrjvgrp(stack, null, lv2, consumer);
-      m_akhrohzh(stack, (arg4, i) -> arg4.value().m_dgttciah(world, i, lv3, arg3));
+      EnchantmentEffectContext lv3 = new EnchantmentEffectContext(stack, null, lv2, consumer);
+      m_akhrohzh(stack, (arg4, i) -> arg4.value().onProjectileSpawned(world, i, lv3, arg3));
    }
 
    /**
@@ -409,8 +410,8 @@
       BlockState state,
       java.util.function.Consumer<Item> onBreak
    ) {
-      C_pjrjvgrp lv = new C_pjrjvgrp(stack, inSlot, owner, onBreak);
-      m_akhrohzh(stack, (arg6x, i) -> ((Enchantment)arg6x.value()).m_ovgqiywz(world, i, lv, arg4, arg6, state));
+      EnchantmentEffectContext lv = new EnchantmentEffectContext(stack, inSlot, owner, onBreak);
+      m_akhrohzh(stack, (arg6x, i) -> ((Enchantment)arg6x.value()).onHitBlock(world, i, lv, arg4, arg6, state));
    }
 
    /**
@@ -431,19 +432,19 @@
       MutableFloat mutableFloat = new MutableFloat(f);
       RandomGenerator lv = arg2.m_dlwxaobh();
       m_kvkboaps(arg2, (arg5, i, arg6) -> {
-         LootContext lvx = Enchantment.m_yyvgkyyg(world, i, arg2, arg3);
-         arg5.value().m_tujulygf(C_rkxlblfn.EQUIPMENT_DROPS).forEach(arg3xx -> {
-            if (arg3xx.enchanted() == C_zjvjrddv.VICTIM && arg3xx.affected() == C_zjvjrddv.VICTIM && arg3xx.m_sbmzbkam(lvx)) {
-               mutableFloat.setValue(((C_nzjqewao)arg3xx.effect()).m_usnsfqay(i, lv, mutableFloat.floatValue()));
+         LootContext lvx = Enchantment.createDamageContext(world, i, arg2, arg3);
+         arg5.value().getEffect(EnchantmentEffectComponentTypes.EQUIPMENT_DROPS).forEach(arg3xx -> {
+            if (arg3xx.enchanted() == EnchantmentEffectTarget.VICTIM && arg3xx.affected() == EnchantmentEffectTarget.VICTIM && arg3xx.matches(lvx)) {
+               mutableFloat.setValue(((EnchantmentValueEffect)arg3xx.effect()).apply(i, lv, mutableFloat.floatValue()));
             }
          });
       });
       if (arg3.getAttacker() instanceof LivingEntity lv3) {
          m_kvkboaps(lv3, (arg5, i, arg6) -> {
-            LootContext lvx = Enchantment.m_yyvgkyyg(world, i, arg2, arg3);
-            arg5.value().m_tujulygf(C_rkxlblfn.EQUIPMENT_DROPS).forEach(arg3xx -> {
-               if (arg3xx.enchanted() == C_zjvjrddv.ATTACKER && arg3xx.affected() == C_zjvjrddv.VICTIM && arg3xx.m_sbmzbkam(lvx)) {
-                  mutableFloat.setValue(((C_nzjqewao)arg3xx.effect()).m_usnsfqay(i, lv, mutableFloat.floatValue()));
+            LootContext lvx = Enchantment.createDamageContext(world, i, arg2, arg3);
+            arg5.value().getEffect(EnchantmentEffectComponentTypes.EQUIPMENT_DROPS).forEach(arg3xx -> {
+               if (arg3xx.enchanted() == EnchantmentEffectTarget.ATTACKER && arg3xx.affected() == EnchantmentEffectTarget.VICTIM && arg3xx.matches(lvx)) {
+                  mutableFloat.setValue(((EnchantmentValueEffect)arg3xx.effect()).apply(i, lv, mutableFloat.floatValue()));
                }
             });
          });
@@ -457,7 +458,7 @@
     * @mapping {@literal named m_cjzxcjvw Lnet/minecraft/enchantment/EnchantmentHelper;m_cjzxcjvw(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlotGroup;Ljava/util/function/BiConsumer;)V}
     */
    public static void m_cjzxcjvw(ItemStack stack, EquipmentSlotGroup arg2, BiConsumer<Holder<EntityAttribute>, EntityAttributeModifier> biConsumer) {
-      m_akhrohzh(stack, (arg2x, i) -> ((Enchantment)arg2x.value()).m_tujulygf(C_rkxlblfn.ATTRIBUTES).forEach(arg3 -> {
+      m_akhrohzh(stack, (arg2x, i) -> ((Enchantment)arg2x.value()).getEffect(EnchantmentEffectComponentTypes.ATTRIBUTES).forEach(arg3 -> {
             if (((Enchantment)arg2x.value()).definition().slots().contains(arg2)) {
                biConsumer.accept(arg3.attribute(), arg3.m_sepzipgo(i, arg2));
             }
@@ -469,8 +470,8 @@
     * @mapping {@literal named m_zkmvjzhi Lnet/minecraft/enchantment/EnchantmentHelper;m_zkmvjzhi(Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/EquipmentSlot;Ljava/util/function/BiConsumer;)V}
     */
    public static void m_zkmvjzhi(ItemStack stack, EquipmentSlot arg2, BiConsumer<Holder<EntityAttribute>, EntityAttributeModifier> biConsumer) {
-      m_akhrohzh(stack, (arg2x, i) -> ((Enchantment)arg2x.value()).m_tujulygf(C_rkxlblfn.ATTRIBUTES).forEach(arg3 -> {
-            if (((Enchantment)arg2x.value()).m_jhglsmkm(arg2)) {
+      m_akhrohzh(stack, (arg2x, i) -> ((Enchantment)arg2x.value()).getEffect(EnchantmentEffectComponentTypes.ATTRIBUTES).forEach(arg3 -> {
+            if (((Enchantment)arg2x.value()).matchesSlot(arg2)) {
                biConsumer.accept(arg3.attribute(), arg3.m_sepzipgo(i, arg2));
             }
          }));
@@ -512,7 +513,7 @@
     */
    public static float m_kcdilbhw(ItemStack stack, LivingEntity arg2, float f) {
       MutableFloat mutableFloat = new MutableFloat(f);
-      m_akhrohzh(stack, (arg2x, i) -> ((Enchantment)arg2x.value()).m_bhhtcbyx(arg2.m_dlwxaobh(), i, mutableFloat));
+      m_akhrohzh(stack, (arg2x, i) -> ((Enchantment)arg2x.value()).modifyCrossbowChargeTime(arg2.m_dlwxaobh(), i, mutableFloat));
       return Math.max(0.0F, mutableFloat.floatValue());
    }
 
@@ -593,8 +594,8 @@
    /**
     * Mapping not found
     */
-   public static Optional<C_pjrjvgrp> m_obijpcqw(DataComponentType<?> arg, LivingEntity arg2, Predicate<ItemStack> predicate) {
-      List<C_pjrjvgrp> list = new ArrayList();
+   public static Optional<EnchantmentEffectContext> m_obijpcqw(DataComponentType<?> arg, LivingEntity arg2, Predicate<ItemStack> predicate) {
+      List<EnchantmentEffectContext> list = new ArrayList();
 
       for (EquipmentSlot lv : EquipmentSlot.values()) {
          ItemStack lv2 = arg2.getEquippedStack(lv);
@@ -603,8 +604,8 @@
 
             for (Entry<Holder<Enchantment>> entry : lv3.getEnchantmentEntries()) {
                Holder<Enchantment> lv4 = (Holder<Enchantment>)entry.getKey();
-               if (lv4.value().effects().contains(arg) && lv4.value().m_jhglsmkm(lv)) {
-                  list.add(new C_pjrjvgrp(lv2, lv, arg2));
+               if (lv4.value().effects().contains(arg) && lv4.value().matchesSlot(lv)) {
+                  list.add(new EnchantmentEffectContext(lv2, lv, arg2));
                }
             }
          }
@@ -669,7 +670,7 @@
       }
 
       for (EnchantmentLevelEntry lv : list) {
-         stack.m_nisvbeaw(lv.f_ykbaoghe, lv.level);
+         stack.m_nisvbeaw(lv.enchantment, lv.level);
       }
 
       return stack;
@@ -722,7 +723,7 @@
     * @mapping {@literal named removeConflicts Lnet/minecraft/enchantment/EnchantmentHelper;removeConflicts(Ljava/util/List;Lnet/minecraft/enchantment/EnchantmentLevelEntry;)V}
     */
    public static void removeConflicts(List<EnchantmentLevelEntry> possibleEntries, EnchantmentLevelEntry pickedEntry) {
-      possibleEntries.removeIf(arg2 -> !Enchantment.m_ycasfcso(pickedEntry.f_ykbaoghe, arg2.f_ykbaoghe));
+      possibleEntries.removeIf(arg2 -> !Enchantment.areCompatible(pickedEntry.enchantment, arg2.enchantment));
    }
 
    /**
@@ -730,7 +731,7 @@
     */
    public static boolean m_ecxgwxiu(Collection<Holder<Enchantment>> collection, Holder<Enchantment> arg) {
       for (Holder<Enchantment> lv : collection) {
-         if (!Enchantment.m_ycasfcso(lv, arg)) {
+         if (!Enchantment.areCompatible(lv, arg)) {
             return false;
          }
       }
@@ -745,7 +746,7 @@
    public static List<EnchantmentLevelEntry> m_pngonrhw(int i, ItemStack stack, Stream<Holder<Enchantment>> stream) {
       List<EnchantmentLevelEntry> list = Lists.<EnchantmentLevelEntry>newArrayList();
       boolean bl = stack.isOf(Items.BOOK);
-      stream.filter(arg2 -> ((Enchantment)arg2.value()).m_znzmqxec(stack) || bl).forEach(arg -> {
+      stream.filter(arg2 -> ((Enchantment)arg2.value()).isPrimaryItem(stack) || bl).forEach(arg -> {
          Enchantment lv = (Enchantment)arg.value();
 
          for (int j = lv.getMaxLevel(); j >= lv.getMinLevel(); j--) {
@@ -780,7 +781,7 @@
       /**
        * Mapping not found
        */
-      void accept(Holder<Enchantment> arg, int i, C_pjrjvgrp arg2);
+      void accept(Holder<Enchantment> arg, int i, EnchantmentEffectContext arg2);
    }
 
    /**


The remaining diff is too long!

Please sign in to comment.